This is an automated email from the ASF dual-hosted git repository.
aleks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 9f3ebfbc3 Add custom Configuration class for organisation/workingdays
module (FINERACT-1932)
9f3ebfbc3 is described below
commit 9f3ebfbc31be3cd11bf2b66be893f2dfc9a016d4
Author: Sinha, Abhinav <[email protected]>
AuthorDate: Mon Oct 23 18:37:54 2023 -0400
Add custom Configuration class for organisation/workingdays module
(FINERACT-1932)
---
.../WorkingDaysReadPlatformServiceImpl.java | 10 +----
...gDaysWritePlatformServiceJpaRepositoryImpl.java | 12 +-----
.../OrganisationWorkingDaysConfiguration.java | 47 ++++++++++++++++++++++
3 files changed, 51 insertions(+), 18 deletions(-)
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
index 45653921c..59d6deeaa 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
@@ -22,28 +22,22 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Arrays;
import java.util.Collection;
+import lombok.RequiredArgsConstructor;
import org.apache.fineract.infrastructure.core.data.EnumOptionData;
import org.apache.fineract.infrastructure.core.domain.JdbcSupport;
import org.apache.fineract.organisation.workingdays.data.WorkingDaysData;
import
org.apache.fineract.organisation.workingdays.domain.RepaymentRescheduleType;
import
org.apache.fineract.organisation.workingdays.domain.WorkingDaysEnumerations;
import
org.apache.fineract.organisation.workingdays.exception.WorkingDaysNotFoundException;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-@Service
+@RequiredArgsConstructor
public class WorkingDaysReadPlatformServiceImpl implements
WorkingDaysReadPlatformService {
private final JdbcTemplate jdbcTemplate;
- @Autowired
- public WorkingDaysReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate)
{
- this.jdbcTemplate = jdbcTemplate;
- }
-
private static final class WorkingDaysMapper implements
RowMapper<WorkingDaysData> {
private final String schema;
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysWritePlatformServiceJpaRepositoryImpl.java
b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysWritePlatformServiceJpaRepositoryImpl.java
index 57700c7e3..b0611c28b 100755
---
a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysWritePlatformServiceJpaRepositoryImpl.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysWritePlatformServiceJpaRepositoryImpl.java
@@ -20,6 +20,7 @@ package org.apache.fineract.organisation.workingdays.service;
import java.text.ParseException;
import java.util.Map;
+import lombok.RequiredArgsConstructor;
import net.fortuna.ical4j.model.property.RRule;
import net.fortuna.ical4j.validate.ValidationException;
import org.apache.fineract.infrastructure.core.api.JsonCommand;
@@ -30,23 +31,14 @@ import
org.apache.fineract.organisation.workingdays.api.WorkingDaysApiConstants;
import org.apache.fineract.organisation.workingdays.data.WorkingDayValidator;
import org.apache.fineract.organisation.workingdays.domain.WorkingDays;
import
org.apache.fineract.organisation.workingdays.domain.WorkingDaysRepositoryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-@Service
+@RequiredArgsConstructor
public class WorkingDaysWritePlatformServiceJpaRepositoryImpl implements
WorkingDaysWritePlatformService {
private final WorkingDaysRepositoryWrapper daysRepositoryWrapper;
private final WorkingDayValidator fromApiJsonDeserializer;
- @Autowired
- public WorkingDaysWritePlatformServiceJpaRepositoryImpl(final
WorkingDaysRepositoryWrapper daysRepositoryWrapper,
- final WorkingDayValidator fromApiJsonDeserializer) {
- this.daysRepositoryWrapper = daysRepositoryWrapper;
- this.fromApiJsonDeserializer = fromApiJsonDeserializer;
- }
-
@Transactional
@Override
public CommandProcessingResult updateWorkingDays(JsonCommand command) {
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/starter/OrganisationWorkingDaysConfiguration.java
b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/starter/OrganisationWorkingDaysConfiguration.java
new file mode 100644
index 000000000..256909f51
--- /dev/null
+++
b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/starter/OrganisationWorkingDaysConfiguration.java
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.organisation.workingdays.starter;
+
+import org.apache.fineract.organisation.workingdays.data.WorkingDayValidator;
+import
org.apache.fineract.organisation.workingdays.domain.WorkingDaysRepositoryWrapper;
+import
org.apache.fineract.organisation.workingdays.service.WorkingDaysReadPlatformService;
+import
org.apache.fineract.organisation.workingdays.service.WorkingDaysReadPlatformServiceImpl;
+import
org.apache.fineract.organisation.workingdays.service.WorkingDaysWritePlatformService;
+import
org.apache.fineract.organisation.workingdays.service.WorkingDaysWritePlatformServiceJpaRepositoryImpl;
+import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+@Configuration
+public class OrganisationWorkingDaysConfiguration {
+
+ @Bean
+ @ConditionalOnMissingBean(WorkingDaysReadPlatformService.class)
+ public WorkingDaysReadPlatformService
workingDaysReadPlatformService(JdbcTemplate jdbcTemplate) {
+ return new WorkingDaysReadPlatformServiceImpl(jdbcTemplate);
+ }
+
+ @Bean
+ @ConditionalOnMissingBean(WorkingDaysWritePlatformService.class)
+ public WorkingDaysWritePlatformService
workingDaysWritePlatformService(WorkingDaysRepositoryWrapper
daysRepositoryWrapper,
+ WorkingDayValidator fromApiJsonDeserializer) {
+ return new
WorkingDaysWritePlatformServiceJpaRepositoryImpl(daysRepositoryWrapper,
fromApiJsonDeserializer);
+ }
+}