From b48763a1049d9dd475a740997da89570b1107777 Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Mon, 19 Nov 2012 21:46:04 +0000 Subject: [PATCH] move class into data package. --- .../main/java/org/mifosng/platform/api/LoansApiResource.java | 1 + .../java/org/mifosng/platform/api/data/LoanAccountData.java | 1 - .../org/mifosng/platform/api/{ => data}/LoanScheduleData.java | 4 +--- .../GoogleGsonPortfolioApiJsonSerializerService.java | 2 +- .../api/infrastructure/PortfolioApiJsonSerializerService.java | 2 +- .../src/main/java/org/mifosng/platform/loan/domain/Loan.java | 2 +- .../platform/loan/service/CalculationPlatformService.java | 2 +- .../platform/loan/service/CalculationPlatformServiceImpl.java | 2 +- .../java/org/mifosng/platform/loan/service/LoanAssembler.java | 2 +- .../platform/loan/service/LoanReadPlatformService.java | 2 +- .../platform/loan/service/LoanReadPlatformServiceImpl.java | 2 +- .../service/LoanWritePlatformServiceJpaRepositoryImpl.java | 2 +- .../domain/AmortizationLoanScheduleGenerator.java | 2 +- .../domain/DecliningBalanceMethodLoanScheduleGenerator.java | 2 +- .../EqualInstallmentsAmortizationLoanScheduleGenerator.java | 2 +- .../EqualPrincipalAmortizationLoanScheduleGenerator.java | 2 +- .../loanschedule/domain/FlatMethodLoanScheduleGenerator.java | 2 +- .../platform/loanschedule/domain/LoanScheduleGenerator.java | 2 +- 18 files changed, 17 insertions(+), 19 deletions(-) rename mifosng-provider/src/main/java/org/mifosng/platform/api/{ => data}/LoanScheduleData.java (98%) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java index 19d464393..2af098970 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java @@ -39,6 +39,7 @@ import org.mifosng.platform.api.data.LoanChargeData; import org.mifosng.platform.api.data.LoanPermissionData; import org.mifosng.platform.api.data.LoanProductData; import org.mifosng.platform.api.data.LoanReassignmentData; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.api.data.LoanTransactionData; import org.mifosng.platform.api.data.StaffData; import org.mifosng.platform.api.data.TransactionProcessingStrategyData; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java index 6e86ba818..8c12c507b 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java @@ -4,7 +4,6 @@ import java.math.BigDecimal; import java.util.Collection; import org.joda.time.LocalDate; -import org.mifosng.platform.api.LoanScheduleData; /** * Immutable data object representing loan account data. diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanScheduleData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanScheduleData.java similarity index 98% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/LoanScheduleData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanScheduleData.java index 4091b042f..6aaf2ab16 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanScheduleData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanScheduleData.java @@ -1,10 +1,8 @@ -package org.mifosng.platform.api; +package org.mifosng.platform.api.data; import java.math.BigDecimal; import java.util.Collection; -import org.mifosng.platform.api.data.CurrencyData; -import org.mifosng.platform.api.data.LoanSchedulePeriodData; /** * Immutable data object to represent aspects of a loan schedule such as: diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java index 43904a1a2..1184ca1fa 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java @@ -6,7 +6,6 @@ import java.util.HashSet; import java.util.Set; import org.mifosng.platform.accounting.api.data.ChartOfAccountsData; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.commands.ClientCommand; import org.mifosng.platform.api.data.AdditionalFieldsSetData; import org.mifosng.platform.api.data.AppUserData; @@ -30,6 +29,7 @@ import org.mifosng.platform.api.data.LoanAccountData; import org.mifosng.platform.api.data.LoanChargeData; import org.mifosng.platform.api.data.LoanProductData; import org.mifosng.platform.api.data.LoanReassignmentData; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.api.data.LoanTransactionData; import org.mifosng.platform.api.data.CommandSourceData; import org.mifosng.platform.api.data.NoteData; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java index b36e48eae..2411ec511 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java @@ -4,7 +4,6 @@ import java.util.Collection; import java.util.Set; import org.mifosng.platform.accounting.api.data.ChartOfAccountsData; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.commands.ClientCommand; import org.mifosng.platform.api.data.AdditionalFieldsSetData; import org.mifosng.platform.api.data.AppUserData; @@ -28,6 +27,7 @@ import org.mifosng.platform.api.data.LoanAccountData; import org.mifosng.platform.api.data.LoanChargeData; import org.mifosng.platform.api.data.LoanProductData; import org.mifosng.platform.api.data.LoanReassignmentData; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.api.data.LoanTransactionData; import org.mifosng.platform.api.data.CommandSourceData; import org.mifosng.platform.api.data.NoteData; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java index 2b807680d..df62da954 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java @@ -26,9 +26,9 @@ import org.apache.commons.lang.StringUtils; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; import org.joda.time.LocalDate; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.commands.LoanApplicationCommand; import org.mifosng.platform.api.commands.LoanChargeCommand; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.client.domain.Client; import org.mifosng.platform.currency.domain.MonetaryCurrency; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java index 25021d6ac..44ace2893 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java @@ -1,7 +1,7 @@ package org.mifosng.platform.loan.service; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; +import org.mifosng.platform.api.data.LoanScheduleData; public interface CalculationPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java index 4841123f3..b918708fd 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java @@ -2,8 +2,8 @@ package org.mifosng.platform.loan.service; import java.util.Set; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.currency.domain.ApplicationCurrencyRepository; import org.mifosng.platform.loan.domain.InterestMethod; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java index 498d4948b..ee95141b5 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanAssembler.java @@ -5,8 +5,8 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.commands.LoanApplicationCommand; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.client.domain.Client; import org.mifosng.platform.client.domain.ClientRepository; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java index 1af131619..e77da685b 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java @@ -3,11 +3,11 @@ package org.mifosng.platform.loan.service; import java.math.BigDecimal; import java.util.Collection; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.DisbursementData; import org.mifosng.platform.api.data.LoanBasicDetailsData; import org.mifosng.platform.api.data.LoanPermissionData; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.api.data.LoanTransactionData; public interface LoanReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java index f7711e292..cfeba07ba 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.Collection; import org.joda.time.LocalDate; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.data.ClientData; import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.DisbursementData; @@ -17,6 +16,7 @@ import org.mifosng.platform.api.data.LoanBasicDetailsData; import org.mifosng.platform.api.data.LoanChargeData; import org.mifosng.platform.api.data.LoanPermissionData; import org.mifosng.platform.api.data.LoanProductData; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.api.data.LoanTransactionData; import org.mifosng.platform.client.service.ClientReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java index e7a54b575..a2d96c20a 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java @@ -8,7 +8,6 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; import org.joda.time.LocalDate; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.commands.AdjustLoanTransactionCommand; import org.mifosng.platform.api.commands.LoanReassignmentCommand; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; @@ -18,6 +17,7 @@ import org.mifosng.platform.api.commands.LoanStateTransitionCommand; import org.mifosng.platform.api.commands.LoanTransactionCommand; import org.mifosng.platform.api.commands.UndoStateTransitionCommand; import org.mifosng.platform.api.data.EntityIdentifier; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.charge.domain.Charge; import org.mifosng.platform.charge.domain.ChargeRepository; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/AmortizationLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/AmortizationLoanScheduleGenerator.java index 195898b8a..83374a57d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/AmortizationLoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/AmortizationLoanScheduleGenerator.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Set; import org.joda.time.LocalDate; -import org.mifosng.platform.api.LoanScheduleData; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.loan.domain.LoanCharge; import org.mifosng.platform.loan.domain.LoanProductRelatedDetail; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/DecliningBalanceMethodLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/DecliningBalanceMethodLoanScheduleGenerator.java index 54a52a591..39ebba1bc 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/DecliningBalanceMethodLoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/DecliningBalanceMethodLoanScheduleGenerator.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Set; import org.joda.time.LocalDate; -import org.mifosng.platform.api.LoanScheduleData; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.loan.domain.AmortizationMethod; import org.mifosng.platform.loan.domain.LoanCharge; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualInstallmentsAmortizationLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualInstallmentsAmortizationLoanScheduleGenerator.java index bab48ee7a..fbc19ebc0 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualInstallmentsAmortizationLoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualInstallmentsAmortizationLoanScheduleGenerator.java @@ -8,8 +8,8 @@ import java.util.Set; import org.joda.time.Days; import org.joda.time.LocalDate; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.data.CurrencyData; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.currency.domain.MonetaryCurrency; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualPrincipalAmortizationLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualPrincipalAmortizationLoanScheduleGenerator.java index 0cff46ca6..fb59ffcc0 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualPrincipalAmortizationLoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/EqualPrincipalAmortizationLoanScheduleGenerator.java @@ -8,8 +8,8 @@ import java.util.Set; import org.joda.time.Days; import org.joda.time.LocalDate; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.data.CurrencyData; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.currency.domain.MonetaryCurrency; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/FlatMethodLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/FlatMethodLoanScheduleGenerator.java index 0f2b3b937..bcd1c009a 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/FlatMethodLoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/FlatMethodLoanScheduleGenerator.java @@ -10,8 +10,8 @@ import java.util.Set; import org.joda.time.Days; import org.joda.time.LocalDate; -import org.mifosng.platform.api.LoanScheduleData; import org.mifosng.platform.api.data.CurrencyData; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.api.data.LoanSchedulePeriodData; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.currency.domain.MonetaryCurrency; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/LoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/LoanScheduleGenerator.java index 12b65e6e9..4fb3ae4f9 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/LoanScheduleGenerator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanschedule/domain/LoanScheduleGenerator.java @@ -3,7 +3,7 @@ package org.mifosng.platform.loanschedule.domain; import java.util.Set; import org.joda.time.LocalDate; -import org.mifosng.platform.api.LoanScheduleData; +import org.mifosng.platform.api.data.LoanScheduleData; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.loan.domain.LoanCharge; import org.mifosng.platform.loan.domain.LoanProductRelatedDetail;