Skip to content

Commit 9d599f7

Browse files
adamsaghyAvtansh88
adamsaghy
authored and
Avtansh88
committed
FINERACT-2421: Reformat CommandProcessingResultBuilder definition
1 parent 135c052 commit 9d599f7

85 files changed

Lines changed: 760 additions & 262 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎fineract-accounting/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,11 @@ public CommandProcessingResult createGLClosure(final JsonCommand command) {
8080

8181
this.glClosureRepository.saveAndFlush(glClosure);
8282

83-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withOfficeId(officeId)
84-
.withEntityId(glClosure.getId()).build();
83+
return new CommandProcessingResultBuilder() //
84+
.withCommandId(command.commandId()) //
85+
.withOfficeId(officeId) //
86+
.withEntityId(glClosure.getId()) //
87+
.build();
8588
} catch (final JpaSystemException | DataIntegrityViolationException dve) {
8689
final Throwable throwable = dve.getMostSpecificCause();
8790
handleGLClosureIntegrityIssues(command, throwable, dve);
@@ -105,8 +108,12 @@ public CommandProcessingResult updateGLClosure(final Long glClosureId, final Jso
105108
this.glClosureRepository.saveAndFlush(glClosure);
106109
}
107110

108-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withOfficeId(glClosure.getOffice().getId())
109-
.withEntityId(glClosure.getId()).with(changesOnly).build();
111+
return new CommandProcessingResultBuilder() //
112+
.withCommandId(command.commandId()) //
113+
.withOfficeId(glClosure.getOffice().getId()) //
114+
.withEntityId(glClosure.getId()) //
115+
.with(changesOnly) //
116+
.build();
110117
}
111118

112119
@Transactional
@@ -127,7 +134,10 @@ public CommandProcessingResult deleteGLClosure(final Long glClosureId) {
127134

128135
this.glClosureRepository.delete(glClosure);
129136

130-
return new CommandProcessingResultBuilder().withOfficeId(glClosure.getOffice().getId()).withEntityId(glClosure.getId()).build();
137+
return new CommandProcessingResultBuilder() //
138+
.withOfficeId(glClosure.getOffice().getId()) //
139+
.withEntityId(glClosure.getId()) //
140+
.build();
131141
}
132142

