From commits-return-1502-archive-asf-public=cust-asf.ponee.io@fineract.apache.org Mon Jan 22 16:29:21 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id C3232180676 for ; Mon, 22 Jan 2018 16:29:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B254C160C4F; Mon, 22 Jan 2018 15:29:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 62D70160C4B for ; Mon, 22 Jan 2018 16:29:19 +0100 (CET) Received: (qmail 37638 invoked by uid 500); 22 Jan 2018 15:29:18 -0000 Mailing-List: contact commits-help@fineract.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fineract.apache.org Delivered-To: mailing list commits@fineract.apache.org Received: (qmail 37375 invoked by uid 99); 22 Jan 2018 15:29:18 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jan 2018 15:29:18 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A6EF881FFD; Mon, 22 Jan 2018 15:29:17 +0000 (UTC) Date: Mon, 22 Jan 2018 15:29:42 +0000 To: "commits@fineract.apache.org" Subject: [fineract-cn-payroll] 26/27: fix for ATEN-480 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: myrle@apache.org In-Reply-To: <151663495672.19058.12169490733675465764@gitbox.apache.org> References: <151663495672.19058.12169490733675465764@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: fineract-cn-payroll X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Rev: 91bdfbf93ca07a6c20d6055487668f2a33ee4673 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180122152917.A6EF881FFD@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. myrle pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-payroll.git commit 91bdfbf93ca07a6c20d6055487668f2a33ee4673 Author: mgeiss AuthorDate: Wed Oct 11 08:38:44 2017 +0200 fix for ATEN-480 --- .../io/mifos/payroll/api/v1/domain/PayrollConfiguration.java | 10 +++++----- .../main/java/io/mifos/payroll/TestPayrollConfiguration.java | 4 ++-- .../java/io/mifos/payroll/domain/DomainObjectGenerator.java | 4 ++-- .../service/internal/service/PayrollConfigurationService.java | 5 ++++- .../service/rest/PayrollConfigurationRestController.java | 4 ++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollConfiguration.java b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollConfiguration.java index 5375a9a..ee4319f 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollConfiguration.java +++ b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollConfiguration.java @@ -18,15 +18,15 @@ package io.mifos.payroll.api.v1.domain; import io.mifos.core.lang.validation.constraints.ValidIdentifier; import javax.validation.Valid; -import java.util.HashSet; -import java.util.Set; +import java.util.ArrayList; +import java.util.List; public class PayrollConfiguration { @ValidIdentifier(maxLength = 34) private String mainAccountNumber; @Valid - private Set payrollAllocations = new HashSet<>(); + private List payrollAllocations = new ArrayList<>(); private String createdBy; private String createdOn; private String lastModifiedBy; @@ -44,11 +44,11 @@ public class PayrollConfiguration { this.mainAccountNumber = mainAccountNumber; } - public Set getPayrollAllocations() { + public List getPayrollAllocations() { return this.payrollAllocations; } - public void setPayrollAllocations(final Set payrollAllocations) { + public void setPayrollAllocations(final List payrollAllocations) { this.payrollAllocations = payrollAllocations; } diff --git a/component-test/src/main/java/io/mifos/payroll/TestPayrollConfiguration.java b/component-test/src/main/java/io/mifos/payroll/TestPayrollConfiguration.java index f2db0c4..3f7d8df 100644 --- a/component-test/src/main/java/io/mifos/payroll/TestPayrollConfiguration.java +++ b/component-test/src/main/java/io/mifos/payroll/TestPayrollConfiguration.java @@ -15,7 +15,7 @@ */ package io.mifos.payroll; -import com.google.common.collect.Sets; +import com.google.common.collect.Lists; import io.mifos.accounting.api.v1.domain.Account; import io.mifos.customer.api.v1.domain.Customer; import io.mifos.payroll.api.v1.EventConstants; @@ -65,7 +65,7 @@ public class TestPayrollConfiguration extends AbstractPayrollTest { Assert.assertTrue(super.eventRecorder.wait(EventConstants.PUT_CONFIGURATION, customerIdentifier)); final PayrollAllocation newPayrollAllocation = new PayrollAllocation(); - payrollConfiguration.setPayrollAllocations(Sets.newHashSet(newPayrollAllocation)); + payrollConfiguration.setPayrollAllocations(Lists.newArrayList(newPayrollAllocation)); newPayrollAllocation.setAccountNumber(RandomStringUtils.randomAlphanumeric(34)); newPayrollAllocation.setAmount(BigDecimal.valueOf(15.00D)); newPayrollAllocation.setProportional(Boolean.FALSE); diff --git a/component-test/src/main/java/io/mifos/payroll/domain/DomainObjectGenerator.java b/component-test/src/main/java/io/mifos/payroll/domain/DomainObjectGenerator.java index 389cde2..695b7df 100644 --- a/component-test/src/main/java/io/mifos/payroll/domain/DomainObjectGenerator.java +++ b/component-test/src/main/java/io/mifos/payroll/domain/DomainObjectGenerator.java @@ -20,7 +20,7 @@ import io.mifos.payroll.api.v1.domain.PayrollConfiguration; import org.apache.commons.lang3.RandomStringUtils; import java.math.BigDecimal; -import java.util.HashSet; +import java.util.ArrayList; public class DomainObjectGenerator { @@ -32,7 +32,7 @@ public class DomainObjectGenerator { final PayrollConfiguration payrollConfiguration = new PayrollConfiguration(); payrollConfiguration.setMainAccountNumber(RandomStringUtils.randomAlphanumeric(34)); - final HashSet payrollAllocations = new HashSet<>(); + final ArrayList payrollAllocations = new ArrayList<>(); payrollConfiguration.setPayrollAllocations(payrollAllocations); final PayrollAllocation savingsAllocation = new PayrollAllocation(); diff --git a/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollConfigurationService.java b/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollConfigurationService.java index eefeca3..34572dd 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollConfigurationService.java +++ b/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollConfigurationService.java @@ -17,6 +17,7 @@ package io.mifos.payroll.service.internal.service; import io.mifos.accounting.api.v1.domain.Account; import io.mifos.customer.api.v1.domain.Customer; +import io.mifos.payroll.api.v1.domain.PayrollAllocation; import io.mifos.payroll.api.v1.domain.PayrollConfiguration; import io.mifos.payroll.service.ServiceConstants; import io.mifos.payroll.service.internal.mapper.PayrollAllocationMapper; @@ -30,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; +import java.util.Comparator; import java.util.Optional; import java.util.stream.Collectors; @@ -74,7 +76,8 @@ public class PayrollConfigurationService { this.payrollAllocationRepository.findByPayrollConfiguration(payrollConfigurationEntity) .stream() .map(PayrollAllocationMapper::map) - .collect(Collectors.toSet()) + .sorted(Comparator.comparing(PayrollAllocation::getAccountNumber)) + .collect(Collectors.toList()) ); return payrollConfiguration; diff --git a/service/src/main/java/io/mifos/payroll/service/rest/PayrollConfigurationRestController.java b/service/src/main/java/io/mifos/payroll/service/rest/PayrollConfigurationRestController.java index 70e3221..c8849a2 100644 --- a/service/src/main/java/io/mifos/payroll/service/rest/PayrollConfigurationRestController.java +++ b/service/src/main/java/io/mifos/payroll/service/rest/PayrollConfigurationRestController.java @@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; -import java.util.Set; +import java.util.List; @RestController @RequestMapping("/customers/{identifier}/payroll") @@ -83,7 +83,7 @@ public class PayrollConfigurationRestController { if (payrollConfiguration.getPayrollAllocations() != null) { - final Set payrollAllocations = payrollConfiguration.getPayrollAllocations(); + final List payrollAllocations = payrollConfiguration.getPayrollAllocations(); if (payrollAllocations.stream().anyMatch(payrollAllocation -> payrollAllocation.getAccountNumber().equals(payrollConfiguration.getMainAccountNumber()))) { -- To stop receiving notification emails like this one, please contact myrle@apache.org.