You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ar...@apache.org on 2022/07/26 07:56:40 UTC
[fineract] 06/06: Apply fixes (based on review)
This is an automated email from the ASF dual-hosted git repository.
arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 700038020e3486d7e7b17883ff836424e9cffc3b
Author: Adam Saghy <ad...@gmail.com>
AuthorDate: Mon Jul 25 16:06:23 2022 +0200
Apply fixes (based on review)
---
.../apache/fineract/portfolio/client/domain/Client.java | 17 +++++++++--------
.../fineract/portfolio/loanaccount/domain/Loan.java | 5 -----
.../data/auditing/CustomAuditingHandler.java | 11 +++++------
3 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
index 059c88f66..4a269c2e2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
@@ -180,14 +180,15 @@ public class Client extends AbstractAuditableWithUTCDateTimeCustom {
@Column(name = "submittedon_date", nullable = true)
private LocalDate submittedOnDate;
- // Deprecated since common Auditable fields were introduced. Columns and data left untouched to help migration.
-
- // @Column(name = "updated_on", nullable = true)
- // private LocalDate updatedOnDate;
-
- // @ManyToOne(optional = true, fetch = FetchType.LAZY)
- // @JoinColumn(name = "updated_by", nullable = true)
- // private AppUser updatedBy;
+ /*
+ * Deprecated since common Auditable fields were introduced. Columns and data left untouched to help migration.
+ *
+ * @Column(name = "updated_on", nullable = true) private LocalDate updatedOnDate;
+ *
+ * @ManyToOne(optional = true, fetch = FetchType.LAZY)
+ *
+ * @JoinColumn(name = "updated_by", nullable = true) private AppUser updatedBy;
+ */
@ManyToOne(optional = true, fetch = FetchType.LAZY)
@JoinColumn(name = "activatedon_userid", nullable = true)
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
index 05d265c77..4a4d3299c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
@@ -218,11 +218,6 @@ public class Loan extends AbstractAuditableWithUTCDateTimeCustom {
// loan application states
@Column(name = "submittedon_date")
private LocalDate submittedOnDate;
-
- // @ManyToOne(optional = true, fetch = FetchType.LAZY)
- // @JoinColumn(name = "submittedon_userid", nullable = true)
- // private AppUser submittedBy;
-
@Column(name = "rejectedon_date")
private LocalDate rejectedOnDate;
diff --git a/fineract-provider/src/main/java/org/springframework/data/auditing/CustomAuditingHandler.java b/fineract-provider/src/main/java/org/springframework/data/auditing/CustomAuditingHandler.java
index 863ca2020..9157d01d0 100644
--- a/fineract-provider/src/main/java/org/springframework/data/auditing/CustomAuditingHandler.java
+++ b/fineract-provider/src/main/java/org/springframework/data/auditing/CustomAuditingHandler.java
@@ -20,11 +20,10 @@ package org.springframework.data.auditing;
import java.time.temporal.TemporalAccessor;
import java.util.Optional;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fineract.infrastructure.core.auditing.CustomDateTimeProvider;
import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
-import org.springframework.core.log.LogMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.data.domain.AuditorAware;
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.mapping.PersistentProperty;
@@ -38,7 +37,7 @@ import org.springframework.util.Assert;
*/
public class CustomAuditingHandler extends AuditingHandler {
- private static final Log logger = LogFactory.getLog(CustomAuditingHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CustomAuditingHandler.class);
private final AuditableBeanWrapperFactory factory;
private boolean dateTimeForNow = true;
private boolean modifyOnCreation = true;
@@ -129,12 +128,12 @@ public class CustomAuditingHandler extends AuditingHandler {
touchAuditor(auditor, it, isNew);
Optional<TemporalAccessor> now = dateTimeForNow ? touchDate(it, isNew) : Optional.empty();
- if (logger.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
Object defaultedNow = now.map(Object::toString).orElse("not set");
Object defaultedAuditor = auditor.isPresent() ? auditor.toString() : "unknown";
- logger.debug(LogMessage.format("Touched %s - Last modification at %s by %s", target, defaultedNow, defaultedAuditor));
+ LOG.debug("Touched {} - Last modification at {} by {}", target, defaultedNow, defaultedAuditor);
}
return it.getBean();