From 52ff4da56322d9cf49099ec4b25b425f9ea5468a Mon Sep 17 00:00:00 2001 From: Vishwas Babu AJ Date: Wed, 30 Jan 2013 06:17:07 +0530 Subject: [PATCH] Package rename and very minor modifications --- .../SynchronousCommandProcessingService.java | 2 ++ .../loanaccount/api/LoansApiResource.java | 4 ++-- .../loanaccount/data/LoanAccountData.java | 2 +- .../GuarantorConstants.java | 2 +- .../api/GuarantorsApiResource.java | 10 +++++----- .../command/GuarantorCommand.java | 6 +++--- .../data/GuarantorData.java | 12 ++++++------ .../domain/Guarantor.java | 4 ++-- .../domain/GuarantorRepository.java | 2 +- .../domain/GuarantorType.java | 2 +- .../exception/GuarantorNotFoundException.java | 2 +- .../exception/InvalidGuarantorException.java | 2 +- .../handler/CreateGuarantorCommandHandler.java | 4 ++-- .../handler/DeleteGuarantorCommandHandler.java | 4 ++-- .../handler/UpdateGuarantorCommandHandler.java | 4 ++-- .../GuarantorCommandFromApiJsonDeserializer.java | 16 ++++++++++------ .../service/GuarantorEnumerations.java | 4 ++-- .../service/GuarantorReadPlatformService.java | 4 ++-- .../GuarantorReadPlatformServiceImpl.java | 6 +++--- .../service/GuarantorWritePlatformService.java | 2 +- ...orWritePlatformServiceJpaRepositoryIImpl.java | 16 ++++++++-------- 21 files changed, 58 insertions(+), 52 deletions(-) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/GuarantorConstants.java (95%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/api/GuarantorsApiResource.java (95%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/command/GuarantorCommand.java (97%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/data/GuarantorData.java (94%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/domain/Guarantor.java (98%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/domain/GuarantorRepository.java (81%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/domain/GuarantorType.java (95%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/exception/GuarantorNotFoundException.java (87%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/exception/InvalidGuarantorException.java (90%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/handler/CreateGuarantorCommandHandler.java (88%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/handler/DeleteGuarantorCommandHandler.java (88%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/handler/UpdateGuarantorCommandHandler.java (88%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/serialization/GuarantorCommandFromApiJsonDeserializer.java (87%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/service/GuarantorEnumerations.java (87%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/service/GuarantorReadPlatformService.java (67%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/service/GuarantorReadPlatformServiceImpl.java (96%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/service/GuarantorWritePlatformService.java (87%) rename mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/{gaurantor => guarantor}/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java (93%) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java index 0646b5226..77902081b 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java @@ -185,6 +185,8 @@ public class SynchronousCommandProcessingService implements CommandProcessingSer handler = applicationContext.getBean("createGuarantorCommandHandler", NewCommandSourceHandler.class); } else if (wrapper.isUpdate()) { handler = applicationContext.getBean("updateGuarantorCommandHandler", NewCommandSourceHandler.class); + } else if (wrapper.isDelete()) { + handler = applicationContext.getBean("deleteGuarantorCommandHandler", NewCommandSourceHandler.class); } else { throw new UnsupportedCommandException(wrapper.commandName()); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java index ebc664c57..bb0110b44 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java @@ -48,8 +48,8 @@ import org.mifosplatform.portfolio.loanaccount.data.LoanBasicDetailsData; import org.mifosplatform.portfolio.loanaccount.data.LoanChargeData; import org.mifosplatform.portfolio.loanaccount.data.LoanPermissionData; import org.mifosplatform.portfolio.loanaccount.data.LoanTransactionData; -import org.mifosplatform.portfolio.loanaccount.gaurantor.data.GuarantorData; -import org.mifosplatform.portfolio.loanaccount.gaurantor.service.GuarantorReadPlatformService; +import org.mifosplatform.portfolio.loanaccount.guarantor.data.GuarantorData; +import org.mifosplatform.portfolio.loanaccount.guarantor.service.GuarantorReadPlatformService; import org.mifosplatform.portfolio.loanaccount.loanschedule.data.LoanScheduleData; import org.mifosplatform.portfolio.loanaccount.loanschedule.service.LoanScheduleCalculationPlatformService; import org.mifosplatform.portfolio.loanaccount.service.LoanChargeReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java index 497d3350e..3fe9c16f7 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java @@ -9,7 +9,7 @@ import org.mifosplatform.organisation.monetary.data.CurrencyData; import org.mifosplatform.organisation.staff.data.StaffData; import org.mifosplatform.portfolio.charge.data.ChargeData; import org.mifosplatform.portfolio.fund.data.FundData; -import org.mifosplatform.portfolio.loanaccount.gaurantor.data.GuarantorData; +import org.mifosplatform.portfolio.loanaccount.guarantor.data.GuarantorData; import org.mifosplatform.portfolio.loanaccount.loanschedule.data.LoanScheduleData; import org.mifosplatform.portfolio.loanproduct.data.LoanProductData; import org.mifosplatform.portfolio.loanproduct.data.TransactionProcessingStrategyData; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/GuarantorConstants.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/GuarantorConstants.java similarity index 95% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/GuarantorConstants.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/GuarantorConstants.java index 4aca30d49..965cbd16f 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/GuarantorConstants.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/GuarantorConstants.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor; +package org.mifosplatform.portfolio.loanaccount.guarantor; import java.util.HashSet; import java.util.Set; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/api/GuarantorsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/api/GuarantorsApiResource.java similarity index 95% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/api/GuarantorsApiResource.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/api/GuarantorsApiResource.java index 61a8a4c57..df2a97426 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/api/GuarantorsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/api/GuarantorsApiResource.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.api; +package org.mifosplatform.portfolio.loanaccount.guarantor.api; import java.util.Arrays; import java.util.HashSet; @@ -26,10 +26,10 @@ import org.mifosplatform.infrastructure.core.data.EnumOptionData; import org.mifosplatform.infrastructure.core.serialization.ApiRequestJsonSerializationSettings; import org.mifosplatform.infrastructure.core.serialization.DefaultToApiJsonSerializer; import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; -import org.mifosplatform.portfolio.loanaccount.gaurantor.data.GuarantorData; -import org.mifosplatform.portfolio.loanaccount.gaurantor.domain.GuarantorType; -import org.mifosplatform.portfolio.loanaccount.gaurantor.service.GuarantorEnumerations; -import org.mifosplatform.portfolio.loanaccount.gaurantor.service.GuarantorReadPlatformService; +import org.mifosplatform.portfolio.loanaccount.guarantor.data.GuarantorData; +import org.mifosplatform.portfolio.loanaccount.guarantor.domain.GuarantorType; +import org.mifosplatform.portfolio.loanaccount.guarantor.service.GuarantorEnumerations; +import org.mifosplatform.portfolio.loanaccount.guarantor.service.GuarantorReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/command/GuarantorCommand.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/command/GuarantorCommand.java similarity index 97% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/command/GuarantorCommand.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/command/GuarantorCommand.java index cbdf52bd6..bf2464f9e 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/command/GuarantorCommand.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/command/GuarantorCommand.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.command; +package org.mifosplatform.portfolio.loanaccount.guarantor.command; import java.util.ArrayList; import java.util.Date; @@ -8,8 +8,8 @@ import org.joda.time.LocalDate; import org.mifosplatform.infrastructure.core.data.ApiParameterError; import org.mifosplatform.infrastructure.core.data.DataValidatorBuilder; import org.mifosplatform.infrastructure.core.exception.PlatformApiDataValidationException; -import org.mifosplatform.portfolio.loanaccount.gaurantor.GuarantorConstants.GUARANTOR_JSON_INPUT_PARAMS; -import org.mifosplatform.portfolio.loanaccount.gaurantor.domain.GuarantorType; +import org.mifosplatform.portfolio.loanaccount.guarantor.GuarantorConstants.GUARANTOR_JSON_INPUT_PARAMS; +import org.mifosplatform.portfolio.loanaccount.guarantor.domain.GuarantorType; /** * Immutable command for creating or updating details of a Guarantor. diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/data/GuarantorData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/data/GuarantorData.java similarity index 94% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/data/GuarantorData.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/data/GuarantorData.java index ddab82d36..fdb957158 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/data/GuarantorData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/data/GuarantorData.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.data; +package org.mifosplatform.portfolio.loanaccount.guarantor.data; import java.util.List; @@ -6,8 +6,8 @@ import org.joda.time.LocalDate; import org.mifosplatform.infrastructure.core.data.EnumOptionData; import org.mifosplatform.organisation.staff.data.StaffData; import org.mifosplatform.portfolio.client.data.ClientData; -import org.mifosplatform.portfolio.loanaccount.gaurantor.domain.GuarantorType; -import org.mifosplatform.portfolio.loanaccount.gaurantor.service.GuarantorEnumerations; +import org.mifosplatform.portfolio.loanaccount.guarantor.domain.GuarantorType; +import org.mifosplatform.portfolio.loanaccount.guarantor.service.GuarantorEnumerations; public class GuarantorData { @@ -93,15 +93,15 @@ public class GuarantorData { } public boolean isExternalGuarantor() { - return GuarantorType.EXTERNAL.getValue().equals(guarantorType.getId()); + return GuarantorType.EXTERNAL.getValue().equals(guarantorType.getId().intValue()); } public boolean isExistingClient() { - return GuarantorType.CUSTOMER.getValue().equals(guarantorType.getId()); + return GuarantorType.CUSTOMER.getValue().equals(guarantorType.getId().intValue()); } public boolean isStaffMember() { - return GuarantorType.STAFF.getValue().equals(guarantorType.getId()); + return GuarantorType.STAFF.getValue().equals(guarantorType.getId().intValue()); } public Long getEntityId() { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/domain/Guarantor.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/domain/Guarantor.java similarity index 98% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/domain/Guarantor.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/domain/Guarantor.java index b57ac7ba5..a1b3a760d 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/domain/Guarantor.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/domain/Guarantor.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.domain; +package org.mifosplatform.portfolio.loanaccount.guarantor.domain; import java.util.Date; import java.util.LinkedHashMap; @@ -15,7 +15,7 @@ import javax.persistence.TemporalType; import org.apache.commons.lang.StringUtils; import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.portfolio.loanaccount.domain.Loan; -import org.mifosplatform.portfolio.loanaccount.gaurantor.GuarantorConstants.GUARANTOR_JSON_INPUT_PARAMS; +import org.mifosplatform.portfolio.loanaccount.guarantor.GuarantorConstants.GUARANTOR_JSON_INPUT_PARAMS; import org.springframework.data.jpa.domain.AbstractPersistable; @Entity diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/domain/GuarantorRepository.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/domain/GuarantorRepository.java similarity index 81% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/domain/GuarantorRepository.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/domain/GuarantorRepository.java index 91664a083..b38ba15ed 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/domain/GuarantorRepository.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/domain/GuarantorRepository.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.domain; +package org.mifosplatform.portfolio.loanaccount.guarantor.domain; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/domain/GuarantorType.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/domain/GuarantorType.java similarity index 95% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/domain/GuarantorType.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/domain/GuarantorType.java index 905f9ba80..4339885a6 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/domain/GuarantorType.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/domain/GuarantorType.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.domain; +package org.mifosplatform.portfolio.loanaccount.guarantor.domain; import java.util.HashMap; import java.util.Map; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/exception/GuarantorNotFoundException.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/exception/GuarantorNotFoundException.java similarity index 87% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/exception/GuarantorNotFoundException.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/exception/GuarantorNotFoundException.java index ac626d418..de9470936 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/exception/GuarantorNotFoundException.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/exception/GuarantorNotFoundException.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.exception; +package org.mifosplatform.portfolio.loanaccount.guarantor.exception; import org.mifosplatform.infrastructure.core.exception.AbstractPlatformResourceNotFoundException; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/exception/InvalidGuarantorException.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/exception/InvalidGuarantorException.java similarity index 90% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/exception/InvalidGuarantorException.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/exception/InvalidGuarantorException.java index 0ad7af3c6..f78eb74fb 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/exception/InvalidGuarantorException.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/exception/InvalidGuarantorException.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.exception; +package org.mifosplatform.portfolio.loanaccount.guarantor.exception; import org.mifosplatform.infrastructure.core.exception.AbstractPlatformDomainRuleException; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/handler/CreateGuarantorCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/handler/CreateGuarantorCommandHandler.java similarity index 88% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/handler/CreateGuarantorCommandHandler.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/handler/CreateGuarantorCommandHandler.java index aab41ba27..c542693fb 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/handler/CreateGuarantorCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/handler/CreateGuarantorCommandHandler.java @@ -1,9 +1,9 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.handler; +package org.mifosplatform.portfolio.loanaccount.guarantor.handler; import org.mifosplatform.commands.handler.NewCommandSourceHandler; import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; -import org.mifosplatform.portfolio.loanaccount.gaurantor.service.GuarantorWritePlatformService; +import org.mifosplatform.portfolio.loanaccount.guarantor.service.GuarantorWritePlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/handler/DeleteGuarantorCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/handler/DeleteGuarantorCommandHandler.java similarity index 88% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/handler/DeleteGuarantorCommandHandler.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/handler/DeleteGuarantorCommandHandler.java index f0fea99b0..8a68edea9 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/handler/DeleteGuarantorCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/handler/DeleteGuarantorCommandHandler.java @@ -1,9 +1,9 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.handler; +package org.mifosplatform.portfolio.loanaccount.guarantor.handler; import org.mifosplatform.commands.handler.NewCommandSourceHandler; import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; -import org.mifosplatform.portfolio.loanaccount.gaurantor.service.GuarantorWritePlatformService; +import org.mifosplatform.portfolio.loanaccount.guarantor.service.GuarantorWritePlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/handler/UpdateGuarantorCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/handler/UpdateGuarantorCommandHandler.java similarity index 88% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/handler/UpdateGuarantorCommandHandler.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/handler/UpdateGuarantorCommandHandler.java index a031e0abc..cc3b3bd5a 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/handler/UpdateGuarantorCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/handler/UpdateGuarantorCommandHandler.java @@ -1,9 +1,9 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.handler; +package org.mifosplatform.portfolio.loanaccount.guarantor.handler; import org.mifosplatform.commands.handler.NewCommandSourceHandler; import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; -import org.mifosplatform.portfolio.loanaccount.gaurantor.service.GuarantorWritePlatformService; +import org.mifosplatform.portfolio.loanaccount.guarantor.service.GuarantorWritePlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/serialization/GuarantorCommandFromApiJsonDeserializer.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/serialization/GuarantorCommandFromApiJsonDeserializer.java similarity index 87% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/serialization/GuarantorCommandFromApiJsonDeserializer.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/serialization/GuarantorCommandFromApiJsonDeserializer.java index b049d527b..e49e672f3 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/serialization/GuarantorCommandFromApiJsonDeserializer.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/serialization/GuarantorCommandFromApiJsonDeserializer.java @@ -1,7 +1,8 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.serialization; +package org.mifosplatform.portfolio.loanaccount.guarantor.serialization; import java.lang.reflect.Type; import java.util.Map; +import java.util.Set; import org.apache.commons.lang.StringUtils; import org.joda.time.LocalDate; @@ -9,8 +10,8 @@ import org.mifosplatform.infrastructure.core.exception.InvalidJsonException; import org.mifosplatform.infrastructure.core.serialization.AbstractFromApiJsonDeserializer; import org.mifosplatform.infrastructure.core.serialization.FromApiJsonDeserializer; import org.mifosplatform.infrastructure.core.serialization.FromJsonHelper; -import org.mifosplatform.portfolio.loanaccount.gaurantor.GuarantorConstants.GUARANTOR_JSON_INPUT_PARAMS; -import org.mifosplatform.portfolio.loanaccount.gaurantor.command.GuarantorCommand; +import org.mifosplatform.portfolio.loanaccount.guarantor.GuarantorConstants.GUARANTOR_JSON_INPUT_PARAMS; +import org.mifosplatform.portfolio.loanaccount.guarantor.command.GuarantorCommand; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -36,13 +37,16 @@ public final class GuarantorCommandFromApiJsonDeserializer extends AbstractFromA if (StringUtils.isBlank(json)) { throw new InvalidJsonException(); } final Type typeOfMap = new TypeToken>() {}.getType(); - fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, GUARANTOR_JSON_INPUT_PARAMS.getAllValues()); + Set supportedParameters = GUARANTOR_JSON_INPUT_PARAMS.getAllValues(); + supportedParameters.add("locale"); + supportedParameters.add("dateFormat"); + fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, supportedParameters); final JsonElement element = fromApiJsonHelper.parse(json); Long loanId = fromApiJsonHelper.extractLongNamed(GUARANTOR_JSON_INPUT_PARAMS.LOAN_ID.getValue(), element); - Integer guarantorTypeId = fromApiJsonHelper.extractIntegerSansLocaleNamed( - GUARANTOR_JSON_INPUT_PARAMS.GUARANTOR_TYPE_ID.getValue(), element); + Integer guarantorTypeId = fromApiJsonHelper.extractIntegerSansLocaleNamed(GUARANTOR_JSON_INPUT_PARAMS.GUARANTOR_TYPE_ID.getValue(), + element); Long entityId = fromApiJsonHelper.extractLongNamed(GUARANTOR_JSON_INPUT_PARAMS.ENTITY_ID.getValue(), element); String firstname = fromApiJsonHelper.extractStringNamed(GUARANTOR_JSON_INPUT_PARAMS.FIRSTNAME.getValue(), element); String lastname = fromApiJsonHelper.extractStringNamed(GUARANTOR_JSON_INPUT_PARAMS.LASTNAME.getValue(), element); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorEnumerations.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorEnumerations.java similarity index 87% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorEnumerations.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorEnumerations.java index a4bab6afc..131a5f7fe 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorEnumerations.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorEnumerations.java @@ -1,10 +1,10 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.service; +package org.mifosplatform.portfolio.loanaccount.guarantor.service; import java.util.ArrayList; import java.util.List; import org.mifosplatform.infrastructure.core.data.EnumOptionData; -import org.mifosplatform.portfolio.loanaccount.gaurantor.domain.GuarantorType; +import org.mifosplatform.portfolio.loanaccount.guarantor.domain.GuarantorType; public class GuarantorEnumerations { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformService.java similarity index 67% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorReadPlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformService.java index 445fbd356..b2936b298 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformService.java @@ -1,8 +1,8 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.service; +package org.mifosplatform.portfolio.loanaccount.guarantor.service; import java.util.List; -import org.mifosplatform.portfolio.loanaccount.gaurantor.data.GuarantorData; +import org.mifosplatform.portfolio.loanaccount.guarantor.data.GuarantorData; public interface GuarantorReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorReadPlatformServiceImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java index 327c02ed4..ea4697ddc 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.service; +package org.mifosplatform.portfolio.loanaccount.guarantor.service; import java.sql.ResultSet; import java.sql.SQLException; @@ -13,8 +13,8 @@ import org.mifosplatform.organisation.staff.data.StaffData; import org.mifosplatform.organisation.staff.service.StaffReadPlatformService; import org.mifosplatform.portfolio.client.data.ClientData; import org.mifosplatform.portfolio.client.service.ClientReadPlatformService; -import org.mifosplatform.portfolio.loanaccount.gaurantor.data.GuarantorData; -import org.mifosplatform.portfolio.loanaccount.gaurantor.domain.GuarantorType; +import org.mifosplatform.portfolio.loanaccount.guarantor.data.GuarantorData; +import org.mifosplatform.portfolio.loanaccount.guarantor.domain.GuarantorType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformService.java similarity index 87% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorWritePlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformService.java index ccd8a4c06..86c3a6ba4 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformService.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.service; +package org.mifosplatform.portfolio.loanaccount.guarantor.service; import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.infrastructure.core.data.CommandProcessingResult; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java similarity index 93% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java index 101a02c8d..339b30cd5 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java @@ -1,4 +1,4 @@ -package org.mifosplatform.portfolio.loanaccount.gaurantor.service; +package org.mifosplatform.portfolio.loanaccount.guarantor.service; import java.util.Map; @@ -15,13 +15,13 @@ import org.mifosplatform.portfolio.client.exception.ClientNotFoundException; import org.mifosplatform.portfolio.loanaccount.domain.Loan; import org.mifosplatform.portfolio.loanaccount.domain.LoanRepository; import org.mifosplatform.portfolio.loanaccount.exception.LoanNotFoundException; -import org.mifosplatform.portfolio.loanaccount.gaurantor.GuarantorConstants.GUARANTOR_JSON_INPUT_PARAMS; -import org.mifosplatform.portfolio.loanaccount.gaurantor.command.GuarantorCommand; -import org.mifosplatform.portfolio.loanaccount.gaurantor.domain.Guarantor; -import org.mifosplatform.portfolio.loanaccount.gaurantor.domain.GuarantorRepository; -import org.mifosplatform.portfolio.loanaccount.gaurantor.exception.GuarantorNotFoundException; -import org.mifosplatform.portfolio.loanaccount.gaurantor.exception.InvalidGuarantorException; -import org.mifosplatform.portfolio.loanaccount.gaurantor.serialization.GuarantorCommandFromApiJsonDeserializer; +import org.mifosplatform.portfolio.loanaccount.guarantor.GuarantorConstants.GUARANTOR_JSON_INPUT_PARAMS; +import org.mifosplatform.portfolio.loanaccount.guarantor.command.GuarantorCommand; +import org.mifosplatform.portfolio.loanaccount.guarantor.domain.Guarantor; +import org.mifosplatform.portfolio.loanaccount.guarantor.domain.GuarantorRepository; +import org.mifosplatform.portfolio.loanaccount.guarantor.exception.GuarantorNotFoundException; +import org.mifosplatform.portfolio.loanaccount.guarantor.exception.InvalidGuarantorException; +import org.mifosplatform.portfolio.loanaccount.guarantor.serialization.GuarantorCommandFromApiJsonDeserializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired;