From de20a987ae74635d93d373f3051e6bbee30b9110 Mon Sep 17 00:00:00 2001 From: percyashu Date: Sun, 14 Jun 2020 04:25:24 +0100 Subject: [PATCH] FINERACT-822 enable EqualsUnsafeCast error check --- fineract-provider/build.gradle | 4 ++-- .../apache/fineract/portfolio/charge/data/ChargeData.java | 5 ++++- .../portfolio/collectionsheet/data/IndividualClientData.java | 5 ++++- .../portfolio/collectionsheet/data/JLGClientData.java | 5 ++++- .../portfolio/collectionsheet/data/JLGGroupData.java | 5 ++++- .../loanaccount/domain/LoanDisbursementDetails.java | 5 ++++- .../fineract/portfolio/loanproduct/data/LoanProductData.java | 5 ++++- .../domain/LoanProductBorrowerCycleVariations.java | 5 ++++- .../fineract/portfolio/savings/data/SavingsProductData.java | 5 ++++- .../apache/fineract/useradministration/data/RoleData.java | 5 ++++- 10 files changed, 38 insertions(+), 11 deletions(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 4ab0d79fb..8ac7cedfe 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -318,8 +318,6 @@ tasks.withType(JavaCompile) { "StringSplitter", "MissingOverride", "ImmutableEnumChecker", - "EqualsUnsafeCast", - "BoxedPrimitiveEquality", "BadImport", "UnusedMethod", "ModifiedButNotUsed", @@ -355,6 +353,7 @@ tasks.withType(JavaCompile) { "ObjectToString", "AssertThrowsMultipleStatements", "BoxedPrimitiveConstructor", + "BoxedPrimitiveEquality", "SynchronizeOnNonFinalField", "WildcardImport", "FutureReturnValueIgnored", @@ -373,6 +372,7 @@ tasks.withType(JavaCompile) { "ReferenceEquality", "OperatorPrecedence", "EqualsGetClass", + "EqualsUnsafeCast", "JdkObsolete", "DoubleBraceInitialization", "InconsistentCapitalization", diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/data/ChargeData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/data/ChargeData.java index 311d02a79..738e8dfce 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/data/ChargeData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/data/ChargeData.java @@ -229,6 +229,9 @@ public class ChargeData implements Comparable, Serializable { @Override public boolean equals(final Object obj) { + if (!(obj instanceof ChargeData)) { + return false; + } final ChargeData chargeData = (ChargeData) obj; return this.id.equals(chargeData.id); } @@ -319,4 +322,4 @@ public class ChargeData implements Comparable, Serializable { public CurrencyData getCurrency() { return currency; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/IndividualClientData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/IndividualClientData.java index dcb11a4b3..5eabd1ce9 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/IndividualClientData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/IndividualClientData.java @@ -98,6 +98,9 @@ public class IndividualClientData { @Override public boolean equals(final Object obj) { + if (!(obj instanceof IndividualClientData)) { + return false; + } final IndividualClientData clientData = (IndividualClientData) obj; return clientData.clientId.compareTo(this.clientId) == 0; } @@ -106,4 +109,4 @@ public class IndividualClientData { public int hashCode() { return this.clientId.hashCode(); } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/JLGClientData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/JLGClientData.java index ec7fcad74..78bb56eaf 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/JLGClientData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/JLGClientData.java @@ -104,6 +104,9 @@ public class JLGClientData { @Override public boolean equals(final Object obj) { + if (!(obj instanceof JLGClientData)) { + return false; + } final JLGClientData clientData = (JLGClientData) obj; return clientData.clientId.compareTo(this.clientId) == 0; } @@ -112,4 +115,4 @@ public class JLGClientData { public int hashCode() { return this.clientId.hashCode(); } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/JLGGroupData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/JLGGroupData.java index b2b502713..7cab44067 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/JLGGroupData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/JLGGroupData.java @@ -88,6 +88,9 @@ public class JLGGroupData { @Override public boolean equals(final Object obj) { + if (!(obj instanceof JLGGroupData)) { + return false; + } final JLGGroupData groupData = (JLGGroupData) obj; return groupData.groupId.compareTo(this.groupId) == 0; } @@ -96,4 +99,4 @@ public class JLGGroupData { public int hashCode() { return this.groupId.hashCode(); } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanDisbursementDetails.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanDisbursementDetails.java index be707f467..9029326b9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanDisbursementDetails.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanDisbursementDetails.java @@ -67,6 +67,9 @@ public class LoanDisbursementDetails extends AbstractPersistableCustom { @Override public boolean equals(final Object obj) { + if (!(obj instanceof LoanDisbursementDetails)) { + return false; + } final LoanDisbursementDetails loanDisbursementDetails = (LoanDisbursementDetails) obj; if (loanDisbursementDetails.principal.equals(this.principal) && loanDisbursementDetails.expectedDisbursementDate.equals(this.expectedDisbursementDate)) @@ -136,4 +139,4 @@ public class LoanDisbursementDetails extends AbstractPersistableCustom { this.principal = principal; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/data/LoanProductData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/data/LoanProductData.java index 9be3f1788..12f74fc03 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/data/LoanProductData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/data/LoanProductData.java @@ -1024,6 +1024,9 @@ public class LoanProductData implements Serializable { @Override public boolean equals(final Object obj) { + if (!(obj instanceof LoanProductData)) { + return false; + } final LoanProductData loanProductData = (LoanProductData) obj; return loanProductData.id.equals(this.id); } @@ -1258,4 +1261,4 @@ public class LoanProductData implements Serializable { public BigDecimal getMaxInterestRatePerPeriod() { return maxInterestRatePerPeriod; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductBorrowerCycleVariations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductBorrowerCycleVariations.java index 280bbd945..de5de01e2 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductBorrowerCycleVariations.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductBorrowerCycleVariations.java @@ -80,6 +80,9 @@ public class LoanProductBorrowerCycleVariations extends AbstractPersistableCusto @Override public boolean equals(final Object obj) { + if (!(obj instanceof LoanProductBorrowerCycleVariations)) { + return false; + } final LoanProductBorrowerCycleVariations other = (LoanProductBorrowerCycleVariations) obj; return Objects.equals(loanProduct, other.loanProduct) && Objects.equals(borrowerCycleNumber, other.borrowerCycleNumber) @@ -118,4 +121,4 @@ public class LoanProductBorrowerCycleVariations extends AbstractPersistableCusto public BigDecimal getDefaultValue() { return this.defaultValue; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsProductData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsProductData.java index 40cbdb1fa..cb4ce745b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsProductData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsProductData.java @@ -425,6 +425,9 @@ public class SavingsProductData implements Serializable { @Override public boolean equals(final Object obj) { + if (!(obj instanceof SavingsProductData)) { + return false; + } final SavingsProductData productData = (SavingsProductData) obj; return productData.id.compareTo(this.id) == 0; } @@ -501,4 +504,4 @@ public class SavingsProductData implements Serializable { public boolean isWithdrawalFeeForTransfers() { return withdrawalFeeForTransfers; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/RoleData.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/RoleData.java index 7858ab929..2f9e2859a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/RoleData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/RoleData.java @@ -44,6 +44,9 @@ public class RoleData implements Serializable { @Override public boolean equals(final Object obj) { + if (!(obj instanceof RoleData)) { + return false; + } final RoleData role = (RoleData) obj; return this.id.equals(role.id); } @@ -60,4 +63,4 @@ public class RoleData implements Serializable { public String getName() { return name; } -} \ No newline at end of file +}