This is an automated email from the ASF dual-hosted git repository. aleks pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit eea635e90a470590292ebae952cf31e3df3a36e0 Author: Adam Saghy <[email protected]> AuthorDate: Mon Aug 8 23:48:47 2022 +0200 Spotless apply --- .../fineract/portfolio/calendar/data/CalendarData.java | 16 +++++++++------- .../fineract/portfolio/calendar/domain/Calendar.java | 2 +- .../service/CalendarReadPlatformServiceImpl.java | 10 ++++------ .../domain/LoanRepaymentScheduleHistory.java | 17 ++++++++++------- .../LoanScheduleHistoryWritePlatformServiceImpl.java | 6 ++++-- .../LoanRescheduleRequestWritePlatformServiceImpl.java | 1 - .../note/service/NoteReadPlatformServiceImpl.java | 10 ++++------ 7 files changed, 32 insertions(+), 30 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/data/CalendarData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/data/CalendarData.java index f19c1a829..406df8355 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/data/CalendarData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/data/CalendarData.java @@ -205,9 +205,10 @@ public final class CalendarData implements Serializable { final Integer duration, final EnumOptionData type, final boolean repeating, final String recurrence, final EnumOptionData frequency, final Integer interval, final EnumOptionData repeatsOnDay, final EnumOptionData repeatsOnNthDayOfMonth, final EnumOptionData remindBy, final Integer firstReminder, - final Integer secondReminder, final String humanReadable, final OffsetDateTime createdDate, final OffsetDateTime lastUpdatedDate, - final Long createdByUserId, final String createdByUsername, final Long lastUpdatedByUserId, final String lastUpdatedByUsername, - final LocalTime meetingTime, final Integer repeatsOnDayOfMonth) { + final Integer secondReminder, final String humanReadable, final OffsetDateTime createdDate, + final OffsetDateTime lastUpdatedDate, final Long createdByUserId, final String createdByUsername, + final Long lastUpdatedByUserId, final String lastUpdatedByUsername, final LocalTime meetingTime, + final Integer repeatsOnDayOfMonth) { final Collection<LocalDate> recurringDates = null; final Collection<LocalDate> nextTenRecurringDates = null; @@ -328,10 +329,11 @@ public final class CalendarData implements Serializable { final EnumOptionData repeatsOnNthDayOfMonth, final EnumOptionData remindBy, final Integer firstReminder, final Integer secondReminder, final Collection<LocalDate> recurringDates, final Collection<LocalDate> nextTenRecurringDates, final String humanReadable, final LocalDate recentEligibleMeetingDate, final OffsetDateTime createdDate, - final OffsetDateTime lastUpdatedDate, final Long createdByUserId, final String createdByUsername, final Long lastUpdatedByUserId, - final String lastUpdatedByUsername, final Integer repeatsOnDayOfMonth, final List<EnumOptionData> entityTypeOptions, - final List<EnumOptionData> calendarTypeOptions, final List<EnumOptionData> remindByOptions, - final List<EnumOptionData> repeatsOptions, final List<EnumOptionData> repeatsOnDayOptions, final LocalTime meetingTime, + final OffsetDateTime lastUpdatedDate, final Long createdByUserId, final String createdByUsername, + final Long lastUpdatedByUserId, final String lastUpdatedByUsername, final Integer repeatsOnDayOfMonth, + final List<EnumOptionData> entityTypeOptions, final List<EnumOptionData> calendarTypeOptions, + final List<EnumOptionData> remindByOptions, final List<EnumOptionData> repeatsOptions, + final List<EnumOptionData> repeatsOnDayOptions, final LocalTime meetingTime, final List<EnumOptionData> frequencyNthDayTypeOptions) { this.id = id; this.calendarInstanceId = calendarInstanceId; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/Calendar.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/Calendar.java index a7eb4894f..1951580eb 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/Calendar.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/Calendar.java @@ -18,7 +18,6 @@ */ package org.apache.fineract.portfolio.calendar.domain; -import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom; import static org.apache.fineract.portfolio.calendar.CalendarConstants.CALENDAR_RESOURCE_NAME; import java.time.LocalDate; @@ -40,6 +39,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.ApiParameterError; import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder; +import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom; import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.portfolio.calendar.CalendarConstants.CalendarSupportedParameters; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformServiceImpl.java index 12a07ab69..2d63b125f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformServiceImpl.java @@ -108,12 +108,10 @@ public class CalendarReadPlatformServiceImpl implements CalendarReadPlatformServ final Long lastUpdatedByUserId = rs.getLong("updatingUserId"); final String lastUpdatedByUserName = rs.getString("updatingUserName"); final LocalTime meetingTime = JdbcSupport.getLocalTime(rs, "meetingTime"); - final OffsetDateTime createdDate = createdDateUtc != null ? - createdDateUtc : - OffsetDateTime.of(createdDateLocal, DateUtils.getDateTimeZoneOfTenant().getRules().getOffset(createdDateLocal)); - final OffsetDateTime lastModifiedDate = lastModifiedDateUtc != null ? - lastModifiedDateUtc : - OffsetDateTime.of(lastModifiedDateLocal, + final OffsetDateTime createdDate = createdDateUtc != null ? createdDateUtc + : OffsetDateTime.of(createdDateLocal, DateUtils.getDateTimeZoneOfTenant().getRules().getOffset(createdDateLocal)); + final OffsetDateTime lastModifiedDate = lastModifiedDateUtc != null ? lastModifiedDateUtc + : OffsetDateTime.of(lastModifiedDateLocal, DateUtils.getDateTimeZoneOfTenant().getRules().getOffset(lastModifiedDateLocal)); return CalendarData.instance(id, calendarInstanceId, entityId, entityType, title, description, location, startDate, endDate, duration, type, repeating, recurrence, frequency, interval, repeatsOnDay, repeatsOnNthDayOfMonth, remindBy, diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanRepaymentScheduleHistory.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanRepaymentScheduleHistory.java index 36147cc1a..25d8c1480 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanRepaymentScheduleHistory.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanRepaymentScheduleHistory.java @@ -18,6 +18,9 @@ */ package org.apache.fineract.portfolio.loanaccount.loanschedule.domain; +import static org.apache.fineract.infrastructure.core.domain.AuditableFieldsConstants.CREATED_DATE_DB_FIELD; +import static org.apache.fineract.infrastructure.core.domain.AuditableFieldsConstants.LAST_MODIFIED_DATE_DB_FIELD; + import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -29,8 +32,6 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToOne; import javax.persistence.Table; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; -import static org.apache.fineract.infrastructure.core.domain.AuditableFieldsConstants.CREATED_DATE_DB_FIELD; -import static org.apache.fineract.infrastructure.core.domain.AuditableFieldsConstants.LAST_MODIFIED_DATE_DB_FIELD; import org.apache.fineract.portfolio.loanaccount.domain.Loan; import org.apache.fineract.portfolio.loanaccount.rescheduleloan.domain.LoanRescheduleRequest; @@ -83,7 +84,7 @@ public class LoanRepaymentScheduleHistory extends AbstractPersistableCustom { private OffsetDateTime createdDate; @Column(name = LAST_MODIFIED_DATE_DB_FIELD) - private OffsetDateTime lastModifiedDate; + private OffsetDateTime lastModifiedDate; @Column(name = "version") private Integer version; @@ -100,7 +101,8 @@ public class LoanRepaymentScheduleHistory extends AbstractPersistableCustom { final Integer installmentNumber, final LocalDate fromDate, final LocalDate dueDate, final BigDecimal principal, final BigDecimal interestCharged, final BigDecimal feeChargesCharged, final BigDecimal penaltyCharges, final LocalDateTime oldCreatedOnDate, final Long createdByUser, final Long lastModifiedByUser, - final LocalDateTime oldLastModifiedOnDate, final Integer version, final OffsetDateTime createdDate, final OffsetDateTime lastModifiedDate) { + final LocalDateTime oldLastModifiedOnDate, final Integer version, final OffsetDateTime createdDate, + final OffsetDateTime lastModifiedDate) { this.loan = loan; this.loanRescheduleRequest = loanRescheduleRequest; @@ -127,11 +129,12 @@ public class LoanRepaymentScheduleHistory extends AbstractPersistableCustom { final Integer installmentNumber, final LocalDate fromDate, final LocalDate dueDate, final BigDecimal principal, final BigDecimal interestCharged, final BigDecimal feeChargesCharged, final BigDecimal penaltyCharges, final LocalDateTime oldCreatedOnDate, final Long createdByUser, final Long lastModifiedByUser, - final LocalDateTime oldLastModifiedOnDate, final Integer version, final OffsetDateTime createdDate, final OffsetDateTime lastModifiedDate) { + final LocalDateTime oldLastModifiedOnDate, final Integer version, final OffsetDateTime createdDate, + final OffsetDateTime lastModifiedDate) { return new LoanRepaymentScheduleHistory(loan, loanRescheduleRequest, installmentNumber, fromDate, dueDate, principal, - interestCharged, feeChargesCharged, penaltyCharges, oldCreatedOnDate, createdByUser, lastModifiedByUser, oldLastModifiedOnDate, - version, createdDate, lastModifiedDate); + interestCharged, feeChargesCharged, penaltyCharges, oldCreatedOnDate, createdByUser, lastModifiedByUser, + oldLastModifiedOnDate, version, createdDate, lastModifiedDate); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformServiceImpl.java index 91f46815a..ea75aee9b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformServiceImpl.java @@ -84,8 +84,10 @@ public class LoanScheduleHistoryWritePlatformServiceImpl implements LoanSchedule oldLastModifiedOnDate = (LocalDateTime) oldDates.get("lastmodified_date"); } - final Long createdByUser = repaymentScheduleInstallment.getCreatedBy().orElse(platformSecurityContext.authenticatedUser().getId()); - final Long lastModifiedByUser = repaymentScheduleInstallment.getLastModifiedBy().orElse(platformSecurityContext.authenticatedUser().getId()); + final Long createdByUser = repaymentScheduleInstallment.getCreatedBy() + .orElse(platformSecurityContext.authenticatedUser().getId()); + final Long lastModifiedByUser = repaymentScheduleInstallment.getLastModifiedBy() + .orElse(platformSecurityContext.authenticatedUser().getId()); OffsetDateTime lastModifiedOnDate = DateUtils.getOffsetDateTimeOfTenant(); if (repaymentScheduleInstallment.getLastModifiedDate().isPresent()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java index 6f7e37d87..70dbc7452 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java @@ -475,7 +475,6 @@ public class LoanRescheduleRequestWritePlatformServiceImpl implements LoanResche loan.recalculateAllCharges(); ChangedTransactionDetail changedTransactionDetail = loan.processTransactions(); - this.loanRepaymentScheduleHistoryRepository.saveAll(loanRepaymentScheduleHistoryList); loan.updateRescheduledByUser(appUser); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformServiceImpl.java index 3af2701a4..be125097c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformServiceImpl.java @@ -78,12 +78,10 @@ public class NoteReadPlatformServiceImpl implements NoteReadPlatformService { final Long lastModifiedById = JdbcSupport.getLong(rs, "lastModifiedById"); final String createdByUsername = rs.getString("createdBy"); final String updatedByUsername = rs.getString("modifiedBy"); - final OffsetDateTime createdDate = createdDateUtc != null ? - createdDateUtc : - OffsetDateTime.of(createdDateLocal, DateUtils.getDateTimeZoneOfTenant().getRules().getOffset(createdDateLocal)); - final OffsetDateTime lastModifiedDate = lastModifiedDateUtc != null ? - lastModifiedDateUtc : - OffsetDateTime.of(lastModifiedDateLocal, + final OffsetDateTime createdDate = createdDateUtc != null ? createdDateUtc + : OffsetDateTime.of(createdDateLocal, DateUtils.getDateTimeZoneOfTenant().getRules().getOffset(createdDateLocal)); + final OffsetDateTime lastModifiedDate = lastModifiedDateUtc != null ? lastModifiedDateUtc + : OffsetDateTime.of(lastModifiedDateLocal, DateUtils.getDateTimeZoneOfTenant().getRules().getOffset(lastModifiedDateLocal)); return new NoteData(id, clientId, groupId, loanId, transactionId, null, null, noteType, note, createdDate, createdById, createdByUsername, lastModifiedDate, lastModifiedById, updatedByUsername);
