From 52732188cae6fba461f02140fc3f4d2ac85488af Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Wed, 3 Jun 2020 19:40:47 +0200 Subject: [PATCH] repo: more useless parameter types cleanup --- .../midpoint/repo/sql/ExtensionTest.java | 32 +++++----- .../repo/sql/data/common/RAbstractRole.java | 56 ++++++++--------- .../repo/sql/data/common/RArchetype.java | 2 +- .../midpoint/repo/sql/data/common/RFocus.java | 62 ++++++++++--------- .../repo/sql/data/common/RGenericObject.java | 2 +- .../repo/sql/data/common/RObject.java | 7 +-- .../midpoint/repo/sql/data/common/ROrg.java | 2 +- .../midpoint/repo/sql/data/common/RRole.java | 2 +- .../repo/sql/data/common/RService.java | 2 +- .../repo/sql/data/common/RShadow.java | 58 ++++++++--------- .../midpoint/repo/sql/data/common/RUser.java | 2 +- .../repo/sql/helpers/ObjectDeltaUpdater.java | 4 +- 12 files changed, 113 insertions(+), 118 deletions(-) diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ExtensionTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ExtensionTest.java index ed4ccf29cf1..f13eded10b3 100644 --- a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ExtensionTest.java +++ b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ExtensionTest.java @@ -1860,7 +1860,7 @@ public void test410AddShadow() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "alumni"); assertExtension(s, itemMember, "banderson", "kwhite"); assertExtension(s, itemManager, "jack", "jim"); @@ -1891,7 +1891,7 @@ public void test420AddVisibleAttributeValues() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "alumni"); assertExtension(s, itemMember, "banderson", "kwhite"); assertExtension(s, itemManager, "jack", "jim", "alice", "bob"); @@ -1932,7 +1932,7 @@ public void test425AddVisibleAttributeValuesDuplicate() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "alumni"); assertExtension(s, itemMember, "banderson", "kwhite"); assertExtension(s, itemManager, "jack", "jim", "alice", "bob"); @@ -1963,7 +1963,7 @@ public void test426ReplaceVisibleAttributeValues() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "alumni"); assertExtension(s, itemMember, "banderson", "kwhite"); assertExtension(s, itemManager, "bob", "chuck"); @@ -1998,7 +1998,7 @@ public void test427DeleteVisibleAttributeValues() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName); assertExtension(s, itemMember, "banderson", "kwhite"); assertExtension(s, itemManager, "bob", "chuck"); @@ -2048,7 +2048,7 @@ public void test428DeleteAlreadyLoadedVisibleAttributeValue() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "ALUMNI"); assertExtension(s, itemMember, "banderson", "kwhite"); assertExtension(s, itemManager, "chuck"); @@ -2085,7 +2085,7 @@ public void test430AddHiddenAttributeValues() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "ALUMNI"); assertExtension(s, itemMember, "banderson", "kwhite", "tbrown", "jsmith"); assertExtension(s, itemManager, "chuck"); @@ -2126,7 +2126,7 @@ public void test432AddHiddenAttributeValuesDuplicate() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "ALUMNI"); assertExtension(s, itemMember, "banderson", "kwhite", "tbrown", "jsmith"); assertExtension(s, itemManager, "chuck"); @@ -2175,7 +2175,7 @@ public void test435DeleteHiddenAttributeValues() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "ALUMNI"); assertExtension(s, itemMember, "banderson", "kwhite"); assertExtension(s, itemManager, "chuck"); @@ -2221,7 +2221,7 @@ public void test436DeleteHiddenAttributeValuesDuplicate() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "ALUMNI"); assertExtension(s, itemMember, "banderson", "kwhite"); assertExtension(s, itemManager, "chuck"); @@ -2265,7 +2265,7 @@ public void test440ReplaceHiddenAttributeValues() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "ALUMNI"); assertExtension(s, itemMember, "alice", "bob"); assertExtension(s, itemManager, "chuck"); @@ -2306,7 +2306,7 @@ public void test450DeleteWholeContainer() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName); assertExtension(s, itemMember); assertExtension(s, itemManager); @@ -2357,7 +2357,7 @@ public void test455AddWholeContainer() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "alumni"); assertExtension(s, itemMember, "banderson", "kwhite"); assertExtension(s, itemManager, "jack", "jim"); @@ -2429,7 +2429,7 @@ public void test458AddWholeContainerDifferentValue() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "alumni2"); assertExtension(s, itemMember, "banderson2", "kwhite2"); assertExtension(s, itemManager, "jack2", "jim2"); @@ -2499,7 +2499,7 @@ public void test460ReplaceWholeContainer() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName, "alumni3"); assertExtension(s, itemMember, "banderson3", "kwhite3"); assertExtension(s, itemManager, "jack3", "jim3"); @@ -2557,7 +2557,7 @@ public void test465ReplaceWholeContainerToNull() throws Exception { queryListener.dumpAndStop(); try (Session session = factory.openSession()) { - RShadow s = session.get(RShadow.class, shadowOid); + RShadow s = session.get(RShadow.class, shadowOid); assertExtension(s, itemGroupName); assertExtension(s, itemMember); assertExtension(s, itemManager); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java index 9b485ad66c3..e3e30a9bff6 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java @@ -7,13 +7,20 @@ package com.evolveum.midpoint.repo.sql.data.common; +import java.util.HashSet; +import java.util.Set; +import javax.persistence.*; + +import org.hibernate.annotations.Cascade; +import org.hibernate.annotations.Persister; +import org.hibernate.annotations.Where; + import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.container.RAssignment; import com.evolveum.midpoint.repo.sql.data.common.embedded.RAutoassignSpecification; import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.data.common.other.RAssignmentOwner; -import com.evolveum.midpoint.repo.sql.data.common.other.RReferenceOwner; import com.evolveum.midpoint.repo.sql.query.definition.JaxbName; import com.evolveum.midpoint.repo.sql.query.definition.QueryEntity; import com.evolveum.midpoint.repo.sql.query.definition.VirtualCollection; @@ -21,18 +28,8 @@ import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.repo.sql.util.RUtil; import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType; import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType; -import org.hibernate.annotations.*; - -import javax.persistence.*; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.util.HashSet; -import java.util.Set; /** * @author lazyman @@ -41,7 +38,7 @@ @VirtualCollection(jaxbName = @JaxbName(localPart = "inducement"), jaxbType = Set.class, jpaName = "assignments", jpaType = Set.class, additionalParams = { @VirtualQueryParam(name = "assignmentOwner", type = RAssignmentOwner.class, - value = "ABSTRACT_ROLE")}, collectionType = RAssignment.class)}) + value = "ABSTRACT_ROLE") }, collectionType = RAssignment.class) }) @Entity @org.hibernate.annotations.ForeignKey(name = "fk_abstract_role") @@ -51,7 +48,7 @@ @Index(name = "iAutoassignEnabled", columnList = "autoassign_enabled") }) @Persister(impl = MidPointJoinedPersister.class) -public abstract class RAbstractRole extends RFocus { +public abstract class RAbstractRole extends RFocus { private String identifier; private String riskLevel; @@ -68,7 +65,7 @@ public Boolean getRequestable() { return requestable; } - @Column(nullable = true) + @Column public String getApprovalProcess() { return approvalProcess; } @@ -80,7 +77,7 @@ public Set getInducement() { @Where(clause = RObjectReference.REFERENCE_TYPE + "= 3") @OneToMany(mappedBy = "owner", orphanRemoval = true) - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set> getApproverRef() { if (approverRef == null) { approverRef = new HashSet<>(); @@ -144,20 +141,21 @@ public void setAutoassign(RAutoassignSpecification autoassign) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; - - RAbstractRole that = (RAbstractRole) o; - - if (identifier != null ? !identifier.equals(that.identifier) : that.identifier != null) return false; - if (riskLevel != null ? !riskLevel.equals(that.riskLevel) : that.riskLevel != null) return false; - if (displayName != null ? !displayName.equals(that.displayName) : that.displayName != null) return false; - if (requestable != null ? !requestable.equals(that.requestable) : that.requestable != null) return false; - if (approverRef != null ? !approverRef.equals(that.approverRef) : that.approverRef != null) return false; - if (approvalProcess != null ? !approvalProcess.equals(that.approvalProcess) : that.approvalProcess != null) + if (this == o) { return true; } + if (o == null || getClass() != o.getClass()) { return false; } + if (!super.equals(o)) { return false; } + + RAbstractRole that = (RAbstractRole) o; + + if (identifier != null ? !identifier.equals(that.identifier) : that.identifier != null) { return false; } + if (riskLevel != null ? !riskLevel.equals(that.riskLevel) : that.riskLevel != null) { return false; } + if (displayName != null ? !displayName.equals(that.displayName) : that.displayName != null) { return false; } + if (requestable != null ? !requestable.equals(that.requestable) : that.requestable != null) { return false; } + if (approverRef != null ? !approverRef.equals(that.approverRef) : that.approverRef != null) { return false; } + if (approvalProcess != null ? !approvalProcess.equals(that.approvalProcess) : that.approvalProcess != null) { return false; - if (ownerRef != null ? !ownerRef.equals(that.ownerRef) : that.ownerRef != null) return false; + } + if (ownerRef != null ? !ownerRef.equals(that.ownerRef) : that.ownerRef != null) { return false; } return autoassign != null ? autoassign.equals(that.autoassign) : that.autoassign == null; } @@ -175,7 +173,7 @@ public int hashCode() { } // dynamically called - public static void copyFromJAXB(AbstractRoleType jaxb, RAbstractRole repo, + public static void copyFromJAXB(AbstractRoleType jaxb, RAbstractRole repo, RepositoryContext repositoryContext, IdGeneratorResult generatorResult) throws DtoTranslationException { diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RArchetype.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RArchetype.java index 2e661f52a6f..58e220df5e1 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RArchetype.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RArchetype.java @@ -30,7 +30,7 @@ @Table(indexes = { @Index(name = "iArchetypeNameOrig", columnList = "name_orig"), @Index(name = "iArchetypeNameNorm", columnList = "name_norm")}) -public class RArchetype extends RAbstractRole { +public class RArchetype extends RAbstractRole { private RPolyString nameCopy; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java index 2bf917b6d75..134dc9ca920 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java @@ -7,6 +7,16 @@ package com.evolveum.midpoint.repo.sql.data.common; +import java.util.HashSet; +import java.util.Set; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.*; + +import org.hibernate.annotations.ForeignKey; +import org.hibernate.annotations.*; + import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.container.RAssignment; import com.evolveum.midpoint.repo.sql.data.common.embedded.RActivation; @@ -22,15 +32,6 @@ import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType; -import org.hibernate.annotations.ForeignKey; -import org.hibernate.annotations.*; - -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.*; -import java.util.HashSet; -import java.util.Set; /** * @author lazyman @@ -39,7 +40,7 @@ @VirtualCollection(jaxbName = @JaxbName(localPart = "assignment"), jaxbType = Set.class, jpaName = "assignments", jpaType = Set.class, additionalParams = { @VirtualQueryParam(name = "assignmentOwner", type = RAssignmentOwner.class, - value = "FOCUS")}, collectionType = RAssignment.class)}) + value = "FOCUS") }, collectionType = RAssignment.class) }) @Entity @ForeignKey(name = "fk_focus") @Table(indexes = { @@ -50,7 +51,7 @@ @Index(name = "iFocusValidTo", columnList = "validTo") }) @Persister(impl = MidPointJoinedPersister.class) -public abstract class RFocus extends RObject { +public abstract class RFocus extends RObject { private Set> linkRef; // FocusType private Set> personaRef; // FocusType @@ -72,7 +73,7 @@ public abstract class RFocus extends RObject { @Where(clause = RObjectReference.REFERENCE_TYPE + "= 1") @OneToMany(mappedBy = "owner", orphanRemoval = true) @ForeignKey(name = "none") - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set> getLinkRef() { if (linkRef == null) { linkRef = new HashSet<>(); @@ -83,7 +84,7 @@ public Set> getLinkRef() { @Where(clause = RObjectReference.REFERENCE_TYPE + "= 10") @OneToMany(mappedBy = "owner", orphanRemoval = true) @ForeignKey(name = "none") - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set> getPersonaRef() { if (personaRef == null) { personaRef = new HashSet<>(); @@ -101,7 +102,7 @@ public RActivation getActivation() { @CollectionTable(name = "m_focus_policy_situation", joinColumns = { @JoinColumn(name = "focus_oid", referencedColumnName = "oid") }) - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set getPolicySituation() { return policySituation; } @@ -186,24 +187,27 @@ public void setActivation(RActivation activation) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { return true; } + if (o == null || getClass() != o.getClass()) { return false; } + if (!super.equals(o)) { return false; } RFocus other = (RFocus) o; - if (linkRef != null ? !linkRef.equals(other.linkRef) : other.linkRef != null) return false; - if (activation != null ? !activation.equals(other.activation) : other.activation != null) return false; - if (policySituation != null ? !policySituation.equals(other.policySituation) : other.policySituation != null) return false; - if (localityFocus != null ? !localityFocus.equals(other.localityFocus) : other.localityFocus != null) return false; - if (costCenter != null ? !costCenter.equals(other.costCenter) : other.costCenter != null) return false; - if (emailAddress != null ? !emailAddress.equals(other.emailAddress) : other.emailAddress != null) return false; - if (telephoneNumber != null ? !telephoneNumber.equals(other.telephoneNumber) : other.telephoneNumber != null) + if (linkRef != null ? !linkRef.equals(other.linkRef) : other.linkRef != null) { return false; } + if (activation != null ? !activation.equals(other.activation) : other.activation != null) { return false; } + if (policySituation != null ? !policySituation.equals(other.policySituation) : other.policySituation != null) { return false; - if (locale != null ? !locale.equals(other.locale) : other.locale != null) return false; + } + if (localityFocus != null ? !localityFocus.equals(other.localityFocus) : other.localityFocus != null) { return false; } + if (costCenter != null ? !costCenter.equals(other.costCenter) : other.costCenter != null) { return false; } + if (emailAddress != null ? !emailAddress.equals(other.emailAddress) : other.emailAddress != null) { return false; } + if (telephoneNumber != null ? !telephoneNumber.equals(other.telephoneNumber) : other.telephoneNumber != null) { + return false; + } + if (locale != null ? !locale.equals(other.locale) : other.locale != null) { return false; } if (preferredLanguage != null ? !preferredLanguage.equals(other.preferredLanguage) : - other.preferredLanguage != null) return false; - if (timezone != null ? !timezone.equals(other.timezone) : other.timezone != null) return false; + other.preferredLanguage != null) { return false; } + if (timezone != null ? !timezone.equals(other.timezone) : other.timezone != null) { return false; } return true; } @@ -221,7 +225,7 @@ public int hashCode() { return result; } - public static void copyFocusInformationFromJAXB(FocusType jaxb, RFocus repo, RepositoryContext repositoryContext, + public static void copyFocusInformationFromJAXB(FocusType jaxb, RFocus repo, RepositoryContext repositoryContext, IdGeneratorResult generatorResult) throws DtoTranslationException { copyAssignmentHolderInformationFromJAXB(jaxb, repo, repositoryContext, generatorResult); @@ -261,7 +265,7 @@ public boolean isHasPhoto() { // (2) even querying of m_focus_photo table on RFocus merge // (see comments in SqlRepositoryServiceImpl.modifyObjectAttempt) @OneToMany(mappedBy = "owner", orphanRemoval = false) - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set getJpegPhoto() { if (jpegPhoto == null) { jpegPhoto = new HashSet<>(); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java index 68a854d2bcb..1191a388917 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java @@ -31,7 +31,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RGenericObject extends RFocus { +public class RGenericObject extends RFocus { private RPolyString nameCopy; private String objectType; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java index cba252c2b37..008d9789426 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java @@ -614,7 +614,7 @@ public int hashCode() { return result; } - static void copyAssignmentHolderInformationFromJAXB(AssignmentHolderType jaxb, RObject repo, + static void copyAssignmentHolderInformationFromJAXB(AssignmentHolderType jaxb, RObject repo, RepositoryContext repositoryContext, IdGeneratorResult generatorResult) throws DtoTranslationException { copyObjectInformationFromJAXB(jaxb, repo, repositoryContext, generatorResult); @@ -636,9 +636,8 @@ static void copyAssignmentHolderInformationFromJAXB(Assig } } - static void copyObjectInformationFromJAXB(ObjectType jaxb, RObject repo, - RepositoryContext repositoryContext, - IdGeneratorResult generatorResult) + static void copyObjectInformationFromJAXB(ObjectType jaxb, RObject repo, + RepositoryContext repositoryContext, IdGeneratorResult generatorResult) throws DtoTranslationException { Validate.notNull(jaxb, "JAXB object must not be null."); Validate.notNull(repo, "Repo object must not be null."); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java index 1ed2884642d..fd7e8143c1f 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java @@ -35,7 +35,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class ROrg extends RAbstractRole { +public class ROrg extends RAbstractRole { private RPolyString nameCopy; @Deprecated //todo remove collection in 3.9 diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java index d3867dd6d20..38e15938d4d 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java @@ -31,7 +31,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RRole extends RAbstractRole { +public class RRole extends RAbstractRole { private RPolyString nameCopy; @Deprecated //todo remove in 3.9 diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java index 46224ed3971..fce4248ab93 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java @@ -33,7 +33,7 @@ @Table(indexes = { @Index(name = "iServiceNameOrig", columnList = "name_orig"), @Index(name = "iServiceNameNorm", columnList = "name_norm")}) -public class RService extends RAbstractRole { +public class RService extends RAbstractRole { private RPolyString nameCopy; @Deprecated //todo remove collection in 3.9 diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java index 89913cf947e..34e005ab15b 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java @@ -7,6 +7,14 @@ package com.evolveum.midpoint.repo.sql.data.common; +import java.util.Objects; +import javax.persistence.*; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.hibernate.annotations.ForeignKey; +import org.hibernate.annotations.Index; +import org.hibernate.annotations.Persister; + import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; @@ -20,20 +28,8 @@ import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.util.logging.Trace; -import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType; -import org.hibernate.annotations.ForeignKey; -import org.hibernate.annotations.Index; -import org.hibernate.annotations.Persister; - -import javax.persistence.*; -import javax.xml.datatype.XMLGregorianCalendar; -import java.util.Objects; -/** - * @author lazyman - */ @Entity @Table(name = "m_shadow", indexes = { @javax.persistence.Index(name = "iShadowNameOrig", columnList = "name_orig"), @@ -52,11 +48,10 @@ }) @ForeignKey(name = "fk_shadow") @QueryEntity(anyElements = { - @VirtualAny(jaxbNameLocalPart = "attributes", ownerType = RObjectExtensionType.ATTRIBUTES)}) + @VirtualAny(jaxbNameLocalPart = "attributes", ownerType = RObjectExtensionType.ATTRIBUTES) }) @Persister(impl = MidPointJoinedPersister.class) -public class RShadow extends RObject implements OperationResult { +public class RShadow extends RObject implements OperationResult { - private static final Trace LOGGER = TraceManager.getTrace(RShadow.class); private RPolyString nameCopy; private String objectClass; @@ -220,25 +215,24 @@ public void setPendingOperationCount(Integer pendingOperationCount) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { return true; } + if (o == null || getClass() != o.getClass()) { return false; } + if (!super.equals(o)) { return false; } RShadow that = (RShadow) o; - if (!Objects.equals(nameCopy, that.nameCopy)) return false; - if (!Objects.equals(attemptNumber, that.attemptNumber)) - return false; - if (failedOperationType != that.failedOperationType) return false; - if (!Objects.equals(objectClass, that.objectClass)) return false; - if (!Objects.equals(primaryIdentifierValue, that.primaryIdentifierValue)) return false; - if (!Objects.equals(resourceRef, that.resourceRef)) return false; - if (!Objects.equals(intent, that.intent)) return false; - if (!Objects.equals(synchronizationSituation, that.synchronizationSituation)) return false; - if (!Objects.equals(kind, that.kind)) return false; - if (!Objects.equals(exists, that.exists)) return false; - if (status != that.status) return false; - if (!Objects.equals(pendingOperationCount, that.pendingOperationCount)) return false; + if (!Objects.equals(nameCopy, that.nameCopy)) { return false; } + if (!Objects.equals(attemptNumber, that.attemptNumber)) { return false; } + if (failedOperationType != that.failedOperationType) { return false; } + if (!Objects.equals(objectClass, that.objectClass)) { return false; } + if (!Objects.equals(primaryIdentifierValue, that.primaryIdentifierValue)) { return false; } + if (!Objects.equals(resourceRef, that.resourceRef)) { return false; } + if (!Objects.equals(intent, that.intent)) { return false; } + if (!Objects.equals(synchronizationSituation, that.synchronizationSituation)) { return false; } + if (!Objects.equals(kind, that.kind)) { return false; } + if (!Objects.equals(exists, that.exists)) { return false; } + if (status != that.status) { return false; } + if (!Objects.equals(pendingOperationCount, that.pendingOperationCount)) { return false; } return true; } @@ -262,7 +256,7 @@ public int hashCode() { } // dynamically called - public static void copyFromJAXB(ShadowType jaxb, RShadow repo, + public static void copyFromJAXB(ShadowType jaxb, RShadow repo, RepositoryContext repositoryContext, IdGeneratorResult generatorResult) throws DtoTranslationException { copyObjectInformationFromJAXB(jaxb, repo, repositoryContext, generatorResult); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java index 24daeb3f11e..c0c606c52c4 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java @@ -36,7 +36,7 @@ @Index(name = "iUserNameOrig", columnList = "name_orig")}) @ForeignKey(name = "fk_user") @Persister(impl = MidPointJoinedPersister.class) -public class RUser extends RFocus { +public class RUser extends RFocus { private RPolyString nameCopy; private RPolyString fullName; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java index 2207cb13a21..a0074401ec6 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java @@ -162,7 +162,7 @@ public RObject modifyObject(Class type, String oid, handleObjectCommonAttributes(type, narrowedModifications, prismObject, object, idGenerator); if (shadowPendingOperationModified) { - ((RShadow) object).setPendingOperationCount(((ShadowType) prismObject.asObjectable()).getPendingOperation().size()); + ((RShadow) object).setPendingOperationCount(((ShadowType) prismObject.asObjectable()).getPendingOperation().size()); } LOGGER.trace("Entity changes applied"); @@ -233,7 +233,7 @@ private void handlePhoto(Object bean, ItemDelta delta) throws SchemaException { throw new SystemException("Bean is not instance of " + RFocus.class + ", shouldn't happen"); } - RFocus focus = (RFocus) bean; + RFocus focus = (RFocus) bean; Set photos = focus.getJpegPhoto(); if (isDelete(delta)) {