Skip to content

Commit 7216df1

Browse files
adamsaghyadamsaghy
authored
Merge pull request #5721
FINERACT-2437: Decrease compilation warnings
2 parents 78e3b12 + a1cd330 commit 7216df1

File tree

14 files changed

+47
-47
lines changed

14 files changed

+47
-47
lines changed

‎fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeNotFoundException.java‎

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

21-
import org.apache.commons.lang3.ObjectUtils;
21+
import java.util.Objects;
2222
import org.apache.fineract.infrastructure.core.domain.ExternalId;
2323
import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
2424
import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
@@ -49,6 +49,6 @@ public LoanChargeNotFoundException(final Long id, final Long loanId, final Empty
4949

5050
public LoanChargeNotFoundException(ExternalId externalId) {
5151
super("error.msg.loanCharge.external.id.invalid", "Loan Charge with external identifier "
52-
+ ObjectUtils.defaultIfNull(externalId, ExternalId.empty()).getValue() + " does not exist", externalId);
52+
+ Objects.requireNonNullElse(externalId, ExternalId.empty()).getValue() + " does not exist", externalId);
5353
}
5454
}

‎fineract-core/src/main/java/org/apache/fineract/infrastructure/core/api/JsonQuery.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.time.LocalDate;
2626
import java.util.Arrays;
2727
import java.util.Map;
28-
import org.apache.commons.lang3.ObjectUtils;
28+
import java.util.Objects;
2929
import org.apache.commons.lang3.StringUtils;
3030
import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
3131
import org.apache.fineract.infrastructure.security.domain.BasicPasswordEncodablePlatformUser;
@@ -240,7 +240,7 @@ public Boolean booleanObjectValueOfParameterNamed(final String parameterName) {
240240
*/
241241
public boolean booleanPrimitiveValueOfParameterNamed(final String parameterName) {
242242
final Boolean value = this.fromApiJsonHelper.extractBooleanNamed(parameterName, this.parsedQuery);
243-
return ObjectUtils.defaultIfNull(value, Boolean.FALSE);
243+
return Objects.requireNonNullElse(value, Boolean.FALSE);
244244
}
245245

246246
public boolean isChangeInArrayParameterNamed(final String parameterName, final String[] existingValue) {

‎fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/PaginationHelper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package org.apache.fineract.infrastructure.core.service;
2020

2121
import java.util.List;
22-
import org.apache.commons.lang3.ObjectUtils;
22+
import java.util.Objects;
2323
import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator;
2424
import org.apache.fineract.infrastructure.core.service.database.DatabaseTypeResolver;
2525
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +62,6 @@ public <E> Page<Long> fetchPage(JdbcTemplate jdbcTemplate, String sql, Class<Lon
6262
String sqlCountRows = sqlGenerator.countLastExecutedQueryResult(sql);
6363
Integer totalFilteredRecords = jdbcTemplate.queryForObject(sqlCountRows, Integer.class);
6464

65-
return new Page<>(items, ObjectUtils.defaultIfNull(totalFilteredRecords, 0));
65+
return new Page<>(items, Objects.requireNonNullElse(totalFilteredRecords, 0));
6666
}
6767
}

‎fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailAssembler.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,21 @@
2222
import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
2323
import org.apache.fineract.portfolio.paymentdetail.PaymentDetailConstants;
2424
import org.apache.fineract.portfolio.paymenttype.domain.PaymentType;
25-
import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepositoryWrapper;
25+
import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepository;
26+
import org.apache.fineract.portfolio.paymenttype.exception.PaymentTypeNotFoundException;
2627
import org.springframework.beans.factory.annotation.Autowired;
2728
import org.springframework.stereotype.Service;
2829

2930
@Service
3031
public class PaymentDetailAssembler {
3132

3233
private final FromJsonHelper fromApiJsonHelper;
33-
private final PaymentTypeRepositoryWrapper repositoryWrapper;
34+
private final PaymentTypeRepository paymentTypeRepository;
3435

3536
@Autowired
36-
public PaymentDetailAssembler(final FromJsonHelper fromApiJsonHelper, final PaymentTypeRepositoryWrapper repositoryWrapper) {
37+
public PaymentDetailAssembler(final FromJsonHelper fromApiJsonHelper, final PaymentTypeRepository paymentTypeRepository) {
3738
this.fromApiJsonHelper = fromApiJsonHelper;
38-
this.repositoryWrapper = repositoryWrapper;
39+
this.paymentTypeRepository = paymentTypeRepository;
3940
}
4041

4142
public PaymentDetail fetchPaymentDetail(final JsonObject json) {
@@ -44,7 +45,8 @@ public PaymentDetail fetchPaymentDetail(final JsonObject json) {
4445
return null;
4546
}
4647

47-
final PaymentType paymentType = this.repositoryWrapper.findOneWithNotFoundDetection(paymentTypeId);
48+
final PaymentType paymentType = this.paymentTypeRepository.findById(paymentTypeId)
49+
.orElseThrow(() -> new PaymentTypeNotFoundException(paymentTypeId));
4850

4951
final String accountNumber = this.fromApiJsonHelper.extractStringNamed(PaymentDetailConstants.accountNumberParamName, json);
5052
final String checkNumber = this.fromApiJsonHelper.extractStringNamed(PaymentDetailConstants.checkNumberParamName, json);

‎fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformServiceJpaRepositoryImpl.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@
2525
import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail;
2626
import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetailRepository;
2727
import org.apache.fineract.portfolio.paymenttype.domain.PaymentType;
28-
import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepositoryWrapper;
28+
import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepository;
29+
import org.apache.fineract.portfolio.paymenttype.exception.PaymentTypeNotFoundException;
2930
import org.springframework.transaction.annotation.Transactional;
3031

3132
@RequiredArgsConstructor
3233
public class PaymentDetailWritePlatformServiceJpaRepositoryImpl implements PaymentDetailWritePlatformService {
3334

3435
private final PaymentDetailRepository paymentDetailRepository;
3536
// private final CodeValueRepositoryWrapper codeValueRepositoryWrapper;
36-
private final PaymentTypeRepositoryWrapper paymentTyperepositoryWrapper;
37+
private final PaymentTypeRepository paymentTypeRepository;
3738

3839
@Override
3940
public PaymentDetail createPaymentDetail(final JsonCommand command, final Map<String, Object> changes) {
@@ -42,7 +43,8 @@ public PaymentDetail createPaymentDetail(final JsonCommand command, final Map<St
4243
return null;
4344
}
4445

45-
final PaymentType paymentType = this.paymentTyperepositoryWrapper.findOneWithNotFoundDetection(paymentTypeId);
46+
final PaymentType paymentType = this.paymentTypeRepository.findById(paymentTypeId)
47+
.orElseThrow(() -> new PaymentTypeNotFoundException(paymentTypeId));
4648
final PaymentDetail paymentDetail = PaymentDetail.generatePaymentDetail(paymentType, command, changes);
4749
return paymentDetail;
4850

‎fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/starter/PaymentDetailConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetailRepository;
2222
import org.apache.fineract.portfolio.paymentdetail.service.PaymentDetailWritePlatformService;
2323
import org.apache.fineract.portfolio.paymentdetail.service.PaymentDetailWritePlatformServiceJpaRepositoryImpl;
24-
import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepositoryWrapper;
24+
import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepository;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2626
import org.springframework.context.annotation.Bean;
2727
import org.springframework.context.annotation.Configuration;
@@ -32,7 +32,7 @@ public class PaymentDetailConfiguration {
3232
@Bean
3333
@ConditionalOnMissingBean(PaymentDetailWritePlatformService.class)
3434
PaymentDetailWritePlatformService paymentDetailWritePlatformService(PaymentDetailRepository paymentDetailRepository,
35-
PaymentTypeRepositoryWrapper paymentTyperepositoryWrapper) {
36-
return new PaymentDetailWritePlatformServiceJpaRepositoryImpl(paymentDetailRepository, paymentTyperepositoryWrapper);
35+
PaymentTypeRepository paymentTypeRepository) {
36+
return new PaymentDetailWritePlatformServiceJpaRepositoryImpl(paymentDetailRepository, paymentTypeRepository);
3737
}
3838
}

‎fineract-document/src/main/java/org/apache/fineract/infrastructure/contentstore/util/DefaultContentPathRandomizer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ public class DefaultContentPathRandomizer implements ContentPathRandomizer {
3434
@Override
3535
public String randomize() {
3636
// TODO: make length configurable
37-
return RandomStringUtils.secureStrong().randomAlphabetic(16);
37+
return RandomStringUtils.secureStrong().nextAlphabetic(16);
3838
}
3939
}

‎fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/exception/LoanNotFoundException.java‎

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

21-
import org.apache.commons.lang3.ObjectUtils;
21+
import java.util.Objects;
2222
import org.apache.fineract.infrastructure.core.domain.ExternalId;
2323
import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
2424

@@ -40,14 +40,12 @@ public LoanNotFoundException(String accountId) {
4040
}
4141

4242
public LoanNotFoundException(ExternalId externalId) {
43-
super("error.msg.loan.external.id.invalid",
44-
"Loan with external identifier " + ObjectUtils.defaultIfNull(externalId, ExternalId.empty()).getValue() + " does not exist",
45-
externalId);
43+
super("error.msg.loan.external.id.invalid", "Loan with external identifier "
44+
+ Objects.requireNonNullElse(externalId, ExternalId.empty()).getValue() + " does not exist", externalId);
4645
}
4746

4847
public LoanNotFoundException(ExternalId externalId, Exception e) {
49-
super("error.msg.loan.external.id.invalid",
50-
"Loan with external identifier " + ObjectUtils.defaultIfNull(externalId, ExternalId.empty()).getValue() + " does not exist",
51-
externalId, e);
48+
super("error.msg.loan.external.id.invalid", "Loan with external identifier "
49+
+ Objects.requireNonNullElse(externalId, ExternalId.empty()).getValue() + " does not exist", externalId, e);
5250
}
5351
}

‎fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/exception/LoanTransactionNotFoundException.java‎

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

21-
import org.apache.commons.lang3.ObjectUtils;
21+
import java.util.Objects;
2222
import org.apache.fineract.infrastructure.core.domain.ExternalId;
2323
import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
2424
import org.springframework.dao.EmptyResultDataAccessException;
@@ -47,13 +47,13 @@ public LoanTransactionNotFoundException(Long id, EmptyResultDataAccessException
4747

4848
public LoanTransactionNotFoundException(ExternalId transactionExternalId) {
4949
super("error.msg.loan.transaction.external.id.invalid", "Transaction with external identifier "
50-
+ ObjectUtils.defaultIfNull(transactionExternalId, ExternalId.empty()).getValue() + " does not exist",
50+
+ Objects.requireNonNullElse(transactionExternalId, ExternalId.empty()).getValue() + " does not exist",
5151
transactionExternalId);
5252
}
5353

5454
public LoanTransactionNotFoundException(ExternalId transactionExternalId, EmptyResultDataAccessException e) {
5555
super("error.msg.loan.transaction.external.id.invalid", "Transaction with external identifier "
56-
+ ObjectUtils.defaultIfNull(transactionExternalId, ExternalId.empty()).getValue() + " does not exist",
56+
+ Objects.requireNonNullElse(transactionExternalId, ExternalId.empty()).getValue() + " does not exist",
5757
transactionExternalId, e);
5858
}
5959
}

‎fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import lombok.Setter;
6666
import lombok.extern.slf4j.Slf4j;
6767
import org.apache.commons.lang3.NotImplementedException;
68-
import org.apache.commons.lang3.ObjectUtils;
6968
import org.apache.commons.lang3.tuple.Pair;
7069
import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDomainService;
7170
import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
@@ -1967,17 +1966,17 @@ private Money processPaymentAllocation(PaymentAllocationType paymentAllocationTy
19671966

19681967
private void addToTransactionMapping(LoanTransactionToRepaymentScheduleMapping loanTransactionToRepaymentScheduleMapping,
19691968
Money principalPortion, Money interestPortion, Money feePortion, Money penaltyPortion) {
1970-
BigDecimal aggregatedPenalty = ObjectUtils
1971-
.defaultIfNull(loanTransactionToRepaymentScheduleMapping.getPenaltyChargesPortion(), BigDecimal.ZERO)
1969+
BigDecimal aggregatedPenalty = Objects
1970+
.requireNonNullElse(loanTransactionToRepaymentScheduleMapping.getPenaltyChargesPortion(), BigDecimal.ZERO)
19721971
.add(penaltyPortion.getAmount());
1973-
BigDecimal aggregatedFee = ObjectUtils
1974-
.defaultIfNull(loanTransactionToRepaymentScheduleMapping.getFeeChargesPortion(), BigDecimal.ZERO)
1972+
BigDecimal aggregatedFee = Objects
1973+
.requireNonNullElse(loanTransactionToRepaymentScheduleMapping.getFeeChargesPortion(), BigDecimal.ZERO)
19751974
.add(feePortion.getAmount());
1976-
BigDecimal aggregatedInterest = ObjectUtils
1977-
.defaultIfNull(loanTransactionToRepaymentScheduleMapping.getInterestPortion(), BigDecimal.ZERO)
1975+
BigDecimal aggregatedInterest = Objects
1976+
.requireNonNullElse(loanTransactionToRepaymentScheduleMapping.getInterestPortion(), BigDecimal.ZERO)
19781977
.add(interestPortion.getAmount());
1979-
BigDecimal aggregatedPrincipal = ObjectUtils
1980-
.defaultIfNull(loanTransactionToRepaymentScheduleMapping.getPrincipalPortion(), BigDecimal.ZERO)
1978+
BigDecimal aggregatedPrincipal = Objects
1979+
.requireNonNullElse(loanTransactionToRepaymentScheduleMapping.getPrincipalPortion(), BigDecimal.ZERO)
19811980
.add(principalPortion.getAmount());
19821981
loanTransactionToRepaymentScheduleMapping.setComponents(aggregatedPrincipal, aggregatedInterest, aggregatedFee, aggregatedPenalty);
19831982
}

0 commit comments

Comments
 (0)