diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java index 42afd4cebd1..8aa60d5205a 100644 --- a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java +++ b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java @@ -271,7 +271,7 @@ RExtItem createOrFindExtensionItemDefinition(Class type, I return extItemDictionary.createOrFindItemDefinition(propertyDefinition, false); } - void assertExtension(RObject object, RExtItem item, String... expectedValues) { + void assertExtension(RObject object, RExtItem item, String... expectedValues) { Set realValues = object.getStrings().stream() .filter(extString -> Objects.equals(extString.getItemId(), item.getId())) .map(ROExtString::getValue) diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java index 02d5078cc39..c5e2b140053 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java @@ -41,7 +41,7 @@ ) @Persister(impl = MidPointJoinedPersister.class) @ForeignKey(name = "fk_acc_cert_campaign") -public class RAccessCertificationCampaign extends RObject { +public class RAccessCertificationCampaign extends RObject { public static final String TABLE_NAME = "m_acc_cert_campaign"; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java index bd0398fa5ae..9527fe743f0 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java @@ -32,7 +32,7 @@ ) @Persister(impl = MidPointJoinedPersister.class) @ForeignKey(name = "fk_acc_cert_definition") -public class RAccessCertificationDefinition extends RObject { +public class RAccessCertificationDefinition extends RObject { public static final String TABLE_NAME = "m_acc_cert_definition"; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java index 049ee6d524c..65ae6bcc3bf 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java @@ -44,7 +44,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RCase extends RObject { +public class RCase extends RObject { private RPolyString nameCopy; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java index 8cd43950a78..80dabfaa28c 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java @@ -35,7 +35,7 @@ @Table(indexes = { @Index(name = "iConnectorNameOrig", columnList = "name_orig"), @Index(name = "iConnectorNameNorm", columnList = "name_norm")}) -public class RConnector extends RObject { +public class RConnector extends RObject { private static final Trace LOGGER = TraceManager.getTrace(RConnector.class); private RPolyString nameCopy; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java index c75417eb941..db4b02ab20d 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java @@ -31,7 +31,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RConnectorHost extends RObject { +public class RConnectorHost extends RObject { private RPolyString nameCopy; private String hostname; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RDashboard.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RDashboard.java index 1a2ce76edbb..78d76ec5847 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RDashboard.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RDashboard.java @@ -33,7 +33,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RDashboard extends RObject { +public class RDashboard extends RObject { private static final long serialVersionUID = 1L; 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 5f76452ccd8..2bf917b6d75 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 @@ -50,7 +50,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 diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java index 79f8e765122..1ac19c33895 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java @@ -32,7 +32,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RForm extends RObject { +public class RForm extends RObject { private RPolyString nameCopy; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java index 2fd5281bdd9..52a49ba8acf 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java @@ -33,7 +33,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RFunctionLibrary extends RObject { +public class RFunctionLibrary extends RObject { private RPolyString nameCopy; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java index 23e4e7a24dd..cd82bb76b94 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java @@ -36,7 +36,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RLookupTable extends RObject { +public class RLookupTable extends RObject { private RPolyString nameCopy; private Set rows; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java index 6de1f3eeb93..0bca61d9ac5 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java @@ -31,7 +31,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RNode extends RObject { +public class RNode extends RObject { private RPolyString nameCopy; private String nodeIdentifier; 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 b87377efc11..cba252c2b37 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 @@ -7,19 +7,30 @@ package com.evolveum.midpoint.repo.sql.data.common; +import static org.hibernate.annotations.CascadeType.ALL; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.*; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.Validate; +import org.hibernate.annotations.ForeignKey; +import org.hibernate.annotations.NamedQueries; +import org.hibernate.annotations.NamedQuery; +import org.hibernate.annotations.*; + import com.evolveum.midpoint.prism.Item; import com.evolveum.midpoint.prism.PrismContainerValue; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; -import com.evolveum.midpoint.repo.sql.data.common.any.RAnyConverter; -import com.evolveum.midpoint.repo.sql.data.common.any.RAnyValue; -import com.evolveum.midpoint.repo.sql.data.common.any.ROExtBoolean; -import com.evolveum.midpoint.repo.sql.data.common.any.ROExtDate; -import com.evolveum.midpoint.repo.sql.data.common.any.ROExtLong; -import com.evolveum.midpoint.repo.sql.data.common.any.ROExtPolyString; -import com.evolveum.midpoint.repo.sql.data.common.any.ROExtReference; -import com.evolveum.midpoint.repo.sql.data.common.any.ROExtString; -import com.evolveum.midpoint.repo.sql.data.common.any.ROExtValue; +import com.evolveum.midpoint.repo.sql.data.common.any.*; import com.evolveum.midpoint.repo.sql.data.common.container.RAssignment; import com.evolveum.midpoint.repo.sql.data.common.container.ROperationExecution; import com.evolveum.midpoint.repo.sql.data.common.container.RTrigger; @@ -30,38 +41,14 @@ import com.evolveum.midpoint.repo.sql.data.common.other.RReferenceOwner; import com.evolveum.midpoint.repo.sql.data.common.type.RObjectExtensionType; import com.evolveum.midpoint.repo.sql.data.factory.MetadataFactory; -import com.evolveum.midpoint.repo.sql.helpers.modify.DeltaUpdaterUtils; import com.evolveum.midpoint.repo.sql.query.definition.JaxbName; import com.evolveum.midpoint.repo.sql.query.definition.JaxbPath; -import com.evolveum.midpoint.repo.sql.query2.definition.IdQueryProperty; -import com.evolveum.midpoint.repo.sql.query2.definition.NotQueryable; import com.evolveum.midpoint.repo.sql.query.definition.QueryEntity; import com.evolveum.midpoint.repo.sql.query.definition.VirtualAny; -import com.evolveum.midpoint.repo.sql.util.ClassMapper; -import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; -import com.evolveum.midpoint.repo.sql.util.EntityState; -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.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; +import com.evolveum.midpoint.repo.sql.query2.definition.IdQueryProperty; +import com.evolveum.midpoint.repo.sql.query2.definition.NotQueryable; +import com.evolveum.midpoint.repo.sql.util.*; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; -import org.hibernate.annotations.*; -import org.hibernate.annotations.ForeignKey; -import org.hibernate.annotations.NamedQueries; -import org.hibernate.annotations.NamedQuery; - -import javax.persistence.*; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.xml.datatype.XMLGregorianCalendar; -import java.io.Serializable; -import java.util.*; - -import static org.hibernate.annotations.CascadeType.*; /** * @author lazyman @@ -93,12 +80,9 @@ @NamedQuery(name = "delete.lookupTableDataRowByKey", query = "delete RLookupTableRow r where r.ownerOid = :oid and r.key = :key"), @NamedQuery(name = "get.campaignCaseLastId", query = "select max(c.id) from RAccessCertificationCase c where c.ownerOid = :oid"), @NamedQuery(name = "delete.campaignCases", query = "delete RAccessCertificationCase c where c.ownerOid = :oid"), - // @NamedQuery(name = "delete.campaignCasesReferences", query = "delete RCertCaseReference r where r.ownerOid = :oid"), @NamedQuery(name = "delete.campaignCasesWorkItems", query = "delete RAccessCertificationWorkItem r where r.ownerOwnerOid = :oid"), @NamedQuery(name = "delete.campaignCasesWorkItemReferences", query = "delete RCertWorkItemReference r where r.ownerOwnerOwnerOid = :oid"), @NamedQuery(name = "delete.campaignCase", query = "delete RAccessCertificationCase c where c.ownerOid = :oid and c.id = :id"), - // doesn't work; generates SQL of "delete from m_acc_cert_case_reference where owner_owner_oid=? and owner_id=? and owner_owner_oid=? and reference_type=? and relation=? and targetOid=?" - //@NamedQuery(name = "delete.campaignCaseReferences", query = "delete RCertCaseReference r where r.ownerOid = :oid and r.id = :id"), @NamedQuery(name = "resolveReferences", query = "select o.oid, o.name from RObject as o where o.oid in (:oid)"), @NamedQuery(name = "get.campaignCase", query = "select c.fullObject from RAccessCertificationCase c where c.ownerOid=:ownerOid and c.id=:id"), @NamedQuery(name = "get.campaignCases", query = "select c.fullObject from RAccessCertificationCase c where c.ownerOid=:ownerOid") @@ -106,27 +90,17 @@ @QueryEntity( anyElements = { @VirtualAny(jaxbNameLocalPart = "extension", ownerType = RObjectExtensionType.EXTENSION) - } -// , -// entities = { -// @VirtualEntity( -// jaxbName = @JaxbName(localPart = "metadata"), -// jaxbType = MetadataType.class, -// jpaName = "", -// jpaType = Serializable.class // dummy value (ignored) -// ) -// } - ) + }) @Entity @Table(name = "m_object", indexes = { @Index(name = "iObjectNameOrig", columnList = "name_orig"), @Index(name = "iObjectNameNorm", columnList = "name_norm"), @Index(name = "iObjectTypeClass", columnList = "objectTypeClass"), @Index(name = "iObjectCreateTimestamp", columnList = "createTimestamp"), - @Index(name = "iObjectLifecycleState", columnList = "lifecycleState")}) + @Index(name = "iObjectLifecycleState", columnList = "lifecycleState") }) @Inheritance(strategy = InheritanceType.JOINED) @Persister(impl = MidPointJoinedPersister.class) -public abstract class RObject implements Metadata>, EntityState, Serializable { +public abstract class RObject implements Metadata>, EntityState, Serializable { public static final String F_OBJECT_TYPE_CLASS = "objectTypeClass"; public static final String F_TEXT_INFO_ITEMS = "textInfoItems"; @@ -190,9 +164,8 @@ public RPolyString getName() { return name; } - // @JoinTable(foreignKey = @ForeignKey(name = "none")) @OneToMany(mappedBy = RTrigger.F_OWNER, orphanRemoval = true) - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set getTrigger() { if (trigger == null) { trigger = new HashSet<>(); @@ -202,7 +175,7 @@ public Set getTrigger() { @Where(clause = RObjectReference.REFERENCE_TYPE + "= 0") @OneToMany(mappedBy = RObjectReference.F_OWNER, orphanRemoval = true) - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set> getParentOrgRef() { if (parentOrgRef == null) { parentOrgRef = new HashSet<>(); @@ -212,14 +185,14 @@ public Set> getParentOrgRef() { @NotQueryable @OneToMany(fetch = FetchType.LAZY, targetEntity = ROrgClosure.class, mappedBy = "descendant") - @Cascade({org.hibernate.annotations.CascadeType.DELETE}) + @Cascade({ org.hibernate.annotations.CascadeType.DELETE }) public Set getDescendants() { return descendants; } @NotQueryable @OneToMany(fetch = FetchType.LAZY, targetEntity = ROrgClosure.class, mappedBy = "ancestor")//, orphanRemoval = true) - @Cascade({org.hibernate.annotations.CascadeType.DELETE}) + @Cascade({ org.hibernate.annotations.CascadeType.DELETE }) public Set getAncestors() { return ancestors; } @@ -242,8 +215,7 @@ public byte[] getFullObject() { @Where(clause = RObjectReference.REFERENCE_TYPE + "= 5") @OneToMany(mappedBy = RObjectReference.F_OWNER, orphanRemoval = true) -// @JoinTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) @JaxbPath(itemPath = { @JaxbName(localPart = "metadata"), @JaxbName(localPart = "createApproverRef") }) public Set> getCreateApproverRef() { if (createApproverRef == null) { @@ -255,7 +227,7 @@ public Set> getCreateApproverRef() { @Where(clause = RObjectReference.REFERENCE_TYPE + "= 8") @OneToMany(mappedBy = "owner", orphanRemoval = true) @ForeignKey(name = "none") - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set> getRoleMembershipRef() { if (roleMembershipRef == null) { roleMembershipRef = new HashSet<>(); @@ -266,7 +238,7 @@ public Set> getRoleMembershipRef() { @Where(clause = RObjectReference.REFERENCE_TYPE + "= 9") @OneToMany(mappedBy = "owner", orphanRemoval = true) @ForeignKey(name = "none") - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set> getDelegatedRef() { if (delegatedRef == null) { delegatedRef = new HashSet<>(); @@ -277,7 +249,7 @@ public Set> getDelegatedRef() { @Where(clause = RObjectReference.REFERENCE_TYPE + "= 11") @OneToMany(mappedBy = "owner", orphanRemoval = true) @ForeignKey(name = "none") - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set> getArchetypeRef() { if (archetypeRef == null) { archetypeRef = new HashSet<>(); @@ -293,9 +265,7 @@ protected Set getAssignments(RAssignmentOwner owner) { return wanted; } - Iterator iterator = assignments.iterator(); - while (iterator.hasNext()) { - RAssignment ass = iterator.next(); + for (RAssignment ass : assignments) { if (owner.equals(ass.getAssignmentOwner())) { wanted.add(ass); } @@ -313,8 +283,8 @@ public Set getAssignment() { @JaxbPath(itemPath = @JaxbName(localPart = "inducement")) @OneToMany(mappedBy = RAssignment.F_OWNER, orphanRemoval = true) @ForeignKey(name = "none") - @Cascade({org.hibernate.annotations.CascadeType.ALL}) - @NotQueryable // virtual definition is used instead + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) + @NotQueryable // virtual definition is used instead public Set getAssignments() { if (assignments == null) { assignments = new HashSet<>(); @@ -322,7 +292,6 @@ public Set getAssignments() { return assignments; } - @JaxbPath(itemPath = { @JaxbName(localPart = "metadata"), @JaxbName(localPart = "createChannel") }) public String getCreateChannel() { return createChannel; @@ -347,8 +316,7 @@ public REmbeddedReference getModifierRef() { @Where(clause = RObjectReference.REFERENCE_TYPE + "= 6") @OneToMany(mappedBy = RObjectReference.F_OWNER, orphanRemoval = true) -// @JoinTable(foreignKey = @ForeignKey(name = "none")) - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) @JaxbPath(itemPath = { @JaxbName(localPart = "metadata"), @JaxbName(localPart = "modifyApproverRef") }) public Set> getModifyApproverRef() { if (modifyApproverRef == null) { @@ -370,7 +338,7 @@ public XMLGregorianCalendar getModifyTimestamp() { @NotQueryable @OneToMany(fetch = FetchType.LAZY, mappedBy = "owner", orphanRemoval = true) //@Cascade({ PERSIST, MERGE, REMOVE, REFRESH, DELETE, REPLICATE, LOCK, DETACH }) // not SAVE_UPDATE - @Cascade({ ALL} ) + @Cascade({ ALL }) public Collection getLongs() { return longs; } @@ -378,7 +346,7 @@ public Collection getLongs() { @NotQueryable @OneToMany(fetch = FetchType.LAZY, mappedBy = "owner", orphanRemoval = true) //@Cascade({ PERSIST, MERGE, REMOVE, REFRESH, DELETE, REPLICATE, LOCK, DETACH }) // not SAVE_UPDATE - @Cascade({ ALL} ) + @Cascade({ ALL }) public Collection getBooleans() { return booleans; } @@ -386,7 +354,7 @@ public Collection getBooleans() { @NotQueryable @OneToMany(fetch = FetchType.LAZY, mappedBy = "owner", orphanRemoval = true) //@Cascade({ PERSIST, MERGE, REMOVE, REFRESH, DELETE, REPLICATE, LOCK, DETACH }) // not SAVE_UPDATE - @Cascade({ ALL} ) + @Cascade({ ALL }) public Collection getStrings() { return strings; } @@ -394,7 +362,7 @@ public Collection getStrings() { @NotQueryable @OneToMany(fetch = FetchType.LAZY, mappedBy = "owner", orphanRemoval = true) //@Cascade({ PERSIST, MERGE, REMOVE, REFRESH, DELETE, REPLICATE, LOCK, DETACH }) // not SAVE_UPDATE - @Cascade({ ALL} ) + @Cascade({ ALL }) public Collection getDates() { return dates; } @@ -402,7 +370,7 @@ public Collection getDates() { @NotQueryable @OneToMany(fetch = FetchType.LAZY, mappedBy = "owner", orphanRemoval = true) //@Cascade({ PERSIST, MERGE, REMOVE, REFRESH, DELETE, REPLICATE, LOCK, DETACH }) // not SAVE_UPDATE - @Cascade({ ALL} ) + @Cascade({ ALL }) public Collection getReferences() { return references; } @@ -410,7 +378,7 @@ public Collection getReferences() { @NotQueryable @OneToMany(fetch = FetchType.LAZY, mappedBy = "owner", orphanRemoval = true) //@Cascade({ PERSIST, MERGE, REMOVE, REFRESH, DELETE, REPLICATE, LOCK, DETACH }) // not SAVE_UPDATE - @Cascade({ ALL} ) + @Cascade({ ALL }) public Collection getPolys() { return polys; } @@ -425,7 +393,7 @@ public RObjectType getObjectTypeClass() { @CollectionTable(name = "m_object_subtype", joinColumns = { @JoinColumn(name = "object_oid", referencedColumnName = "oid", foreignKey = @javax.persistence.ForeignKey(name = "fk_object_subtype")) }) - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set getSubtype() { return subtype; } @@ -550,7 +518,7 @@ public void setBooleans(Collection booleans) { @NotQueryable @OneToMany(mappedBy = "owner", orphanRemoval = true) - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) public Set getTextInfoItems() { if (textInfoItems == null) { textInfoItems = new HashSet<>(); @@ -564,7 +532,7 @@ public void setTextInfoItems(Set textInfoItems) { @OneToMany(mappedBy = RAssignment.F_OWNER, orphanRemoval = true) @ForeignKey(name = "none") - @Cascade({org.hibernate.annotations.CascadeType.ALL}) + @Cascade({ org.hibernate.annotations.CascadeType.ALL }) @JaxbName(localPart = "operationExecution") public Set getOperationExecutions() { if (operationExecutions == null) { @@ -596,40 +564,36 @@ public void setArchetypeRef(Set> archetypeRef) { @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; } RObject rObject = (RObject) o; - if (name != null ? !name.equals(rObject.name) : rObject.name != null) - return false; - if (descendants != null ? !descendants.equals(rObject.descendants) : rObject.descendants != null) - return false; - if (ancestors != null ? !ancestors.equals(rObject.ancestors) : rObject.ancestors != null) + if (name != null ? !name.equals(rObject.name) : rObject.name != null) { return false; } + if (descendants != null ? !descendants.equals(rObject.descendants) : rObject.descendants != null) { return false; } + if (ancestors != null ? !ancestors.equals(rObject.ancestors) : rObject.ancestors != null) { return false; } + if (parentOrgRef != null ? !parentOrgRef.equals(rObject.parentOrgRef) : rObject.parentOrgRef != null) { return false; } + if (trigger != null ? !trigger.equals(rObject.trigger) : rObject.trigger != null) { return false; } + if (tenantRef != null ? !tenantRef.equals(rObject.tenantRef) : rObject.tenantRef != null) { return false; } + if (lifecycleState != null ? !lifecycleState.equals(rObject.lifecycleState) : rObject.lifecycleState != null) { return false; - if (parentOrgRef != null ? !parentOrgRef.equals(rObject.parentOrgRef) : rObject.parentOrgRef != null) - return false; - if (trigger != null ? !trigger.equals(rObject.trigger) : rObject.trigger != null) - return false; - if (tenantRef != null ? !tenantRef.equals(rObject.tenantRef) : rObject.tenantRef != null) + } + if (!MetadataFactory.equals(this, rObject)) { return false; } + + if (dates != null ? !dates.equals(rObject.dates) : rObject.dates != null) { return false; } + if (longs != null ? !longs.equals(rObject.longs) : rObject.longs != null) { return false; } + if (polys != null ? !polys.equals(rObject.polys) : rObject.polys != null) { return false; } + if (references != null ? !references.equals(rObject.references) : rObject.references != null) { return false; } + if (strings != null ? !strings.equals(rObject.strings) : rObject.strings != null) { return false; } + if (booleans != null ? !booleans.equals(rObject.booleans) : rObject.booleans != null) { return false; } + if (textInfoItems != null ? !textInfoItems.equals(rObject.textInfoItems) : rObject.textInfoItems != null) { return false; - if (lifecycleState != null ? !lifecycleState.equals(rObject.lifecycleState) : rObject.lifecycleState != null) + } + if (operationExecutions != null ? !operationExecutions.equals(rObject.operationExecutions) : rObject.operationExecutions != null) { return false; - if (!MetadataFactory.equals(this, rObject)) return false; - - if (dates != null ? !dates.equals(rObject.dates) : rObject.dates != null) return false; - if (longs != null ? !longs.equals(rObject.longs) : rObject.longs != null) return false; - if (polys != null ? !polys.equals(rObject.polys) : rObject.polys != null) return false; - if (references != null ? !references.equals(rObject.references) : rObject.references != null) return false; - if (strings != null ? !strings.equals(rObject.strings) : rObject.strings != null) return false; - if (booleans != null ? !booleans.equals(rObject.booleans) : rObject.booleans != null) return false; - if (textInfoItems != null ? !textInfoItems.equals(rObject.textInfoItems) : rObject.textInfoItems != null) return false; - if (operationExecutions != null ? !operationExecutions.equals(rObject.operationExecutions) : rObject.operationExecutions != null) return false; - if (subtype != null ? !subtype.equals(rObject.subtype) : rObject.subtype != null) return false; + } + if (subtype != null ? !subtype.equals(rObject.subtype) : rObject.subtype != null) { return false; } return true; } @@ -650,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); @@ -672,7 +636,7 @@ static void copyAssignmentHolderInformationFromJAXB(Assig } } - static void copyObjectInformationFromJAXB(ObjectType jaxb, RObject repo, + static void copyObjectInformationFromJAXB(ObjectType jaxb, RObject repo, RepositoryContext repositoryContext, IdGeneratorResult generatorResult) throws DtoTranslationException { @@ -723,14 +687,14 @@ public String toString() { return RUtil.getDebugString(this); } - static void copyExtensionOrAttributesFromJAXB(PrismContainerValue containerValue, RObject repo, + static void copyExtensionOrAttributesFromJAXB(PrismContainerValue containerValue, RObject repo, RepositoryContext repositoryContext, RObjectExtensionType ownerType, IdGeneratorResult generatorResult) throws DtoTranslationException { RAnyConverter converter = new RAnyConverter(repositoryContext.prismContext, repositoryContext.extItemDictionary); Set> values = new HashSet<>(); try { //TODO: is this enough? should we try items without definitions? - for (Item item : containerValue.getItems()) { + for (Item item : containerValue.getItems()) { Set> converted = converter.convertToRValue(item, false, ownerType); if (generatorResult.isGeneratedOid()) { converted.forEach(v -> v.setTransient(true)); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectCollection.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectCollection.java index 328827952fd..c8fbe485e1f 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectCollection.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectCollection.java @@ -33,7 +33,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RObjectCollection extends RObject { +public class RObjectCollection extends RObject { private RPolyString nameCopy; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java index 2241c31b302..c90b23c6432 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java @@ -37,7 +37,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RObjectTemplate extends RObject { +public class RObjectTemplate extends RObject { private RPolyString nameCopy; private Set> includeRef; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java index 6aa65eabf59..aa5b5f443bb 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java @@ -33,7 +33,7 @@ ) @ForeignKey(name = "fk_report") @Persister(impl = MidPointJoinedPersister.class) -public class RReport extends RObject { +public class RReport extends RObject { private RPolyString nameCopy; private ROrientationType orientation; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java index 2d9c400560b..6ad67d1d4c1 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java @@ -28,7 +28,7 @@ @Table(indexes = { @Index(name = "iReportOutputNameOrig", columnList = "name_orig"), @Index(name = "iReportOutputNameNorm", columnList = "name_norm")}) -public class RReportOutput extends RObject { +public class RReportOutput extends RObject { private RPolyString nameCopy; private REmbeddedReference reportRef; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java index 555eb200a26..d3e095fc2a7 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java @@ -43,7 +43,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RResource extends RObject { +public class RResource extends RObject { private static final Trace LOGGER = TraceManager.getTrace(RResource.class); private RPolyString nameCopy; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java index 8b403ebbc18..669de6116f5 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java @@ -27,7 +27,7 @@ ) @ForeignKey(name = "fk_security_policy") @Persister(impl = MidPointJoinedPersister.class) -public class RSecurityPolicy extends RObject { +public class RSecurityPolicy extends RObject { private RPolyString nameCopy; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java index bdb54025fbf..3ebe9819a2d 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java @@ -31,7 +31,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RSequence extends RObject { +public class RSequence extends RObject { private RPolyString nameCopy; 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 4b8ebf91e02..89913cf947e 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 @@ -54,7 +54,7 @@ @QueryEntity(anyElements = { @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; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java index 8803da1fa49..c425cc67ec9 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java @@ -31,7 +31,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RSystemConfiguration extends RObject { +public class RSystemConfiguration extends RObject { private RPolyString nameCopy; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java index c21cb8ce20c..ff76bf71a41 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java @@ -39,7 +39,7 @@ uniqueConstraints = @UniqueConstraint(name = "uc_task_identifier", columnNames = {"taskIdentifier"})) @ForeignKey(name = "fk_task") @Persister(impl = MidPointJoinedPersister.class) -public class RTask extends RObject implements OperationResultFull { +public class RTask extends RObject implements OperationResultFull { private RPolyString nameCopy; private String taskIdentifier; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java index 84e304c35dd..e89c84ef698 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java @@ -31,7 +31,7 @@ } ) @Persister(impl = MidPointJoinedPersister.class) -public class RValuePolicy extends RObject { +public class RValuePolicy extends RObject { private RPolyString nameCopy; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java index 3b39bed5df9..90ce6ed5bed 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java @@ -451,7 +451,7 @@ public static Collection getExtValues(RObject rObject, REx } // TODO fix this! (add support for other types) - private static Collection> getAllExtValues(RObject rObject, ItemDefinition itemDef) { + private static Collection> getAllExtValues(RObject rObject, ItemDefinition itemDef) { if (DOMUtil.XSD_STRING.equals(itemDef.getTypeName())) { return rObject.getStrings(); } else { diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/ROperationExecution.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/ROperationExecution.java index ff8e25b7a30..82ed27f932f 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/ROperationExecution.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/ROperationExecution.java @@ -47,7 +47,7 @@ @Index(name = "iOpExecStatus", columnList = "status"), @Index(name = "iOpExecOwnerOid", columnList = "owner_oid")}) @Persister(impl = MidPointSingleTablePersister.class) -public class ROperationExecution implements Container> { +public class ROperationExecution implements Container { public static final String F_OWNER = "owner"; @@ -55,7 +55,7 @@ public class ROperationExecution implements Container> { private Boolean trans; - private RObject owner; + private RObject owner; private String ownerOid; private Integer id; @@ -68,7 +68,7 @@ public ROperationExecution() { this(null); } - public ROperationExecution(RObject owner) { + public ROperationExecution(RObject owner) { this.setOwner(owner); } @@ -78,7 +78,7 @@ public ROperationExecution(RObject owner) { @ManyToOne(fetch = FetchType.LAZY) @NotQueryable @Override - public RObject getOwner() { + public RObject getOwner() { return owner; } 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 21f4c3d754e..2207cb13a21 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 @@ -94,7 +94,7 @@ private Context(RepoModifyOptions options, PrismIdentifierGenerator idGenerat /** * modify */ - public RObject modifyObject(Class type, String oid, + public RObject modifyObject(Class type, String oid, Collection> modifications, PrismObject prismObject, RepoModifyOptions modifyOptions, Session session, ObjectUpdater.AttemptContext attemptContext) throws SchemaException { @@ -127,7 +127,7 @@ public RObject modifyObject(Class type, String oid, Class objectClass = RObjectType.getByJaxbType(type).getClazz(); //noinspection unchecked - RObject object = session.byId(objectClass).getReference(oid); + RObject object = session.byId(objectClass).getReference(oid); ManagedType mainEntityType = entityRegistry.getJaxbMapping(type); @@ -170,7 +170,7 @@ public RObject modifyObject(Class type, String oid, return object; } - private void handleRegularModification(RObject object, ItemDelta delta, + private void handleRegularModification(RObject object, ItemDelta delta, PrismObject prismObject, ManagedType mainEntityType, Context ctx) throws SchemaException { TypeValuePair currentValueTypePair = new TypeValuePair(); @@ -404,7 +404,7 @@ private boolean isObjectTextInfoRecomputationNeeded(Class } private void handleObjectTextInfoChanges(Class type, Collection modifications, - PrismObject prismObject, RObject object) { + PrismObject prismObject, RObject object) { // update object text info if necessary if (!isObjectTextInfoRecomputationNeeded(type, modifications)) { return; @@ -450,7 +450,7 @@ private void handleAssignmentExtensionItemDelta(RAssignment assignment, ItemDelt } private void processExtensionDeltaValueSet(Collection prismValuesFromDelta, - Integer itemId, RAnyConverter.ValueType valueType, RObject object, + Integer itemId, RAnyConverter.ValueType valueType, RObject object, RObjectExtensionType objectOwnerType, RAssignmentExtension assignmentExtension, RAssignmentExtensionType assignmentExtensionType, BiConsumer>, Collection>>> deltaValuesProcessor) { @@ -746,7 +746,7 @@ private void processAssignmentExtensionValues(RAssignmentExtension extension, } } - private void processObjectExtensionValues(RObject object, + private void processObjectExtensionValues(RObject object, RObjectExtensionType objectOwnerType, RAnyConverter.ValueType valueType, Collection>> valuesFromDelta, BiConsumer>, Collection>>> deltaValuesProcessor) { @@ -1102,15 +1102,15 @@ private Object invoke(Object object, Method method) { * add with overwrite */ @SuppressWarnings("unused") - public RObject update(PrismObject object, RObject objectToMerge, + public RObject update(PrismObject object, RObject objectToMerge, boolean noFetchExtensionValueInsertionForbidden, Session session) { return merge(objectToMerge, session); // todo implement } - private RObject merge(RObject object, Session session) { + private RObject merge(RObject object, Session session) { //noinspection unchecked - return (RObject) session.merge(object); + return (RObject) session.merge(object); } private static class TypeValuePair { diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java index 75ab55fdec2..0e13f718dac 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java @@ -621,7 +621,7 @@ private void loadIndexOnlyItemsIfNeeded(PrismObject pr return; } - RObject rObject = null; + RObject rObject = null; for (ItemDefinition itemDefinition : getIndexOnlyExtensionItems(prismObject)) { if (SelectorOptions.hasToLoadPath(ItemPath.create(ObjectType.F_EXTENSION, itemDefinition.getItemName()), retrieveOptions, false)) { diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java index 93ad8a875e9..ec0d2ed1793 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java @@ -267,7 +267,7 @@ protected SqlRepositoryConfiguration getConfiguration() { return baseHelper.getConfiguration(); } - private String nonOverwriteAddObjectAttempt(PrismObject object, RObject rObject, + private String nonOverwriteAddObjectAttempt(PrismObject object, RObject rObject, String originalOid, Session session, OrgClosureManager.Context closureContext) throws ObjectAlreadyExistsException, SchemaException, DtoTranslationException { diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/DeltaUpdaterUtils.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/DeltaUpdaterUtils.java index 62fbf477623..bb9a6f76ff5 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/DeltaUpdaterUtils.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/DeltaUpdaterUtils.java @@ -14,7 +14,6 @@ import com.evolveum.midpoint.prism.path.ItemPath; import com.evolveum.midpoint.repo.sql.data.common.RObject; import com.evolveum.midpoint.repo.sql.data.common.any.RAExtBase; -import com.evolveum.midpoint.repo.sql.data.common.any.RAnyValue; import com.evolveum.midpoint.repo.sql.data.common.any.RAssignmentExtension; import com.evolveum.midpoint.repo.sql.data.common.any.ROExtBase; import com.evolveum.midpoint.repo.sql.data.common.container.Container; @@ -24,7 +23,6 @@ import com.evolveum.midpoint.util.exception.SystemException; import org.hibernate.Session; -import java.io.Serializable; import java.util.*; /** @@ -203,7 +201,7 @@ public static void clearExtension(RAssignmentExtension extension, Session sessio clearExtensionCollection(extension.getStrings(), session); } - public static void clearExtension(RObject obj, RObjectExtensionType extType, Session session) { + public static void clearExtension(RObject obj, RObjectExtensionType extType, Session session) { clearExtensionCollection(obj.getBooleans(), extType, session); clearExtensionCollection(obj.getDates(), extType, session); clearExtensionCollection(obj.getLongs(), extType, session);