This is an automated email from the ASF dual-hosted git repository. vorburger pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit f226bbae6e0109c69b1fd34defbdb3ebff50ac8d Author: percyashu <[email protected]> AuthorDate: Mon Jun 8 01:07:48 2020 +0100 FINERACT-822 enable EqualsGetClass error --- fineract-provider/build.gradle | 2 +- .../org/apache/fineract/accounting/glaccount/domain/TrialBalance.java | 4 ++-- .../service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java | 2 +- .../accounting/provisioning/domain/LoanProductProvisioningEntry.java | 2 +- .../main/java/org/apache/fineract/batch/command/CommandContext.java | 2 +- .../infrastructure/campaigns/email/data/EmailBusinessRulesData.java | 2 +- .../infrastructure/campaigns/sms/data/SmsBusinessRulesData.java | 2 +- .../configuration/domain/ExternalServicePropertiesPK.java | 2 +- .../org/apache/fineract/infrastructure/jobs/domain/JobParameter.java | 4 ++-- .../org/apache/fineract/interoperation/domain/InteropIdentifier.java | 2 +- .../src/main/java/org/apache/fineract/mix/data/ContextData.java | 4 ++-- .../organisation/provisioning/domain/ProvisioningCategory.java | 2 +- .../apache/fineract/portfolio/account/data/PortfolioAccountData.java | 4 ++-- .../fineract/portfolio/floatingrates/data/FloatingRateData.java | 2 +- .../fineract/portfolio/floatingrates/data/FloatingRatePeriodData.java | 2 +- .../apache/fineract/portfolio/savings/data/DepositAccountData.java | 4 ++-- .../fineract/portfolio/savings/data/FixedDepositAccountData.java | 4 ++-- .../fineract/portfolio/savings/data/RecurringDepositAccountData.java | 4 ++-- .../apache/fineract/portfolio/savings/data/SavingsAccountData.java | 4 ++-- .../fineract/portfolio/self/account/data/SelfAccountTemplateData.java | 2 +- .../java/org/apache/fineract/useradministration/data/AppUserData.java | 4 ++-- .../fineract/useradministration/domain/AppUserClientMapping.java | 2 +- 22 files changed, 31 insertions(+), 31 deletions(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 8c75a99..ae224cc 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -310,7 +310,6 @@ tasks.withType(JavaCompile) { "OperatorPrecedence", "MixedMutabilityReturnType", "SameNameButDifferent", - "EqualsGetClass", "ReferenceEquality", "StringSplitter", "MissingOverride", @@ -368,6 +367,7 @@ tasks.withType(JavaCompile) { "NarrowingCompoundAssignment", "MissingCasesInEnumSwitch", "OperatorPrecedence", + "EqualsGetClass", // "ReturnMissingNullable", // "InconsistentOverloads", // "MethodCanBeStatic", diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalance.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalance.java index b948106..78bd84a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalance.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalance.java @@ -97,7 +97,7 @@ public class TrialBalance extends AbstractPersistableCustom { @Override public boolean equals(Object obj) { - if (!obj.getClass().equals(getClass())) { + if (!(obj instanceof TrialBalance)) { return false; } TrialBalance other = (TrialBalance) obj; @@ -113,4 +113,4 @@ public class TrialBalance extends AbstractPersistableCustom { public int hashCode() { return Objects.hash(officeId, glAccountId, amount, entryDate, transactionDate, closingBalance); } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java index 0d240e9..4969efe 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java @@ -773,7 +773,7 @@ public class JournalEntryWritePlatformServiceJpaRepositoryImpl implements Journa @Override public boolean equals(Object obj) { - if (!obj.getClass().equals(this.getClass())) { + if (!(obj instanceof JournalEntryWritePlatformServiceJpaRepositoryImpl)) { return false; } OfficeCurrencyKey copy = (OfficeCurrencyKey) obj; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/LoanProductProvisioningEntry.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/LoanProductProvisioningEntry.java index c49b65d..fd3458e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/LoanProductProvisioningEntry.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/LoanProductProvisioningEntry.java @@ -119,7 +119,7 @@ public class LoanProductProvisioningEntry extends AbstractPersistableCustom { @Override public boolean equals(Object obj) { - if (!obj.getClass().equals(getClass())) { + if (!(obj instanceof LoanProductProvisioningEntry)) { return false; } LoanProductProvisioningEntry other = (LoanProductProvisioningEntry) obj; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java index 0732e4b..4016fa5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java @@ -98,7 +98,7 @@ public class CommandContext { if (obj == null) { return false; } - if (getClass() != obj.getClass()) { + if (!(obj instanceof CommandContext)) { return false; } CommandContext other = (CommandContext) obj; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailBusinessRulesData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailBusinessRulesData.java index 158e21c..88c1585 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailBusinessRulesData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailBusinessRulesData.java @@ -83,7 +83,7 @@ public class EmailBusinessRulesData { if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { + if (o == null || !(o instanceof EmailBusinessRulesData)) { return false; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/data/SmsBusinessRulesData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/data/SmsBusinessRulesData.java index d3c7e16..6b621bf 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/data/SmsBusinessRulesData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/data/SmsBusinessRulesData.java @@ -78,7 +78,7 @@ public class SmsBusinessRulesData { if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { + if (o == null || !(o instanceof SmsBusinessRulesData)) { return false; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ExternalServicePropertiesPK.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ExternalServicePropertiesPK.java index 2426cf1..1045477 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ExternalServicePropertiesPK.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ExternalServicePropertiesPK.java @@ -58,7 +58,7 @@ public class ExternalServicePropertiesPK implements Serializable { if (obj == this) { return true; } - if (obj.getClass() != getClass()) { + if (!(obj instanceof ExternalServicePropertiesPK)) { return false; } final ExternalServicePropertiesPK rhs = (ExternalServicePropertiesPK) obj; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/domain/JobParameter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/domain/JobParameter.java index b72b7c3..a40f060 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/domain/JobParameter.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/domain/JobParameter.java @@ -76,7 +76,7 @@ public class JobParameter extends AbstractPersistableCustom { @Override public boolean equals(Object obj) { - if (!obj.getClass().equals(getClass())) { + if (!(obj instanceof JobParameter)) { return false; } JobParameter jobParameter = (JobParameter) obj; @@ -89,4 +89,4 @@ public class JobParameter extends AbstractPersistableCustom { public int hashCode() { return Objects.hash(jobId,parameterName,parameterValue); } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifier.java b/fineract-provider/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifier.java index bc0dc68..25f1f7d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifier.java +++ b/fineract-provider/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifier.java @@ -156,7 +156,7 @@ public class InteropIdentifier extends AbstractPersistableCustom { if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { + if (o == null || !(o instanceof InteropIdentifier)) { return false; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/data/ContextData.java b/fineract-provider/src/main/java/org/apache/fineract/mix/data/ContextData.java index c6ee5c3..8434be5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/mix/data/ContextData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/data/ContextData.java @@ -56,7 +56,7 @@ public class ContextData { public boolean equals(final Object obj) { if (this == obj) { return true; } if (obj == null) { return false; } - if (getClass() != obj.getClass()) { return false; } + if (!(obj instanceof ContextData)) { return false; } final ContextData other = (ContextData) obj; if (this.dimension == null) { if (other.dimension != null) { return false; } @@ -69,4 +69,4 @@ public class ContextData { } else if (!this.periodType.equals(other.periodType)) { return false; } return true; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/domain/ProvisioningCategory.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/domain/ProvisioningCategory.java index 9653b9a..c82dc71 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/domain/ProvisioningCategory.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/domain/ProvisioningCategory.java @@ -82,7 +82,7 @@ public class ProvisioningCategory extends AbstractPersistableCustom { public boolean equals(Object obj) { if (obj == null) { return false; } if (obj == this) { return true; } - if (obj.getClass() != getClass()) { return false; } + if (!(obj instanceof ProvisioningCategory)) { return false; } ProvisioningCategory pc = (ProvisioningCategory) obj; return pc.getCategoryName().equals(this.categoryName); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/PortfolioAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/PortfolioAccountData.java index 1a5f2c0..afd5977 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/PortfolioAccountData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/PortfolioAccountData.java @@ -89,7 +89,7 @@ public class PortfolioAccountData implements Serializable { if (obj == null) { return false; } if (obj == this) { return true; } - if (obj.getClass() != getClass()) { return false; } + if (!(obj instanceof PortfolioAccountData)) { return false; } final PortfolioAccountData rhs = (PortfolioAccountData) obj; return new EqualsBuilder().append(this.id, rhs.id).append(this.accountNo, rhs.accountNo).append(this.productId, rhs.productId) .append(this.productName, rhs.productName).isEquals(); @@ -120,4 +120,4 @@ public class PortfolioAccountData implements Serializable { public Long accountId() { return this.id; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateData.java index 08e9525..37a7b4e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateData.java @@ -114,7 +114,7 @@ public class FloatingRateData implements Comparable<FloatingRateData> , Serializ if (obj == this) { return true; } - if (obj.getClass() != getClass()) { + if (!(obj instanceof FloatingRateData)) { return false; } final FloatingRateData rhs = (FloatingRateData) obj; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRatePeriodData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRatePeriodData.java index e6d2e89..9b446b0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRatePeriodData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRatePeriodData.java @@ -113,7 +113,7 @@ public class FloatingRatePeriodData implements if (obj == this) { return true; } - if (obj.getClass() != getClass()) { + if (!(obj instanceof FloatingRatePeriodData)) { return false; } final FloatingRatePeriodData rhs = (FloatingRatePeriodData) obj; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/DepositAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/DepositAccountData.java index edee236..371e34d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/DepositAccountData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/DepositAccountData.java @@ -339,7 +339,7 @@ public class DepositAccountData { if (obj == null) { return false; } if (obj == this) { return true; } - if (obj.getClass() != getClass()) { return false; } + if (!(obj instanceof DepositAccountData)) { return false; } final DepositAccountData rhs = (DepositAccountData) obj; return new EqualsBuilder().append(this.id, rhs.id).append(this.accountNo, rhs.accountNo).isEquals(); } @@ -360,4 +360,4 @@ public class DepositAccountData { public String accountNo() { return accountNo; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/FixedDepositAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/FixedDepositAccountData.java index 63fccc1..026fe67 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/FixedDepositAccountData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/FixedDepositAccountData.java @@ -525,7 +525,7 @@ public class FixedDepositAccountData extends DepositAccountData { if (obj == null) { return false; } if (obj == this) { return true; } - if (obj.getClass() != getClass()) { return false; } + if (!(obj instanceof FixedDepositAccountData)) { return false; } final FixedDepositAccountData rhs = (FixedDepositAccountData) obj; return new EqualsBuilder().append(this.id, rhs.id).append(this.accountNo, rhs.accountNo).isEquals(); } @@ -548,4 +548,4 @@ public class FixedDepositAccountData extends DepositAccountData { public Long getTransferToSavingsId() { return transferToSavingsId; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/RecurringDepositAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/RecurringDepositAccountData.java index f72ccdc..a3c9111 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/RecurringDepositAccountData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/RecurringDepositAccountData.java @@ -592,7 +592,7 @@ public class RecurringDepositAccountData extends DepositAccountData { if (obj == null) { return false; } if (obj == this) { return true; } - if (obj.getClass() != getClass()) { return false; } + if (!(obj instanceof RecurringDepositAccountData)) { return false; } final RecurringDepositAccountData rhs = (RecurringDepositAccountData) obj; return new EqualsBuilder().append(this.id, rhs.id).append(this.accountNo, rhs.accountNo).isEquals(); } @@ -602,4 +602,4 @@ public class RecurringDepositAccountData extends DepositAccountData { return new HashCodeBuilder(17, 37).append(this.id).append(this.accountNo).toHashCode(); } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountData.java index 9751d1e..9ec2169 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountData.java @@ -775,7 +775,7 @@ public class SavingsAccountData implements Serializable { if (obj == null) { return false; } if (obj == this) { return true; } - if (obj.getClass() != getClass()) { return false; } + if (!(obj instanceof SavingsAccountData)) { return false; } final SavingsAccountData rhs = (SavingsAccountData) obj; return new EqualsBuilder().append(this.id, rhs.id).append(this.accountNo, rhs.accountNo).isEquals(); } @@ -792,4 +792,4 @@ public class SavingsAccountData implements Serializable { public void setDatatables(final List<DatatableData> datatables) { this.datatables = datatables; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/data/SelfAccountTemplateData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/data/SelfAccountTemplateData.java index 4a3d3f4..d5a58cc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/data/SelfAccountTemplateData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/data/SelfAccountTemplateData.java @@ -81,7 +81,7 @@ public class SelfAccountTemplateData implements if (obj == this) { return true; } - if (obj.getClass() != getClass()) { + if (!(obj instanceof SelfAccountTemplateData)) { return false; } final SelfAccountTemplateData rhs = (SelfAccountTemplateData) obj; diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/AppUserData.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/AppUserData.java index 82ccaa3..fe32dd3 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/AppUserData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/AppUserData.java @@ -146,7 +146,7 @@ public class AppUserData { if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { + if (o == null || !(o instanceof AppUserData)) { return false; } @@ -172,4 +172,4 @@ public class AppUserData { return this.isSelfServiceUser==null?false:this.isSelfServiceUser; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUserClientMapping.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUserClientMapping.java index 4ab5b5e..ae12ece 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUserClientMapping.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUserClientMapping.java @@ -57,7 +57,7 @@ public class AppUserClientMapping extends AbstractPersistableCustom { return true; } - if (!getClass().equals(obj.getClass())) { + if (!(obj instanceof AppUserClientMapping)) { return false; }
