Skip to content

Commit b9b265b

Browse files
angelboxesvorburger
angelboxes
authored and
vorburger
committed
Changes to comply with Checkstyle rules
1 parent 8df44af commit b9b265b

10 files changed

Lines changed: 117 additions & 117 deletions

File tree

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -299,27 +299,27 @@ public class LoansApiResource {
299299

300300
@Autowired
301301
public LoansApiResource(final PlatformSecurityContext context, final LoanReadPlatformService loanReadPlatformService,
302-
final LoanProductReadPlatformService loanProductReadPlatformService,
303-
final LoanDropdownReadPlatformService dropdownReadPlatformService, final FundReadPlatformService fundReadPlatformService,
304-
final ChargeReadPlatformService chargeReadPlatformService, final LoanChargeReadPlatformService loanChargeReadPlatformService,
305-
final CollateralReadPlatformService loanCollateralReadPlatformService,
306-
final LoanScheduleCalculationPlatformService calculationPlatformService,
307-
final GuarantorReadPlatformService guarantorReadPlatformService,
308-
final CodeValueReadPlatformService codeValueReadPlatformService, final GroupReadPlatformService groupReadPlatformService,
309-
final DefaultToApiJsonSerializer<LoanAccountData> toApiJsonSerializer,
310-
final DefaultToApiJsonSerializer<LoanApprovalData> loanApprovalDataToApiJsonSerializer,
311-
final DefaultToApiJsonSerializer<LoanScheduleData> loanScheduleToApiJsonSerializer,
312-
final ApiRequestParameterHelper apiRequestParameterHelper, final FromJsonHelper fromJsonHelper,
313-
final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService,
314-
final CalendarReadPlatformService calendarReadPlatformService, final NoteReadPlatformServiceImpl noteReadPlatformService,
315-
final PortfolioAccountReadPlatformService portfolioAccountReadPlatformServiceImpl,
316-
final AccountAssociationsReadPlatformService accountAssociationsReadPlatformService,
317-
final LoanScheduleHistoryReadPlatformService loanScheduleHistoryReadPlatformService,
318-
final AccountDetailsReadPlatformService accountDetailsReadPlatformService,
319-
final EntityDatatableChecksReadService entityDatatableChecksReadService,
320-
final BulkImportWorkbookService bulkImportWorkbookService,
321-
final BulkImportWorkbookPopulatorService bulkImportWorkbookPopulatorService, final RateReadService rateReadService,
322-
final ConfigurationDomainService configurationDomainService) {
302+
final LoanProductReadPlatformService loanProductReadPlatformService,
303+
final LoanDropdownReadPlatformService dropdownReadPlatformService, final FundReadPlatformService fundReadPlatformService,
304+
final ChargeReadPlatformService chargeReadPlatformService, final LoanChargeReadPlatformService loanChargeReadPlatformService,
305+
final CollateralReadPlatformService loanCollateralReadPlatformService,
306+
final LoanScheduleCalculationPlatformService calculationPlatformService,
307+
final GuarantorReadPlatformService guarantorReadPlatformService,
308+
final CodeValueReadPlatformService codeValueReadPlatformService, final GroupReadPlatformService groupReadPlatformService,
309+
final DefaultToApiJsonSerializer<LoanAccountData> toApiJsonSerializer,
310+
final DefaultToApiJsonSerializer<LoanApprovalData> loanApprovalDataToApiJsonSerializer,
311+
final DefaultToApiJsonSerializer<LoanScheduleData> loanScheduleToApiJsonSerializer,
312+
final ApiRequestParameterHelper apiRequestParameterHelper, final FromJsonHelper fromJsonHelper,
313+
final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService,
314+
final CalendarReadPlatformService calendarReadPlatformService, final NoteReadPlatformServiceImpl noteReadPlatformService,
315+
final PortfolioAccountReadPlatformService portfolioAccountReadPlatformServiceImpl,
316+
final AccountAssociationsReadPlatformService accountAssociationsReadPlatformService,
317+
final LoanScheduleHistoryReadPlatformService loanScheduleHistoryReadPlatformService,
318+
final AccountDetailsReadPlatformService accountDetailsReadPlatformService,
319+
final EntityDatatableChecksReadService entityDatatableChecksReadService,
320+
final BulkImportWorkbookService bulkImportWorkbookService,
321+
final BulkImportWorkbookPopulatorService bulkImportWorkbookPopulatorService, final RateReadService rateReadService,
322+
final ConfigurationDomainService configurationDomainService) {
323323
this.context = context;
324324
this.loanReadPlatformService = loanReadPlatformService;
325325
this.loanProductReadPlatformService = loanProductReadPlatformService;

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAssembler.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import java.util.List;
2626
import java.util.Locale;
2727
import java.util.Set;
28-
29-
import com.google.gson.JsonArray;
3028
import org.apache.fineract.infrastructure.codes.domain.CodeValue;
3129
import org.apache.fineract.infrastructure.codes.domain.CodeValueRepositoryWrapper;
3230
import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDomainService;
@@ -73,7 +71,6 @@
7371
import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanApplicationTerms;
7472
import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanScheduleModel;
7573
import org.apache.fineract.portfolio.loanaccount.loanschedule.service.LoanScheduleAssembler;
76-
import org.apache.fineract.portfolio.loanproduct.LoanProductConstants;
7774
import org.apache.fineract.portfolio.loanproduct.domain.LoanProduct;
7875
import org.apache.fineract.portfolio.loanproduct.domain.LoanProductRelatedDetail;
7976
import org.apache.fineract.portfolio.loanproduct.domain.LoanProductRepository;

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/api/RateApiResource.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,18 @@
2020
package org.apache.fineract.portfolio.rate.api;
2121

2222
import java.util.Arrays;
23+
import java.util.Collection;
2324
import java.util.HashSet;
2425
import java.util.Set;
26+
import javax.ws.rs.Consumes;
27+
import javax.ws.rs.GET;
28+
import javax.ws.rs.POST;
29+
import javax.ws.rs.PUT;
30+
import javax.ws.rs.Path;
31+
import javax.ws.rs.PathParam;
32+
import javax.ws.rs.Produces;
2533
import javax.ws.rs.core.Context;
34+
import javax.ws.rs.core.MediaType;
2635
import javax.ws.rs.core.UriInfo;
2736
import org.apache.fineract.commands.domain.CommandWrapper;
2837
import org.apache.fineract.commands.service.CommandWrapperBuilder;
@@ -34,15 +43,10 @@
3443
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
3544
import org.apache.fineract.portfolio.rate.data.RateData;
3645
import org.apache.fineract.portfolio.rate.service.RateReadService;
37-
import org.apache.fineract.portfolio.rate.service.RateWriteService;
3846
import org.springframework.beans.factory.annotation.Autowired;
3947
import org.springframework.context.annotation.Scope;
4048
import org.springframework.stereotype.Component;
4149

42-
import javax.ws.rs.*;
43-
import javax.ws.rs.core.MediaType;
44-
import java.util.Collection;
45-
4650
/**
4751
* Bowpi GT Created by Jose on 19/07/2017.
4852
*/

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/data/RateData.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919

2020
package org.apache.fineract.portfolio.rate.data;
2121

22-
import org.apache.fineract.infrastructure.core.data.EnumOptionData;
23-
2422
import java.io.Serializable;
2523
import java.math.BigDecimal;
24+
import org.apache.fineract.infrastructure.core.data.EnumOptionData;
2625

2726
/**
2827
* Bowpi GT Created by Jose on 19/07/2017.

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/domain/Rate.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,20 @@
1919

2020
package org.apache.fineract.portfolio.rate.domain;
2121

22-
import java.util.ArrayList;
22+
import java.math.BigDecimal;
2323
import java.util.LinkedHashMap;
24-
import java.util.List;
2524
import java.util.Map;
25+
import javax.persistence.Column;
26+
import javax.persistence.Entity;
27+
import javax.persistence.JoinColumn;
28+
import javax.persistence.ManyToOne;
29+
import javax.persistence.Table;
30+
import javax.persistence.UniqueConstraint;
2631
import org.apache.commons.lang.StringUtils;
2732
import org.apache.fineract.infrastructure.core.api.JsonCommand;
28-
import org.apache.fineract.infrastructure.core.data.ApiParameterError;
29-
import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
30-
import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
33+
import org.apache.fineract.infrastructure.core.domain.AbstractAuditableCustom;
3134
import org.apache.fineract.portfolio.charge.exception.ChargeParameterUpdateNotSupportedException;
3235
import org.apache.fineract.useradministration.domain.AppUser;
33-
import org.apache.fineract.portfolio.rate.domain.RateAppliesTo;
34-
35-
import javax.persistence.*;
36-
import java.math.BigDecimal;
37-
import org.apache.fineract.infrastructure.core.domain.AbstractAuditableCustom;
3836

3937
/**
4038
* Bowpi GT Created by Jose on 19/07/2017.
@@ -133,7 +131,8 @@ public String toString() {
133131
'}';
134132
}
135133

136-
public static Rate from(String name, BigDecimal percentage, RateAppliesTo productApply, Boolean active) {
134+
public static Rate from(String name, BigDecimal percentage, RateAppliesTo productApply,
135+
Boolean active) {
137136
return new Rate(name, percentage, productApply, active);
138137
}
139138

@@ -143,8 +142,9 @@ public static Rate fromJson(final JsonCommand command, AppUser user) {
143142

144143
final BigDecimal percentage = command.bigDecimalValueOfParameterNamed("percentage");
145144

146-
final RateAppliesTo productApply = RateAppliesTo.fromInt(command.integerValueOfParameterNamed("productApply"));
147-
145+
final RateAppliesTo productApply = RateAppliesTo
146+
.fromInt(command.integerValueOfParameterNamed("productApply"));
147+
148148
final boolean active = command.booleanPrimitiveValueOfParameterNamed("active");
149149

150150
return new Rate(name, percentage, productApply, active, user);
@@ -198,7 +198,8 @@ private Long getApproveUserId() {
198198
return approveUserId;
199199
}
200200

201-
public void assembleFrom(String name, BigDecimal percentage, Integer productApply, boolean active){
201+
public void assembleFrom(String name, BigDecimal percentage, Integer productApply,
202+
boolean active) {
202203
this.name = name;
203204
this.percentage = percentage;
204205
this.productApply = productApply;

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/domain/RateAppliesTo.java‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,51 +16,52 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
20-
package org.apache.fineract.portfolio.rate.domain;
19+
20+
package org.apache.fineract.portfolio.rate.domain;
2121

2222
public enum RateAppliesTo {
2323

24-
INVALID(0, "rateAppliesTo.invalid"),
25-
LOAN(1, "rateAppliesTo.loan");
26-
27-
private final Integer value;
28-
private final String code;
24+
INVALID(0, "rateAppliesTo.invalid"),
25+
LOAN(1, "rateAppliesTo.loan");
2926

30-
private RateAppliesTo(final Integer value, final String code) {
31-
this.value = value;
32-
this.code = code;
33-
}
27+
private final Integer value;
28+
private final String code;
3429

35-
public Integer getValue() {
36-
return this.value;
37-
}
30+
private RateAppliesTo(final Integer value, final String code) {
31+
this.value = value;
32+
this.code = code;
33+
}
3834

39-
public String getCode() {
40-
return this.code;
41-
}
35+
public Integer getValue() {
36+
return this.value;
37+
}
4238

43-
public static RateAppliesTo fromInt(final Integer rateAppliesTo) {
44-
RateAppliesTo rateAppliesToType = RateAppliesTo.INVALID;
39+
public String getCode() {
40+
return this.code;
41+
}
4542

46-
if (rateAppliesTo != null) {
47-
switch (rateAppliesTo) {
48-
case 1:
49-
rateAppliesToType = LOAN;
50-
break;
51-
default:
52-
rateAppliesToType = INVALID;
53-
break;
54-
}
55-
}
43+
public static RateAppliesTo fromInt(final Integer rateAppliesTo) {
44+
RateAppliesTo rateAppliesToType = RateAppliesTo.INVALID;
5645

57-
return rateAppliesToType;
46+
if (rateAppliesTo != null) {
47+
switch (rateAppliesTo) {
48+
case 1:
49+
rateAppliesToType = LOAN;
50+
break;
51+
default:
52+
rateAppliesToType = INVALID;
53+
break;
54+
}
5855
}
5956

60-
public boolean isLoanRate() {
61-
return this.value.equals(RateAppliesTo.LOAN.getValue());
62-
}
63-
public static Object[] validValues() {
64-
return new Object[] { RateAppliesTo.LOAN.getValue() };
65-
}
57+
return rateAppliesToType;
58+
}
59+
60+
public boolean isLoanRate() {
61+
return this.value.equals(RateAppliesTo.LOAN.getValue());
62+
}
63+
64+
public static Object[] validValues() {
65+
return new Object[]{RateAppliesTo.LOAN.getValue()};
66+
}
6667
}

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/domain/RateRepository.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@
1818
*/
1919
package org.apache.fineract.portfolio.rate.domain;
2020

21+
import java.util.List;
2122
import org.springframework.data.jpa.repository.JpaRepository;
2223
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
2324

24-
import java.util.List;
25-
2625
/**
27-
* Bowpi GT
28-
* Rate repository to save on m_rate table (custom change for Credi Chapin)
29-
* Created by Jose on 19/07/2017.
26+
* Bowpi GT Rate repository to save on m_rate table (custom change for Credi Chapin) Created by Jose
27+
* on 19/07/2017.
3028
*/
3129
public interface RateRepository extends JpaRepository<Rate, Long>, JpaSpecificationExecutor<Rate> {
3230

33-
Rate findByName(String name);
34-
List<Rate> findAllByActiveAndProductApply(boolean active, String productApply);
31+
Rate findByName(String name);
32+
33+
List<Rate> findAllByActiveAndProductApply(boolean active, String productApply);
3534

3635
}

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateEnumerations.java‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,25 @@
2424

2525
public class RateEnumerations {
2626

27-
public static EnumOptionData rateAppliesTo(final int id) {
28-
return rateAppliesTo(RateAppliesTo.fromInt(id));
29-
}
27+
public static EnumOptionData rateAppliesTo(final int id) {
28+
return rateAppliesTo(RateAppliesTo.fromInt(id));
29+
}
3030

31-
public static EnumOptionData rateAppliesTo(final RateAppliesTo type) {
32-
EnumOptionData optionData = null;
33-
switch (type) {
34-
case LOAN:
35-
optionData = new EnumOptionData(RateAppliesTo.LOAN.getValue().longValue(), RateAppliesTo.LOAN.getCode(), "Loan");
36-
break;
37-
default:
38-
optionData = new EnumOptionData(RateAppliesTo.INVALID.getValue().longValue(), RateAppliesTo.INVALID.getCode(),
39-
"Invalid");
40-
break;
41-
}
42-
return optionData;
31+
public static EnumOptionData rateAppliesTo(final RateAppliesTo type) {
32+
EnumOptionData optionData = null;
33+
switch (type) {
34+
case LOAN:
35+
optionData = new EnumOptionData(RateAppliesTo.LOAN.getValue().longValue(),
36+
RateAppliesTo.LOAN.getCode(), "Loan");
37+
break;
38+
default:
39+
optionData = new EnumOptionData(RateAppliesTo.INVALID.getValue().longValue(),
40+
RateAppliesTo.INVALID.getCode(),
41+
"Invalid");
42+
break;
4343
}
44+
return optionData;
45+
}
4446

45-
4647

4748
}

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadService.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
*/
1919
package org.apache.fineract.portfolio.rate.service;
2020

21-
import org.apache.fineract.portfolio.rate.data.RateData;
22-
2321
import java.util.Collection;
2422
import java.util.List;
23+
import org.apache.fineract.portfolio.rate.data.RateData;
2524

2625
/**
2726
* Bowpi GT

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,24 @@
1919

2020
package org.apache.fineract.portfolio.rate.service;
2121

22+
import java.math.BigDecimal;
23+
import java.sql.ResultSet;
24+
import java.sql.SQLException;
25+
import java.util.Collection;
26+
import java.util.List;
2227
import org.apache.fineract.infrastructure.core.data.EnumOptionData;
2328
import org.apache.fineract.infrastructure.core.service.RoutingDataSource;
2429
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
25-
import org.apache.fineract.portfolio.charge.service.ChargeEnumerations;
30+
import org.apache.fineract.portfolio.rate.data.RateData;
31+
import org.apache.fineract.portfolio.rate.domain.Rate;
2632
import org.apache.fineract.portfolio.rate.domain.RateAppliesTo;
2733
import org.apache.fineract.portfolio.rate.exception.RateNotFoundException;
28-
import org.apache.fineract.portfolio.rate.domain.Rate;
29-
import org.apache.fineract.portfolio.rate.data.RateData;
3034
import org.springframework.beans.factory.annotation.Autowired;
3135
import org.springframework.dao.EmptyResultDataAccessException;
3236
import org.springframework.jdbc.core.JdbcTemplate;
3337
import org.springframework.jdbc.core.RowMapper;
3438
import org.springframework.stereotype.Service;
3539

36-
import java.math.BigDecimal;
37-
import java.sql.ResultSet;
38-
import java.sql.SQLException;
39-
import java.util.Collection;
40-
import java.util.List;
41-
4240
/**
4341
* Bowpi GT Created by Jose on 19/07/2017.
4442
*/
@@ -95,7 +93,7 @@ public Collection<RateData> retrieveLoanApplicableRates() {
9593
this.context.authenticatedUser();
9694
final RateMapper rm = new RateMapper();
9795
final String sql = "select " + rm.rateSchema() + " where r.active = ? and product_apply=?";
98-
return this.jdbcTemplate.query(sql, rm, new Object[]{true, RateAppliesTo.LOAN.getValue() });
96+
return this.jdbcTemplate.query(sql, rm, new Object[]{true, RateAppliesTo.LOAN.getValue()});
9997
}
10098

10199
@Override
@@ -146,7 +144,8 @@ public RateData mapRow(Rate rateResponse, int i) {
146144
final Long id = rateResponse.getId();
147145
final String name = rateResponse.getName();
148146
final BigDecimal percentage = rateResponse.getPercentage();
149-
final EnumOptionData productApply = RateEnumerations.rateAppliesTo(rateResponse.getProductApply());;
147+
final EnumOptionData productApply = RateEnumerations
148+
.rateAppliesTo(rateResponse.getProductApply());
150149
final boolean active = rateResponse.isActive();
151150
return RateData.instance(id, name, percentage, productApply, active);
152151
}

0 commit comments

Comments
 (0)