From 4dc10ae648950bd7ce4f275acb87cb987a25c09f Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Mon, 30 Jul 2012 13:31:35 +0100 Subject: [PATCH] minor changes after madhukar pull-request, nothing of note. --- .../api/SavingProductsApiResource.java | 6 ++--- .../ApiDataConversionServiceImpl.java | 3 +-- .../platform/saving/domain/SavingProduct.java | 23 ++++--------------- .../SavingProductCommandValidator.java | 8 ++++--- ...WritePlatformServiceJpaRepositoryImpl.java | 9 ++++---- 5 files changed, 17 insertions(+), 32 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/SavingProductsApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/SavingProductsApiResource.java index b26e78c39..848b2d0c5 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/SavingProductsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/SavingProductsApiResource.java @@ -80,7 +80,7 @@ public class SavingProductsApiResource { Collection products = this.savingProductReadPlatformService.retrieveAllSavingProducts(); - return this.apiDataConversionService.convertSavingProductDataToJson(prettyPrint, responseParameters, products.toArray(new SavingProductData[products.size()])); + return this.apiDataConversionService.convertSavingProductDataToJson(prettyPrint, responseParameters, products.toArray(new SavingProductData[products.size()])); } @GET @@ -122,6 +122,4 @@ public class SavingProductsApiResource { return this.apiDataConversionService.convertSavingProductDataToJson(prettyPrint, responseParameters, savingProduct); } - - -} +} \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java index 814ea66fe..d75f1bbc8 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java @@ -1341,8 +1341,7 @@ public class ApiDataConversionServiceImpl implements ApiDataConversionService { } @Override - public SavingProductCommand convertJsonToSavingProductCommand( - final Long resourceIdentifier, final String json) { + public SavingProductCommand convertJsonToSavingProductCommand(final Long resourceIdentifier, final String json) { if (StringUtils.isBlank(json)) { throw new InvalidJsonException(); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProduct.java b/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProduct.java index a3fd471ff..980f7d0cc 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProduct.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProduct.java @@ -13,15 +13,16 @@ import org.mifosng.platform.user.domain.AppUser; @Table(name = "portfolio_product_savings") public class SavingProduct extends AbstractAuditableCustom { + @SuppressWarnings("unused") @Column(name = "name", nullable = false) private String name; + @SuppressWarnings("unused") @Column(name = "description") private String description; - public SavingProduct() { - this.name = null; - this.description = null; + protected SavingProduct() { + // } public SavingProduct(final String name, final String description) { @@ -33,18 +34,6 @@ public class SavingProduct extends AbstractAuditableCustom { } } - public String getName() { - return this.name; - } - - public String getDescription() { - return this.description; - } - - public boolean identifiedBy(final String identifier) { - return identifier.equalsIgnoreCase(this.name); - } - public void update(final SavingProductCommand command) { if (command.isNameChanged()) { @@ -54,7 +43,5 @@ public class SavingProduct extends AbstractAuditableCustom { if (command.isDescriptionChanged()) { this.description = command.getDescription(); } - } - -} +} \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductCommandValidator.java index 85718967f..9351881a4 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductCommandValidator.java @@ -12,14 +12,15 @@ public class SavingProductCommandValidator { private final SavingProductCommand command; - public SavingProductCommandValidator(SavingProductCommand command) { + public SavingProductCommandValidator(final SavingProductCommand command) { this.command=command; } + public void validateForUpdate() { List dataValidationErrors = new ArrayList(); - DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("product"); + DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("savingsproduct"); baseDataValidator.reset().parameter("id").value(command.getId()).notNull(); baseDataValidator.reset().parameter("name").value(command.getName()).ignoreIfNull().notBlank(); baseDataValidator.reset().parameter("description").value(command.getDescription()).ignoreIfNull().notExceedingLengthOf(500); @@ -29,6 +30,7 @@ public class SavingProductCommandValidator { throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist", "Validation errors exist.", dataValidationErrors); } } + public void validateForCreate() { List dataValidationErrors = new ArrayList(); @@ -41,4 +43,4 @@ public class SavingProductCommandValidator { throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist", "Validation errors exist.", dataValidationErrors); } } -} +} \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductWritePlatformServiceJpaRepositoryImpl.java index 1113be603..cddd89deb 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductWritePlatformServiceJpaRepositoryImpl.java @@ -24,20 +24,20 @@ public class SavingProductWritePlatformServiceJpaRepositoryImpl implements Savin @Transactional @Override - public EntityIdentifier createSavingProduct(SavingProductCommand command) { + public EntityIdentifier createSavingProduct(final SavingProductCommand command) { this.context.authenticatedUser(); SavingProductCommandValidator validator=new SavingProductCommandValidator(command); validator.validateForCreate(); - SavingProduct product= new SavingProduct(command.getName(),command.getDescription()); + SavingProduct product = new SavingProduct(command.getName(),command.getDescription()); this.savingProductRepository.save(product); return new EntityIdentifier(product.getId()); } @Transactional @Override - public EntityIdentifier updateSavingProduct(SavingProductCommand command) { + public EntityIdentifier updateSavingProduct(final SavingProductCommand command) { this.context.authenticatedUser(); SavingProductCommandValidator validator=new SavingProductCommandValidator(command); @@ -51,5 +51,4 @@ public class SavingProductWritePlatformServiceJpaRepositoryImpl implements Savin this.savingProductRepository.save(product); return new EntityIdentifier(Long.valueOf(product.getId())); } - -} +} \ No newline at end of file