You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/01/15 07:39:15 UTC
[syncope] branch master updated: [SYNCOPE-1533] Fixing checkstyle
violations
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 5ee66e1 [SYNCOPE-1533] Fixing checkstyle violations
5ee66e1 is described below
commit 5ee66e116e8cd6a49ba94b0086d0b5ccf74986a2
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Jan 15 08:31:11 2020 +0100
[SYNCOPE-1533] Fixing checkstyle violations
---
.../syncope/common/lib/to/ConnInstanceTO.java | 42 +++++++--------
.../syncope/common/lib/to/ConnPoolConfTO.java | 30 ++++++-----
.../apache/syncope/common/lib/to/MappingTO.java | 26 +++++-----
.../apache/syncope/common/lib/to/OrgUnitTO.java | 32 ++++++------
.../common/lib/to/PagedConnObjectTOResult.java | 6 +--
.../apache/syncope/common/lib/to/ProvisionTO.java | 38 +++++++-------
.../apache/syncope/common/lib/to/ResourceTO.java | 60 +++++++++++-----------
.../common/lib/policy/PasswordPolicyTO.java | 28 +++++-----
.../apache/syncope/common/lib/policy/PolicyTO.java | 20 ++++----
.../syncope/common/lib/to/AccessTokenTO.java | 28 +++++-----
.../apache/syncope/common/lib/to/AnyTypeTO.java | 26 +++++-----
.../org/apache/syncope/common/lib/to/ItemTO.java | 42 +++++++--------
.../syncope/common/lib/to/MailTemplateTO.java | 22 ++++----
.../org/apache/syncope/common/lib/to/RealmTO.java | 38 +++++++-------
.../org/apache/syncope/common/lib/to/RoleTO.java | 32 ++++++------
.../common/rest/api/beans/AbstractQuery.java | 26 +++++-----
.../syncope/common/rest/api/beans/AnyQuery.java | 28 +++++-----
.../syncope/common/rest/api/beans/ExecQuery.java | 24 +++++----
.../syncope/common/rest/api/beans/SchemaQuery.java | 26 +++++-----
19 files changed, 305 insertions(+), 269 deletions(-)
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ConnInstanceTO.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ConnInstanceTO.java
index b61d2b8..d2724f0 100644
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ConnInstanceTO.java
+++ b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ConnInstanceTO.java
@@ -170,28 +170,30 @@ public class ConnInstanceTO implements EntityTO {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- ConnInstanceTO that = (ConnInstanceTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ ConnInstanceTO other = (ConnInstanceTO) obj;
return new EqualsBuilder().
- append(key, that.key).
- append(adminRealm, that.adminRealm).
- append(location, that.location).
- append(connectorName, that.connectorName).
- append(bundleName, that.bundleName).
- append(version, that.version).
- append(conf, that.conf).
- append(capabilities, that.capabilities).
- append(displayName, that.displayName).
- append(connRequestTimeout, that.connRequestTimeout).
- append(poolConf, that.poolConf).
- isEquals();
+ append(key, other.key).
+ append(adminRealm, other.adminRealm).
+ append(location, other.location).
+ append(connectorName, other.connectorName).
+ append(bundleName, other.bundleName).
+ append(version, other.version).
+ append(conf, other.conf).
+ append(capabilities, other.capabilities).
+ append(displayName, other.displayName).
+ append(connRequestTimeout, other.connRequestTimeout).
+ append(poolConf, other.poolConf).
+ build();
}
@Override
@@ -208,6 +210,6 @@ public class ConnInstanceTO implements EntityTO {
append(displayName).
append(connRequestTimeout).
append(poolConf).
- toHashCode();
+ build();
}
}
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ConnPoolConfTO.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ConnPoolConfTO.java
index 176fde1..d77bcf0 100644
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ConnPoolConfTO.java
+++ b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ConnPoolConfTO.java
@@ -81,22 +81,24 @@ public class ConnPoolConfTO implements Serializable {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- ConnPoolConfTO that = (ConnPoolConfTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ ConnPoolConfTO other = (ConnPoolConfTO) obj;
return new EqualsBuilder().
- append(maxObjects, that.maxObjects).
- append(minIdle, that.minIdle).
- append(maxIdle, that.maxIdle).
- append(maxWait, that.maxWait).
- append(minEvictableIdleTimeMillis, that.minEvictableIdleTimeMillis).
- isEquals();
+ append(maxObjects, other.maxObjects).
+ append(minIdle, other.minIdle).
+ append(maxIdle, other.maxIdle).
+ append(maxWait, other.maxWait).
+ append(minEvictableIdleTimeMillis, other.minEvictableIdleTimeMillis).
+ build();
}
@Override
@@ -107,6 +109,6 @@ public class ConnPoolConfTO implements Serializable {
append(maxIdle).
append(maxWait).
append(minEvictableIdleTimeMillis).
- toHashCode();
+ build();
}
}
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java
index 54be5d9..3fe44e7 100644
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java
+++ b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/MappingTO.java
@@ -95,20 +95,22 @@ public class MappingTO implements ItemContainerTO, Serializable {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- MappingTO mappingTO = (MappingTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ MappingTO other = (MappingTO) obj;
return new EqualsBuilder().
- append(connObjectLink, mappingTO.connObjectLink).
- append(items, mappingTO.items).
- append(linkingItems, mappingTO.linkingItems).
- isEquals();
+ append(connObjectLink, other.connObjectLink).
+ append(items, other.items).
+ append(linkingItems, other.linkingItems).
+ build();
}
@Override
@@ -117,6 +119,6 @@ public class MappingTO implements ItemContainerTO, Serializable {
append(connObjectLink).
append(items).
append(linkingItems).
- toHashCode();
+ build();
}
}
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java
index 8580165..758f28d 100644
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java
+++ b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/OrgUnitTO.java
@@ -127,23 +127,25 @@ public class OrgUnitTO implements EntityTO, ItemContainerTO {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- OrgUnitTO orgUnitTO = (OrgUnitTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ OrgUnitTO other = (OrgUnitTO) obj;
return new EqualsBuilder().
- append(ignoreCaseMatch, orgUnitTO.ignoreCaseMatch).
- append(key, orgUnitTO.key).
- append(objectClass, orgUnitTO.objectClass).
- append(syncToken, orgUnitTO.syncToken).
- append(connObjectLink, orgUnitTO.connObjectLink).
- append(items, orgUnitTO.items).
- isEquals();
+ append(ignoreCaseMatch, other.ignoreCaseMatch).
+ append(key, other.key).
+ append(objectClass, other.objectClass).
+ append(syncToken, other.syncToken).
+ append(connObjectLink, other.connObjectLink).
+ append(items, other.items).
+ build();
}
@Override
@@ -155,6 +157,6 @@ public class OrgUnitTO implements EntityTO, ItemContainerTO {
append(ignoreCaseMatch).
append(connObjectLink).
append(items).
- toHashCode();
+ build();
}
}
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/PagedConnObjectTOResult.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/PagedConnObjectTOResult.java
index 15f7848..8aece80 100644
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/PagedConnObjectTOResult.java
+++ b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/PagedConnObjectTOResult.java
@@ -94,9 +94,9 @@ public class PagedConnObjectTOResult implements Serializable {
}
/**
- * Returns a flag indicating whether all the results that match a search query were returned.
+ * Returns a flag indicating whether all the results other match a search query were returned.
*
- * @return true if the search returned all the results that match the query, false if the returned
+ * @return true if the search returned all the results other match the query, false if the returned
* result is not complete, e.g. if the server returned only part of the results due to server limits, errors, etc.
*/
public boolean isAllResultsReturned() {
@@ -104,7 +104,7 @@ public class PagedConnObjectTOResult implements Serializable {
}
/**
- * @param allResultsReturned Set to true if the search returned all the results that match the query. Set to false
+ * @param allResultsReturned Set to true if the search returned all the results other match the query. Set to false
* if the returned result is not complete, e.g. if the server returned only part of the results due to server
* limits, errors, etc.
*/
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisionTO.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisionTO.java
index af76faf..2e57792 100644
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisionTO.java
+++ b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisionTO.java
@@ -125,26 +125,28 @@ public class ProvisionTO implements EntityTO {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- ProvisionTO that = (ProvisionTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ ProvisionTO other = (ProvisionTO) obj;
return new EqualsBuilder().
- append(ignoreCaseMatch, that.ignoreCaseMatch).
- append(key, that.key).
- append(anyType, that.anyType).
- append(objectClass, that.objectClass).
- append(auxClasses, that.auxClasses).
- append(syncToken, that.syncToken).
- append(uidOnCreate, that.uidOnCreate).
- append(mapping, that.mapping).
- append(virSchemas, that.virSchemas).
- isEquals();
+ append(ignoreCaseMatch, other.ignoreCaseMatch).
+ append(key, other.key).
+ append(anyType, other.anyType).
+ append(objectClass, other.objectClass).
+ append(auxClasses, other.auxClasses).
+ append(syncToken, other.syncToken).
+ append(uidOnCreate, other.uidOnCreate).
+ append(mapping, other.mapping).
+ append(virSchemas, other.virSchemas).
+ build();
}
@Override
@@ -159,6 +161,6 @@ public class ProvisionTO implements EntityTO {
append(uidOnCreate).
append(mapping).
append(virSchemas).
- toHashCode();
+ build();
}
}
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java
index 4e05d84..8581d54 100644
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java
+++ b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java
@@ -255,37 +255,39 @@ public class ResourceTO implements EntityTO {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- ResourceTO that = (ResourceTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ ResourceTO other = (ResourceTO) obj;
return new EqualsBuilder().
- append(randomPwdIfNotProvided, that.randomPwdIfNotProvided).
- append(enforceMandatoryCondition, that.enforceMandatoryCondition).
- append(overrideCapabilities, that.overrideCapabilities).
- append(key, that.key).
- append(connector, that.connector).
- append(connectorDisplayName, that.connectorDisplayName).
- append(provisions, that.provisions).
- append(orgUnit, that.orgUnit).
- append(propagationPriority, that.propagationPriority).
- append(createTraceLevel, that.createTraceLevel).
- append(updateTraceLevel, that.updateTraceLevel).
- append(deleteTraceLevel, that.deleteTraceLevel).
- append(provisioningTraceLevel, that.provisioningTraceLevel).
- append(passwordPolicy, that.passwordPolicy).
- append(accountPolicy, that.accountPolicy).
- append(pullPolicy, that.pullPolicy).
- append(pushPolicy, that.pushPolicy).
- append(confOverride, that.confOverride).
- append(capabilitiesOverride, that.capabilitiesOverride).
- append(propagationActions, that.propagationActions).
- isEquals();
+ append(randomPwdIfNotProvided, other.randomPwdIfNotProvided).
+ append(enforceMandatoryCondition, other.enforceMandatoryCondition).
+ append(overrideCapabilities, other.overrideCapabilities).
+ append(key, other.key).
+ append(connector, other.connector).
+ append(connectorDisplayName, other.connectorDisplayName).
+ append(provisions, other.provisions).
+ append(orgUnit, other.orgUnit).
+ append(propagationPriority, other.propagationPriority).
+ append(createTraceLevel, other.createTraceLevel).
+ append(updateTraceLevel, other.updateTraceLevel).
+ append(deleteTraceLevel, other.deleteTraceLevel).
+ append(provisioningTraceLevel, other.provisioningTraceLevel).
+ append(passwordPolicy, other.passwordPolicy).
+ append(accountPolicy, other.accountPolicy).
+ append(pullPolicy, other.pullPolicy).
+ append(pushPolicy, other.pushPolicy).
+ append(confOverride, other.confOverride).
+ append(capabilitiesOverride, other.capabilitiesOverride).
+ append(propagationActions, other.propagationActions).
+ build();
}
@Override
@@ -311,6 +313,6 @@ public class ResourceTO implements EntityTO {
append(overrideCapabilities).
append(capabilitiesOverride).
append(propagationActions).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/policy/PasswordPolicyTO.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/policy/PasswordPolicyTO.java
index 64e9082..ea2e4a7 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/policy/PasswordPolicyTO.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/policy/PasswordPolicyTO.java
@@ -76,21 +76,23 @@ public class PasswordPolicyTO extends PolicyTO implements ComposablePolicy {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- PasswordPolicyTO that = (PasswordPolicyTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ PasswordPolicyTO other = (PasswordPolicyTO) obj;
return new EqualsBuilder().
- appendSuper(super.equals(o)).
- append(allowNullPassword, that.allowNullPassword).
- append(historyLength, that.historyLength).
- append(rules, that.rules).
- isEquals();
+ appendSuper(super.equals(obj)).
+ append(allowNullPassword, other.allowNullPassword).
+ append(historyLength, other.historyLength).
+ append(rules, other.rules).
+ build();
}
@Override
@@ -100,6 +102,6 @@ public class PasswordPolicyTO extends PolicyTO implements ComposablePolicy {
append(allowNullPassword).
append(historyLength).
append(rules).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/policy/PolicyTO.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/policy/PolicyTO.java
index 43f8113..0028a13 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/policy/PolicyTO.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/policy/PolicyTO.java
@@ -105,22 +105,24 @@ public abstract class PolicyTO implements EntityTO {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- PolicyTO policyTO = (PolicyTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ PolicyTO policyTO = (PolicyTO) obj;
return new EqualsBuilder().
append(discriminator, policyTO.discriminator).
append(key, policyTO.key).
append(description, policyTO.description).
append(usedByResources, policyTO.usedByResources).
append(usedByRealms, policyTO.usedByRealms).
- isEquals();
+ build();
}
@Override
@@ -131,6 +133,6 @@ public abstract class PolicyTO implements EntityTO {
append(description).
append(usedByResources).
append(usedByRealms).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AccessTokenTO.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AccessTokenTO.java
index 17da308..54a9318 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AccessTokenTO.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AccessTokenTO.java
@@ -76,21 +76,23 @@ public class AccessTokenTO extends BaseBean implements EntityTO {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- AccessTokenTO that = (AccessTokenTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ AccessTokenTO other = (AccessTokenTO) obj;
return new EqualsBuilder().
- append(key, that.key).
- append(body, that.body).
- append(expiryTime, that.expiryTime).
- append(owner, that.owner).
- isEquals();
+ append(key, other.key).
+ append(body, other.body).
+ append(expiryTime, other.expiryTime).
+ append(owner, other.owner).
+ build();
}
@Override
@@ -100,6 +102,6 @@ public class AccessTokenTO extends BaseBean implements EntityTO {
append(body).
append(expiryTime).
append(owner).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeTO.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeTO.java
index 2188b9f..53c9e66 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeTO.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AnyTypeTO.java
@@ -69,20 +69,22 @@ public class AnyTypeTO implements EntityTO {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- AnyTypeTO anyTypeTO = (AnyTypeTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ AnyTypeTO other = (AnyTypeTO) obj;
return new EqualsBuilder().
- append(key, anyTypeTO.key).
- append(kind, anyTypeTO.kind).
- append(classes, anyTypeTO.classes).
- isEquals();
+ append(key, other.key).
+ append(kind, other.kind).
+ append(classes, other.classes).
+ build();
}
@Override
@@ -91,6 +93,6 @@ public class AnyTypeTO implements EntityTO {
append(key).
append(kind).
append(classes).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/ItemTO.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/ItemTO.java
index e8f4013..37b397d 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/ItemTO.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/ItemTO.java
@@ -38,7 +38,7 @@ public class ItemTO implements EntityTO {
private String key;
/**
- * Attribute schema to be mapped. Consider that we can associate tha same attribute schema more than once, with
+ * Attribute schema to be mapped. Consider other we can associate tha same attribute schema more than once, with
* different aliases, to different resource attributes.
*/
private String intAttrName;
@@ -162,27 +162,29 @@ public class ItemTO implements EntityTO {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- ItemTO itemTO = (ItemTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ ItemTO other = (ItemTO) obj;
return new EqualsBuilder().
- append(connObjectKey, itemTO.connObjectKey).
- append(password, itemTO.password).
- append(key, itemTO.key).
- append(intAttrName, itemTO.intAttrName).
- append(extAttrName, itemTO.extAttrName).
- append(mandatoryCondition, itemTO.mandatoryCondition).
- append(purpose, itemTO.purpose).
- append(propagationJEXLTransformer, itemTO.propagationJEXLTransformer).
- append(pullJEXLTransformer, itemTO.pullJEXLTransformer).
- append(transformers, itemTO.transformers).
- isEquals();
+ append(connObjectKey, other.connObjectKey).
+ append(password, other.password).
+ append(key, other.key).
+ append(intAttrName, other.intAttrName).
+ append(extAttrName, other.extAttrName).
+ append(mandatoryCondition, other.mandatoryCondition).
+ append(purpose, other.purpose).
+ append(propagationJEXLTransformer, other.propagationJEXLTransformer).
+ append(pullJEXLTransformer, other.pullJEXLTransformer).
+ append(transformers, other.transformers).
+ build();
}
@Override
@@ -198,6 +200,6 @@ public class ItemTO implements EntityTO {
append(propagationJEXLTransformer).
append(pullJEXLTransformer).
append(transformers).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/MailTemplateTO.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/MailTemplateTO.java
index 3a96d50..d93bce3 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/MailTemplateTO.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/MailTemplateTO.java
@@ -44,24 +44,26 @@ public class MailTemplateTO implements EntityTO {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- MailTemplateTO that = (MailTemplateTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ MailTemplateTO other = (MailTemplateTO) obj;
return new EqualsBuilder().
- append(key, that.key).
- isEquals();
+ append(key, other.key).
+ build();
}
@Override
public int hashCode() {
return new HashCodeBuilder().
append(key).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java
index d878130..03a0905 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java
@@ -134,26 +134,28 @@ public class RealmTO implements NamedEntityTO, TemplatableTO {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- RealmTO realmTO = (RealmTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ RealmTO other = (RealmTO) obj;
return new EqualsBuilder().
- append(key, realmTO.key).
- append(name, realmTO.name).
- append(parent, realmTO.parent).
- append(fullPath, realmTO.fullPath).
- append(accountPolicy, realmTO.accountPolicy).
- append(passwordPolicy, realmTO.passwordPolicy).
- append(actions, realmTO.actions).
- append(templates, realmTO.templates).
- append(resources, realmTO.resources).
- isEquals();
+ append(key, other.key).
+ append(name, other.name).
+ append(parent, other.parent).
+ append(fullPath, other.fullPath).
+ append(accountPolicy, other.accountPolicy).
+ append(passwordPolicy, other.passwordPolicy).
+ append(actions, other.actions).
+ append(templates, other.templates).
+ append(resources, other.resources).
+ build();
}
@Override
@@ -168,6 +170,6 @@ public class RealmTO implements NamedEntityTO, TemplatableTO {
append(actions).
append(templates).
append(resources).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RoleTO.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RoleTO.java
index 90941b7..97a764f 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RoleTO.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RoleTO.java
@@ -97,23 +97,25 @@ public class RoleTO implements EntityTO {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- RoleTO roleTO = (RoleTO) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ RoleTO other = (RoleTO) obj;
return new EqualsBuilder().
- append(key, roleTO.key).
- append(entitlements, roleTO.entitlements).
- append(realms, roleTO.realms).
- append(dynRealms, roleTO.dynRealms).
- append(dynMembershipCond, roleTO.dynMembershipCond).
- append(privileges, roleTO.privileges).
- isEquals();
+ append(key, other.key).
+ append(entitlements, other.entitlements).
+ append(realms, other.realms).
+ append(dynRealms, other.dynRealms).
+ append(dynMembershipCond, other.dynMembershipCond).
+ append(privileges, other.privileges).
+ build();
}
@Override
@@ -125,6 +127,6 @@ public class RoleTO implements EntityTO {
append(dynRealms).
append(dynMembershipCond).
append(privileges).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AbstractQuery.java b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AbstractQuery.java
index 358e4b0..c90f8c2 100644
--- a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AbstractQuery.java
+++ b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AbstractQuery.java
@@ -112,20 +112,22 @@ public abstract class AbstractQuery implements Serializable {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- AbstractQuery that = (AbstractQuery) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ AbstractQuery other = (AbstractQuery) obj;
return new EqualsBuilder().
- append(page, that.page).
- append(size, that.size).
- append(orderBy, that.orderBy).
- isEquals();
+ append(page, other.page).
+ append(size, other.size).
+ append(orderBy, other.orderBy).
+ build();
}
@Override
@@ -134,6 +136,6 @@ public abstract class AbstractQuery implements Serializable {
append(page).
append(size).
append(orderBy).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AnyQuery.java b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AnyQuery.java
index efa2493..be38037 100644
--- a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AnyQuery.java
+++ b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AnyQuery.java
@@ -109,21 +109,23 @@ public class AnyQuery extends AbstractQuery {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- AnyQuery anyQuery = (AnyQuery) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ AnyQuery other = (AnyQuery) obj;
return new EqualsBuilder().
- appendSuper(super.equals(o)).
- append(realm, anyQuery.realm).
- append(details, anyQuery.details).
- append(fiql, anyQuery.fiql).
- isEquals();
+ appendSuper(super.equals(obj)).
+ append(realm, other.realm).
+ append(details, other.details).
+ append(fiql, other.fiql).
+ build();
}
@Override
@@ -133,6 +135,6 @@ public class AnyQuery extends AbstractQuery {
append(realm).
append(details).
append(fiql).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ExecQuery.java b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ExecQuery.java
index 7c14a0a..e307d3e 100644
--- a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ExecQuery.java
+++ b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ExecQuery.java
@@ -53,19 +53,21 @@ public class ExecQuery extends AbstractQuery {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- ExecQuery execQuery = (ExecQuery) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ ExecQuery other = (ExecQuery) obj;
return new EqualsBuilder().
- appendSuper(super.equals(o)).
- append(key, execQuery.key).
- isEquals();
+ appendSuper(super.equals(obj)).
+ append(key, other.key).
+ build();
}
@Override
@@ -73,6 +75,6 @@ public class ExecQuery extends AbstractQuery {
return new HashCodeBuilder().
appendSuper(super.hashCode()).
append(key).
- toHashCode();
+ build();
}
}
diff --git a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/SchemaQuery.java b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/SchemaQuery.java
index ff0b9db..db87ce7 100644
--- a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/SchemaQuery.java
+++ b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/SchemaQuery.java
@@ -108,20 +108,22 @@ public class SchemaQuery implements Serializable {
}
@Override
- public boolean equals(Object o) {
- if (this == o)
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
-
- if (o == null || getClass() != o.getClass())
+ }
+ if (obj == null) {
return false;
-
- SchemaQuery that = (SchemaQuery) o;
-
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ SchemaQuery other = (SchemaQuery) obj;
return new EqualsBuilder().
- append(type, that.type).
- append(anyTypeClasses, that.anyTypeClasses).
- append(keyword, that.keyword).
- isEquals();
+ append(type, other.type).
+ append(anyTypeClasses, other.anyTypeClasses).
+ append(keyword, other.keyword).
+ build();
}
@Override
@@ -130,6 +132,6 @@ public class SchemaQuery implements Serializable {
append(type).
append(anyTypeClasses).
append(keyword).
- toHashCode();
+ build();
}
}