CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify appContext.xml, mv all *Repository into .domain. packages, rm spmContext.xml (FINERACT-1175)

Browse Source
This commit is contained in:
Michael Vorburger
2020-10-11 22:07:00 +03:00
committed by Petri Tuomola
parent 5365da4d24
commit 6a6c0301b6
16 changed files with 17 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/data/InterestRateChartRepository.java → fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/domain/InterestRateChartRepository.java
+1 -2
View File
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.fineract.portfolio.interestratechart.data;
package org.apache.fineract.portfolio.interestratechart.domain;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChart;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/data/InterestRateChartRepositoryWrapper.java → fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/domain/InterestRateChartRepositoryWrapper.java
+1 -2
View File
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.fineract.portfolio.interestratechart.data;
package org.apache.fineract.portfolio.interestratechart.domain;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChart;
import org.apache.fineract.portfolio.interestratechart.exception.InterestRateChartNotFoundException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/data/InterestRateChartSlabRepository.java → fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/domain/InterestRateChartSlabRepository.java
+1 -2
View File
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.fineract.portfolio.interestratechart.data;
package org.apache.fineract.portfolio.interestratechart.domain;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartSlab;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/data/InterestRateChartSlabRepositoryWrapper.java → fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/domain/InterestRateChartSlabRepositoryWrapper.java
+1 -2
View File
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.fineract.portfolio.interestratechart.data;
package org.apache.fineract.portfolio.interestratechart.domain;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartSlab;
import org.apache.fineract.portfolio.interestratechart.exception.InterestRateChartSlabNotFoundException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartAssembler.java
+1 -1
View File
@@ -35,9 +35,9 @@ import org.apache.fineract.infrastructure.core.data.ApiParameterError;
import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
import org.apache.fineract.portfolio.interestratechart.data.InterestRateChartRepositoryWrapper;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChart;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartFields;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartRepositoryWrapper;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartSlab;
import org.joda.time.LocalDate;
import org.springframework.beans.factory.annotation.Autowired;
fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabAssembler.java
+1 -1
View File
@@ -43,8 +43,8 @@ import org.apache.fineract.infrastructure.core.data.ApiParameterError;
import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
import org.apache.fineract.portfolio.interestratechart.data.InterestRateChartRepositoryWrapper;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChart;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartRepositoryWrapper;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartSlab;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartSlabFields;
import org.apache.fineract.portfolio.interestratechart.exception.InterestRateChartSlabNotFoundException;
fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.java
+2 -2
View File
@@ -25,10 +25,10 @@ import org.apache.fineract.infrastructure.core.api.JsonCommand;
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
import org.apache.fineract.portfolio.interestratechart.data.InterestRateChartRepositoryWrapper;
import org.apache.fineract.portfolio.interestratechart.data.InterestRateChartSlabDataValidator;
import org.apache.fineract.portfolio.interestratechart.data.InterestRateChartSlabRepository;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartRepositoryWrapper;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartSlab;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartSlabRepository;
import org.apache.fineract.portfolio.savings.domain.SavingsProductRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartWritePlatformServiceJpaRepositoryImpl.java
+1 -1
View File
@@ -25,8 +25,8 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
import org.apache.fineract.portfolio.interestratechart.data.InterestRateChartDataValidator;
import org.apache.fineract.portfolio.interestratechart.data.InterestRateChartRepositoryWrapper;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChart;
import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartRepositoryWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
fineract-provider/src/main/java/org/apache/fineract/spm/repository/LookupTableRepository.java → fineract-provider/src/main/java/org/apache/fineract/spm/domain/LookupTableRepository.java
+1 -3
View File
@@ -16,11 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.fineract.spm.repository;
package org.apache.fineract.spm.domain;
import java.util.List;
import org.apache.fineract.spm.domain.LookupTable;
import org.apache.fineract.spm.domain.Survey;
import org.springframework.data.jpa.repository.JpaRepository;
public interface LookupTableRepository extends JpaRepository<LookupTable, Long> {
fineract-provider/src/main/java/org/apache/fineract/spm/repository/ScorecardRepository.java → fineract-provider/src/main/java/org/apache/fineract/spm/domain/ScorecardRepository.java
+1 -3
View File
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.fineract.spm.repository;
package org.apache.fineract.spm.domain;
import java.util.List;
import org.apache.fineract.portfolio.client.domain.Client;
import org.apache.fineract.spm.domain.Scorecard;
import org.apache.fineract.spm.domain.Survey;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ScorecardRepository extends JpaRepository<Scorecard, Long> {
fineract-provider/src/main/java/org/apache/fineract/spm/repository/SurveyRepository.java → fineract-provider/src/main/java/org/apache/fineract/spm/domain/SurveyRepository.java
+1 -2
View File
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.fineract.spm.repository;
package org.apache.fineract.spm.domain;
import java.util.Date;
import java.util.List;
import org.apache.fineract.spm.domain.Survey;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
fineract-provider/src/main/java/org/apache/fineract/spm/service/LookupTableService.java
+1 -1
View File
@@ -21,8 +21,8 @@ package org.apache.fineract.spm.service;
import java.util.List;
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
import org.apache.fineract.spm.domain.LookupTable;
import org.apache.fineract.spm.domain.LookupTableRepository;
import org.apache.fineract.spm.domain.Survey;
import org.apache.fineract.spm.repository.LookupTableRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
fineract-provider/src/main/java/org/apache/fineract/spm/service/ScorecardService.java
+1 -1
View File
@@ -22,8 +22,8 @@ import java.util.List;
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
import org.apache.fineract.portfolio.client.domain.Client;
import org.apache.fineract.spm.domain.Scorecard;
import org.apache.fineract.spm.domain.ScorecardRepository;
import org.apache.fineract.spm.domain.Survey;
import org.apache.fineract.spm.repository.ScorecardRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
fineract-provider/src/main/java/org/apache/fineract/spm/service/SpmService.java
+1 -1
View File
@@ -26,9 +26,9 @@ import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityEx
import org.apache.fineract.infrastructure.core.service.DateUtils;
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
import org.apache.fineract.spm.domain.Survey;
import org.apache.fineract.spm.domain.SurveyRepository;
import org.apache.fineract.spm.domain.SurveyValidator;
import org.apache.fineract.spm.exception.SurveyNotFoundException;
import org.apache.fineract.spm.repository.SurveyRepository;
import org.apache.openjpa.persistence.EntityExistsException;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
fineract-provider/src/main/resources/META-INF/spring/appContext.xml
+2 -42
View File
@@ -34,31 +34,7 @@
<sec:global-method-security
pre-post-annotations="enabled" />
<context:component-scan
base-package="org.apache.fineract.accounting.*,
org.apache.fineract.commands.provider.*,
org.apache.fineract.commands.handler.*,
org.apache.fineract.commands.service.*,
org.apache.fineract.commands.*,
org.apache.fineract.audit.*,
org.apache.fineract.infrastructure.creditbureau.*,
org.apache.fineract.infrastructure.*,
org.apache.fineract.infrastructure.core.security*,
org.apache.fineract.scheduledjobs.*,
org.apache.fineract.organisation.*,
org.apache.fineract.interoperation.*,
org.apache.fineract.portfolio.loanaccount.*,
org.apache.fineract.portfolio.savingsaccount.*,
org.apache.fineract.portfolio.*,
org.apache.fineract.useradministration.*,
org.apache.fineract.mix.*,
org.apache.fineract.notification.*,
org.apache.fineract.template.*,
org.apache.fineract.template.service.*,
org.apache.fineract.useradministration.*,
org.apache.fineract.batch,
org.apache.fineract.adhocquery.*,
org.apache.fineract.infrastructure.campaigns.**">
<context:component-scan base-package="org.apache.fineract.**">
<context:exclude-filter expression="org.springframework.stereotype.Controller"
type="annotation" />
@@ -73,21 +49,7 @@
<bean id="auditorAware"
class="org.apache.fineract.infrastructure.core.domain.AuditorAwareImpl" />
<jpa:auditing auditor-aware-ref="auditorAware" />
<jpa:repositories base-package="org.apache.fineract.commands.domain" />
<jpa:repositories base-package="org.apache.fineract.infrastructure.*.domain" />
<jpa:repositories base-package="org.apache.fineract.accounting.*.domain" />
<jpa:repositories base-package="org.apache.fineract.useradministration.domain" />
<jpa:repositories base-package="org.apache.fineract.organisation.*.domain" />
<jpa:repositories base-package="org.apache.fineract.portfolio.*" />
<jpa:repositories base-package="org.apache.fineract.mix.domain" />
<jpa:repositories base-package="org.apache.fineract.scheduledjobs.domain" />
<jpa:repositories base-package="org.apache.fineract.template.domain" />
<jpa:repositories base-package="org.apache.fineract.infrastructure.campaigns.sms.domain" />
<jpa:repositories base-package="org.apache.fineract.adhocquery.domain" />
<jpa:repositories base-package="org.apache.fineract.notification.domain"/>
<jpa:repositories base-package="org.apache.fineract.infrastructure.campaigns.email.domain"/>
<jpa:repositories base-package="org.apache.fineract.interoperation.domain"/>
<jpa:repositories base-package="org.apache.fineract.**.domain" />
<import resource="infrastructure.xml" />
@@ -110,6 +72,4 @@
<property name="targetMethod" value="setStrategyName" />
<property name="arguments" value="MODE_INHERITABLETHREADLOCAL" />
</bean>
<import resource="spmContext.xml"/>
</beans>
fineract-provider/src/main/resources/META-INF/spring/spmContext.xml
-37
View File
@@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:jpa="http://www.springframework.org/schema/data/jpa"
xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:component-scan base-package="org.apache.fineract.spm.**"/>
<jpa:repositories base-package="org.apache.fineract.spm.repository"/>
</beans>