133143
/**

‎fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountWritePlatformServiceJpaRepositoryImpl.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ public CommandProcessingResult createGLAccount(final JsonCommand command) {
9999

100100
this.glAccountRepository.saveAndFlush(glAccount);
101101

102-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(glAccount.getId()).build();
102+
return new CommandProcessingResultBuilder() //
103+
.withCommandId(command.commandId()) //
104+
.withEntityId(glAccount.getId()) //
105+
.build();
103106
} catch (final JpaSystemException | DataIntegrityViolationException dve) {
104107
final Throwable throwable = dve.getMostSpecificCause();
105108
handleGLAccountDataIntegrityIssues(command, throwable, dve);
@@ -159,7 +162,10 @@ public CommandProcessingResult updateGLAccount(final Long glAccountId, final Jso
159162
this.glAccountRepository.saveAndFlush(glAccount);
160163
}
161164

162-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(glAccount.getId()).with(changesOnly)
165+
return new CommandProcessingResultBuilder() //
166+
.withCommandId(command.commandId()) //
167+
.withEntityId(glAccount.getId()) //
168+
.with(changesOnly) //
163169
.build();
164170
} catch (final JpaSystemException | DataIntegrityViolationException dve) {
165171
final Throwable throwable = dve.getMostSpecificCause();
@@ -205,7 +211,9 @@ public CommandProcessingResult deleteGLAccount(final Long glAccountId) {
205211
}
206212
this.glAccountRepository.delete(glAccount);
207213

208-
return new CommandProcessingResultBuilder().withEntityId(glAccountId).build();
214+
return new CommandProcessingResultBuilder() //
215+
.withEntityId(glAccountId) //
216+
.build();
209217
}
210218

211219
/**

‎fineract-accounting/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,11 @@ public CommandProcessingResult createAccountingRule(final JsonCommand command) {
9898

9999
final AccountingRule accountingRule = assembleAccountingRuleAndTags(office, command);
100100
this.accountingRuleRepository.saveAndFlush(accountingRule);
101-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withOfficeId(officeId)
102-
.withEntityId(accountingRule.getId()).build();
101+
return new CommandProcessingResultBuilder() //
102+
.withCommandId(command.commandId()) //
103+
.withOfficeId(officeId) //
104+
.withEntityId(accountingRule.getId()) //
105+
.build();
103106
} catch (final JpaSystemException | DataIntegrityViolationException dve) {
104107
final Throwable throwable = dve.getMostSpecificCause();
105108
handleAccountingRuleIntegrityIssues(command, throwable, dve);
@@ -265,8 +268,11 @@ public CommandProcessingResult updateAccountingRule(final Long accountingRuleId,
265268
this.accountingRuleRepository.saveAndFlush(accountingRule);
266269
}
267270

268-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(accountingRule.getId())
269-
.with(changesOnly).build();
271+
return new CommandProcessingResultBuilder() //
272+
.withCommandId(command.commandId()) //
273+
.withEntityId(accountingRule.getId()) //
274+
.with(changesOnly) //
275+
.build();
270276
} catch (final JpaSystemException | DataIntegrityViolationException dve) {
271277
final Throwable throwable = dve.getMostSpecificCause();
272278
handleAccountingRuleIntegrityIssues(command, throwable, dve);
@@ -319,7 +325,9 @@ private Set<String> retrieveExistingTagIds(final Set<AccountingTagRule> existing
319325
public CommandProcessingResult deleteAccountingRule(final Long accountingRuleId) {
320326
final AccountingRule accountingRule = this.accountingRuleRepositoryWrapper.findOneWithNotFoundDetection(accountingRuleId);
321327
this.accountingRuleRepository.delete(accountingRule);
322-
return new CommandProcessingResultBuilder().withEntityId(accountingRule.getId()).build();
328+
return new CommandProcessingResultBuilder() //
329+
.withEntityId(accountingRule.getId()) //
330+
.build();
323331
}
324332

325333
private List<AccountingTagRule> saveDebitOrCreditTags(final Set<String> creditOrDebitTagArray, final JournalEntryType transactionType,

‎fineract-cob/src/main/java/org/apache/fineract/cob/service/ConfigJobParameterServiceImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ public CommandProcessingResult updateStepConfigByJobName(JsonCommand command, St
8686
} else {
8787
throw new BusinessStepException(notValidBusinessStepNames + " Business steps are not configurable for this job.");
8888
}
89-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).build();
89+
return new CommandProcessingResultBuilder() //
90+
.withCommandId(command.commandId()) //
91+
.build();
9092
}
9193

9294
@Override

‎fineract-core/src/main/java/org/apache/fineract/commands/exception/RollbackTransactionNotApprovedException.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ public class RollbackTransactionNotApprovedException extends RuntimeException {
3131
private final CommandProcessingResult result;
3232

3333
public RollbackTransactionNotApprovedException(Long commandId, Long entityId) {
34-
this.result = new CommandProcessingResultBuilder().withCommandId(commandId).withEntityId(entityId).setRollbackTransaction(true)
34+
this.result = new CommandProcessingResultBuilder() //
35+
.withCommandId(commandId) //
36+
.withEntityId(entityId) //
37+
.setRollbackTransaction(true) //
3538
.build();
3639
}
3740

‎fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnerLoanProductAttributesWriteServiceImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ private ExternalAssetOwnerLoanProductAttributes createExternalAssetOwnerLoanProd
183183
}
184184

185185
private CommandProcessingResult buildResponseData(ExternalAssetOwnerLoanProductAttributes savedAttribute) {
186-
return new CommandProcessingResultBuilder().withEntityId(savedAttribute.getLoanProductId()).build();
186+
return new CommandProcessingResultBuilder() //
187+
.withEntityId(savedAttribute.getLoanProductId()) //
188+
.build();
187189
}
188190
}

‎fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnersWriteServiceImpl.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,12 @@ private ExternalAssetOwnerTransfer createCancelTransfer(ExternalAssetOwnerTransf
350350
}
351351

352352
private CommandProcessingResult buildResponseData(ExternalAssetOwnerTransfer savedExternalAssetOwnerTransfer) {
353-
return new CommandProcessingResultBuilder().withEntityId(savedExternalAssetOwnerTransfer.getId())
354-
.withEntityExternalId(savedExternalAssetOwnerTransfer.getExternalId())
355-
.withSubEntityId(savedExternalAssetOwnerTransfer.getLoanId())
353+
return new CommandProcessingResultBuilder() //
354+
.withEntityId(savedExternalAssetOwnerTransfer.getId()) //
355+
.withEntityExternalId(savedExternalAssetOwnerTransfer.getExternalId()) //
356+
.withSubEntityId(savedExternalAssetOwnerTransfer.getLoanId()) //
356357
.withSubEntityExternalId(Objects.isNull(savedExternalAssetOwnerTransfer.getExternalLoanId()) ? null
357-
: savedExternalAssetOwnerTransfer.getExternalLoanId())
358+
: savedExternalAssetOwnerTransfer.getExternalLoanId()) //
358359
.build();
359360
}
360361

@@ -645,6 +646,8 @@ public CommandProcessingResult createExternalAssetOwner(JsonCommand command) {
645646
}
646647

647648
final ExternalAssetOwner externalAssetOwner = createAndGetAssetOwner(ownerExternalId);
648-
return new CommandProcessingResultBuilder().withEntityId(externalAssetOwner.getId()).build();
649+
return new CommandProcessingResultBuilder() //
650+
.withEntityId(externalAssetOwner.getId()) //
651+
.build();
649652
}
650653
}

‎fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/service/LoanOriginatorWritePlatformServiceImpl.java‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,11 @@ public CommandProcessingResult create(final JsonCommand command) {
8989
final LoanOriginator originator = LoanOriginator.create(externalId, name, status, originatorType, channelType);
9090
this.loanOriginatorRepository.saveAndFlush(originator);
9191

92-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(originator.getId())
93-
.withEntityExternalId(externalId).build();
92+
return new CommandProcessingResultBuilder() //
93+
.withCommandId(command.commandId()) //
94+
.withEntityId(originator.getId()) //
95+
.withEntityExternalId(externalId) //
96+
.build();
9497
}
9598

9699
@Override
@@ -133,8 +136,12 @@ public CommandProcessingResult update(final Long id, final JsonCommand command)
133136
this.loanOriginatorRepository.saveAndFlush(originator);
134137
}
135138

136-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(originator.getId())
137-
.withEntityExternalId(originator.getExternalId()).with(changes).build();
139+
return new CommandProcessingResultBuilder() //
140+
.withCommandId(command.commandId()) //
141+
.withEntityId(originator.getId()) //
142+
.withEntityExternalId(originator.getExternalId()) //
143+
.with(changes) //
144+
.build();
138145
}
139146

140147
@Override
@@ -149,7 +156,10 @@ public CommandProcessingResult delete(final Long id) {
149156
final ExternalId externalId = originator.getExternalId();
150157
this.loanOriginatorRepository.delete(originator);
151158

152-
return new CommandProcessingResultBuilder().withEntityId(id).withEntityExternalId(externalId).build();
159+
return new CommandProcessingResultBuilder() //
160+
.withEntityId(id) //
161+
.withEntityExternalId(externalId) //
162+
.build();
153163
}
154164

155165
@Override
@@ -174,8 +184,12 @@ public CommandProcessingResult attachOriginatorToLoan(final Long loanId, final L
174184
final LoanOriginatorMapping mapping = LoanOriginatorMapping.create(loanId, originator);
175185
this.loanOriginatorMappingRepository.saveAndFlush(mapping);
176186

177-
return new CommandProcessingResultBuilder().withEntityId(loanId).withEntityExternalId(loan.getExternalId())
178-
.withSubEntityId(originatorId).withSubEntityExternalId(originator.getExternalId()).build();
187+
return new CommandProcessingResultBuilder() //
188+
.withEntityId(loanId) //
189+
.withEntityExternalId(loan.getExternalId()) //
190+
.withSubEntityId(originatorId) //
191+
.withSubEntityExternalId(originator.getExternalId()) //
192+
.build();
179193
}
180194

181195
@Override
@@ -194,8 +208,12 @@ public CommandProcessingResult detachOriginatorFromLoan(final Long loanId, final
194208

195209
this.loanOriginatorMappingRepository.delete(mapping);
196210

197-
return new CommandProcessingResultBuilder().withEntityId(loanId).withEntityExternalId(loan.getExternalId())
198-
.withSubEntityId(originatorId).withSubEntityExternalId(originator.getExternalId()).build();
211+
return new CommandProcessingResultBuilder() //
212+
.withEntityId(loanId) //
213+
.withEntityExternalId(loan.getExternalId()) //
214+
.withSubEntityId(originatorId) //
215+
.withSubEntityExternalId(originator.getExternalId()) //
216+
.build();
199217
}
200218

201219
private CodeValue resolveCodeValue(final JsonCommand command, final String paramName, final String codeName) {

‎fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyWritePlatformServiceImpl.java‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ public CommandProcessingResult createDelinquencyRange(JsonCommand command) {
9595
DelinquencyRangeData data = dataValidatorRange.validateAndParseUpdate(command);
9696
Map<String, Object> changes = new HashMap<>();
9797
DelinquencyRange delinquencyRange = createDelinquencyRange(data, changes);
98-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(delinquencyRange.getId()).with(changes)
98+
return new CommandProcessingResultBuilder() //
99+
.withCommandId(command.commandId()) //
100+
.withEntityId(delinquencyRange.getId()) //
101+
.with(changes) //
99102
.build();
100103
}
101104

@@ -105,7 +108,10 @@ public CommandProcessingResult updateDelinquencyRange(Long delinquencyRangeId, J
105108
DelinquencyRange delinquencyRange = this.repositoryRange.getReferenceById(delinquencyRangeId);
106109
Map<String, Object> changes = new HashMap<>();
107110
delinquencyRange = updateDelinquencyRange(delinquencyRange, data, changes);
108-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(delinquencyRange.getId()).with(changes)
111+
return new CommandProcessingResultBuilder() //
112+
.withCommandId(command.commandId()) //
113+
.withEntityId(delinquencyRange.getId()) //
114+
.with(changes) //
109115
.build();
110116
}
111117

@@ -119,17 +125,26 @@ public CommandProcessingResult deleteDelinquencyRange(Long delinquencyRangeId, J
119125
"Data integrity issue with resource: " + delinquencyRange.getId());
120126
}
121127
repositoryRange.delete(delinquencyRange);
122-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(delinquencyRange.getId()).build();
128+
return new CommandProcessingResultBuilder() //
129+
.withCommandId(command.commandId()) //
130+
.withEntityId(delinquencyRange.getId()) //
131+
.build();
123132
}
124-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(delinquencyRangeId).build();
133+
return new CommandProcessingResultBuilder() //
134+
.withCommandId(command.commandId()) //
135+
.withEntityId(delinquencyRangeId) //
136+
.build();
125137
}
126138

127139
@Override
128140
public CommandProcessingResult createDelinquencyBucket(JsonCommand command) {
129141
DelinquencyBucketData data = dataValidatorBucket.validateAndParseUpdate(command);
130142
Map<String, Object> changes = new HashMap<>();
131143
DelinquencyBucket delinquencyBucket = createDelinquencyBucket(data, changes);
132-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(delinquencyBucket.getId()).with(changes)
144+
return new CommandProcessingResultBuilder() //
145+
.withCommandId(command.commandId()) //
146+
.withEntityId(delinquencyBucket.getId()) //
147+
.with(changes) //
133148
.build();
134149
}
135150

@@ -140,7 +155,10 @@ public CommandProcessingResult updateDelinquencyBucket(Long delinquencyBucketId,
140155

141156
Map<String, Object> changes = new HashMap<>();
142157
delinquencyBucket = updateDelinquencyBucket(delinquencyBucket, data, changes);
143-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(delinquencyBucket.getId()).with(changes)
158+
return new CommandProcessingResultBuilder() //
159+
.withCommandId(command.commandId()) //
160+
.withEntityId(delinquencyBucket.getId()) //
161+
.with(changes) //
144162
.build();
145163
}
146164

@@ -165,7 +183,10 @@ public CommandProcessingResult deleteDelinquencyBucket(Long delinquencyBucketId,
165183
throw new DelinquencyBucketNotFoundException("error.msg.delinquency.bucket.id.not.exist",
166184
"Delinquency bucket with id `" + delinquencyBucketId + "` does not exist.", delinquencyBucketId);
167185
}
168-
return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(delinquencyBucketId).build();
186+
return new CommandProcessingResultBuilder() //
187+
.withCommandId(command.commandId()) //
188+
.withEntityId(delinquencyBucketId) //
189+
.build();
169190
}
170191

171192
@Override
@@ -215,7 +236,7 @@ public CommandProcessingResult applyDelinquencyTagToLoan(Long loanId, JsonComman
215236
.withEntityId(loan.getId()) //
216237
.withEntityExternalId(loan.getExternalId()) //
217238
.with(changes) //
218-
.build(); //
239+
.build();
219240
}
220241

221242
@Override

‎fineract-loan/src/main/java/org/apache/fineract/portfolio/interestpauses/service/InterestPauseWritePlatformServiceImpl.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ private CommandProcessingResult processDeleteInterestPause(Loan loan, Long varia
119119
businessEventNotifierService.notifyPostBusinessEvent(new LoanScheduleVariationsDeletedBusinessEvent(loan));
120120
businessEventNotifierService.notifyPostBusinessEvent(new LoanBalanceChangedBusinessEvent(loan));
121121

122-
return new CommandProcessingResultBuilder().withEntityId(variationId).build();
122+
return new CommandProcessingResultBuilder() //
123+
.withEntityId(variationId) //
124+
.build();
123125
}
124126

125127
private CommandProcessingResult processUpdateInterestPause(Loan loan, Long variationId, String startDateString, String endDateString,
@@ -146,8 +148,10 @@ private CommandProcessingResult processUpdateInterestPause(Loan loan, Long varia
146148
businessEventNotifierService.notifyPostBusinessEvent(new LoanScheduleVariationsAddedBusinessEvent(loan));
147149
businessEventNotifierService.notifyPostBusinessEvent(new LoanBalanceChangedBusinessEvent(loan));
148150

149-
return new CommandProcessingResultBuilder().withEntityId(updatedVariation.getId())
150-
.with(Map.of("startDate", startDate.toString(), "endDate", endDate.toString())).build();
151+
return new CommandProcessingResultBuilder() //
152+
.withEntityId(updatedVariation.getId()) //
153+
.with(Map.of("startDate", startDate.toString(), "endDate", endDate.toString())) //
154+
.build();
151155
}
152156

153157
private CommandProcessingResult processInterestPause(final Loan loan, final LocalDate startDate, final LocalDate endDate,
@@ -166,7 +170,9 @@ private CommandProcessingResult processInterestPause(final Loan loan, final Loca
166170
businessEventNotifierService.notifyPostBusinessEvent(new LoanScheduleVariationsAddedBusinessEvent(loan));
167171
businessEventNotifierService.notifyPostBusinessEvent(new LoanBalanceChangedBusinessEvent(loan));
168172

169-
return new CommandProcessingResultBuilder().withEntityId(savedVariation.getId()).build();
173+
return new CommandProcessingResultBuilder() //
174+
.withEntityId(savedVariation.getId()) //
175+
.build();
170176
}
171177

172178
private void validateInterestPauseDates(Loan loan, LocalDate startDate, LocalDate endDate, String dateFormat, String locale,

0 commit comments

Comments
 (0)