Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Jun 25, 2021 · 4eaa6b7 · 4eaa6b7
2 parents ef226ca + 1b91bea
commit 4eaa6b7
Show file tree

Hide file tree

Showing 39 changed files with 143 additions and 141 deletions.
diff --git a/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java b/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
@@ -11,6 +11,7 @@
 import javax.persistence.*;
 
 import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.Persister;
 import org.hibernate.annotations.Where;
 
@@ -30,9 +31,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
 
-/**
- * @author lazyman
- */
 @QueryEntity(collections = {
         @VirtualCollection(jaxbName = @JaxbName(localPart = "inducement"), jaxbType = Set.class,
                 jpaName = "assignments", jpaType = Set.class, additionalParams = {
@@ -47,6 +45,7 @@
         @Index(name = "iAutoassignEnabled", columnList = "autoassign_enabled")
 })
 @Persister(impl = MidPointJoinedPersister.class)
+@DynamicUpdate
 public abstract class RAbstractRole extends RFocus {
 
     private String identifier;

diff --git a/...rc/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java b/...rc/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
@@ -4,7 +4,6 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-
 package com.evolveum.midpoint.repo.sql.data.common;
 
 import static com.evolveum.midpoint.schema.util.CertCampaignTypeUtil.norm;
@@ -15,6 +14,7 @@
 import javax.persistence.*;
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Persister;
 
@@ -41,6 +41,7 @@
 )
 @Persister(impl = MidPointJoinedPersister.class)
 @ForeignKey(name = "fk_acc_cert_campaign")
+@DynamicUpdate
 public class RAccessCertificationCampaign extends RObject {
 
     public static final String TABLE_NAME = "m_acc_cert_campaign";

diff --git a/.../main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java b/.../main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
@@ -6,6 +6,13 @@
  */
 package com.evolveum.midpoint.repo.sql.data.common;
 
+import javax.persistence.*;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.ForeignKey;
+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;
@@ -16,21 +23,17 @@
 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.AccessCertificationDefinitionType;
-import org.hibernate.annotations.ForeignKey;
-import org.hibernate.annotations.Persister;
-
-import javax.persistence.*;
-import javax.xml.datatype.XMLGregorianCalendar;
 
 @Entity
 @Table(name = RAccessCertificationDefinition.TABLE_NAME,
-        uniqueConstraints = @UniqueConstraint(name = "uc_acc_cert_definition_name", columnNames = {"name_norm"}),
+        uniqueConstraints = @UniqueConstraint(name = "uc_acc_cert_definition_name", columnNames = { "name_norm" }),
         indexes = {
                 @Index(name = "iCertDefinitionNameOrig", columnList = "name_orig"),
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
 @ForeignKey(name = "fk_acc_cert_definition")
+@DynamicUpdate
 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/RArchetype.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RArchetype.java
@@ -8,6 +8,7 @@
 
 import javax.persistence.*;
 
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Persister;
 
@@ -26,6 +27,7 @@
 @Table(indexes = {
         @Index(name = "iArchetypeNameOrig", columnList = "name_orig"),
         @Index(name = "iArchetypeNameNorm", columnList = "name_norm") })
+@DynamicUpdate
 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/RCase.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java
@@ -12,6 +12,7 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Persister;
 
@@ -28,9 +29,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseWorkItemType;
 
-/**
- * @author mederly
- */
 @Entity
 @ForeignKey(name = "fk_case")
 @Table(indexes = {
@@ -42,6 +40,7 @@
         @Index(name = "iCaseTypeCloseTimestamp", columnList = "closeTimestamp")
 })
 @Persister(impl = MidPointJoinedPersister.class)
+@DynamicUpdate
 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
@@ -10,6 +10,7 @@
 import javax.persistence.*;
 
 import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Persister;
 
@@ -24,15 +25,13 @@
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ConnectorType;
 
-/**
- * @author lazyman
- */
 @Entity
 @ForeignKey(name = "fk_connector")
 @Persister(impl = MidPointJoinedPersister.class)
 @Table(indexes = {
         @Index(name = "iConnectorNameOrig", columnList = "name_orig"),
         @Index(name = "iConnectorNameNorm", columnList = "name_norm") })
+@DynamicUpdate
 public class RConnector extends RObject {
 
     private RPolyString nameCopy;

diff --git a/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java b/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
@@ -8,6 +8,7 @@
 
 import javax.persistence.*;
 
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Persister;
 
@@ -20,9 +21,6 @@
 import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ConnectorHostType;
 
-/**
- * @author lazyman
- */
 @Entity
 @ForeignKey(name = "fk_connector_host")
 @Table(uniqueConstraints = @UniqueConstraint(name = "uc_connector_host_name", columnNames = { "name_norm" }),
@@ -31,6 +29,7 @@
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
+@DynamicUpdate
 public class RConnectorHost extends RObject {
 
     private RPolyString nameCopy;

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
@@ -8,6 +8,7 @@
 
 import javax.persistence.*;
 
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Persister;
 
@@ -28,6 +29,7 @@
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
+@DynamicUpdate
 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
@@ -39,6 +39,7 @@
         @Index(name = "iFocusValidTo", columnList = "validTo")
 })
 @Persister(impl = MidPointJoinedPersister.class)
+@DynamicUpdate
 public abstract class RFocus extends RObject {
 
     private Set<RObjectReference<RShadow>> linkRef; // FocusType

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocusPhoto.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocusPhoto.java
@@ -1,15 +1,15 @@
 /*
- * Copyright (c) 2010-2020 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-
 package com.evolveum.midpoint.repo.sql.data.common;
 
 import java.io.Serializable;
 import javax.persistence.*;
 
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.ForeignKey;
 
 import com.evolveum.midpoint.repo.sql.data.common.id.RFocusPhotoId;
@@ -18,13 +18,11 @@
 import com.evolveum.midpoint.repo.sql.util.EntityState;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 
-/**
- * @author lazyman
- */
 @Ignore
 @IdClass(RFocusPhotoId.class)
 @Entity
 @Table(name = "m_focus_photo")
+@DynamicUpdate
 public class RFocusPhoto implements Serializable, EntityState {
 
     private Boolean trans;

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
@@ -8,6 +8,7 @@
 
 import javax.persistence.*;
 
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Persister;
 
@@ -28,6 +29,7 @@
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
+@DynamicUpdate
 public class RForm extends RObject {
 
     private RPolyString nameCopy;

diff --git a/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java b/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java
@@ -8,6 +8,7 @@
 
 import javax.persistence.*;
 
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Persister;
 
@@ -20,9 +21,6 @@
 import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.FunctionLibraryType;
 
-/**
- * @author katkav
- */
 @Entity
 @ForeignKey(name = "fk_function_library")
 @Table(uniqueConstraints = @UniqueConstraint(name = "uc_function_library_name", columnNames = { "name_norm" }),
@@ -31,6 +29,7 @@
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
+@DynamicUpdate
 public class RFunctionLibrary extends RObject {
 
     private RPolyString nameCopy;

diff --git a/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java b/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java
@@ -1,11 +1,17 @@
 /*
- * Copyright (c) 2010-2021 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
 package com.evolveum.midpoint.repo.sql.data.common;
 
+import javax.persistence.*;
+
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.ForeignKey;
+import org.hibernate.annotations.Persister;
+
 import com.evolveum.midpoint.repo.sql.data.RepositoryContext;
 import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString;
 import com.evolveum.midpoint.repo.sql.query.definition.JaxbName;
@@ -14,22 +20,16 @@
 import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult;
 import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.GenericObjectType;
-import org.hibernate.annotations.ForeignKey;
-import org.hibernate.annotations.Persister;
 
-import javax.persistence.*;
-
-/**
- * @author lazyman
- */
 @Entity
 @ForeignKey(name = "fk_generic_object")
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_generic_object_name", columnNames = {"name_norm"}),
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_generic_object_name", columnNames = { "name_norm" }),
         indexes = {
                 @Index(name = "iGenericObjectNameOrig", columnList = "name_orig"),
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
+@DynamicUpdate
 public class RGenericObject extends RFocus {
 
     private RPolyString nameCopy;
@@ -59,8 +59,9 @@ public void setObjectType(String objectType) {
     }
 
     // dynamically called
-    public static void copyFromJAXB(GenericObjectType jaxb, RGenericObject repo, RepositoryContext repositoryContext,
-                                    IdGeneratorResult generatorResult) throws DtoTranslationException {
+    public static void copyFromJAXB(
+            GenericObjectType jaxb, RGenericObject repo, RepositoryContext repositoryContext,
+            IdGeneratorResult generatorResult) throws DtoTranslationException {
         copyFocusInformationFromJAXB(jaxb, repo, repositoryContext, generatorResult);
 
         repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName()));

diff --git a/.../repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java b/.../repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
@@ -1,11 +1,20 @@
 /*
- * Copyright (c) 2010-2019 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
 package com.evolveum.midpoint.repo.sql.data.common;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.persistence.*;
+
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.ForeignKey;
+import org.hibernate.annotations.Persister;
+
 import com.evolveum.midpoint.repo.sql.data.RepositoryContext;
 import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString;
 import com.evolveum.midpoint.repo.sql.data.common.other.RLookupTableRow;
@@ -17,25 +26,16 @@
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableRowType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
-import org.hibernate.annotations.ForeignKey;
-import org.hibernate.annotations.Persister;
-
-import javax.persistence.*;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
-/**
- * @author Viliam Repan (lazyman)
- */
 @Entity
 @ForeignKey(name = "fk_lookup_table")
-@Table(uniqueConstraints = @UniqueConstraint(name = "uc_lookup_name", columnNames = {"name_norm"}),
+@Table(uniqueConstraints = @UniqueConstraint(name = "uc_lookup_name", columnNames = { "name_norm" }),
         indexes = {
                 @Index(name = "iLookupTableNameOrig", columnList = "name_orig"),
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
+@DynamicUpdate
 public class RLookupTable extends RObject {
 
     private RPolyString nameCopy;
@@ -66,8 +66,9 @@ public void setRows(Set<RLookupTableRow> rows) {
     }
 
     // dynamically called
-    public static void copyFromJAXB(LookupTableType jaxb, RLookupTable repo, RepositoryContext repositoryContext,
-                                    IdGeneratorResult generatorResult) throws DtoTranslationException, SchemaException {
+    public static void copyFromJAXB(
+            LookupTableType jaxb, RLookupTable repo, RepositoryContext repositoryContext,
+            IdGeneratorResult generatorResult) throws DtoTranslationException, SchemaException {
         copyAssignmentHolderInformationFromJAXB(jaxb, repo, repositoryContext, generatorResult);
 
         repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName()));