Change oid of Protected Mark to 800

Evolveum · Feb 27, 2023 · 0b66e29 · 0b66e29
1 parent 6a20f51
commit 0b66e29
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 15 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/shadows/ShadowTablePanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/shadows/ShadowTablePanel.java
@@ -611,7 +611,7 @@ private void markProtectedShadow(IModel<SelectableBean<ShadowType>> model, AjaxR
         for (SelectableBean<ShadowType> shadow : selected) {
             try {
                 var policyStat = new PolicyStatementType()
-                        .markRef(SystemObjectsType.MARK_PROTECTED_SHADOW.value(), MarkType.COMPLEX_TYPE)
+                        .markRef(SystemObjectsType.MARK_PROTECTED.value(), MarkType.COMPLEX_TYPE)
                         .type(PolicyStatementTypeType.APPLY);
                 var delta = getPageBase().getPrismContext().deltaFactory().object()
                         .createModificationAddContainer(ShadowType.class,

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -15758,10 +15758,10 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:enumeration>
-            <xsd:enumeration value="00000000-0000-0000-0000-000000000750">
+            <xsd:enumeration value="00000000-0000-0000-0000-000000000800">
                 <xsd:annotation>
                     <xsd:appinfo>
-                        <jaxb:typesafeEnumMember name="MARK_PROTECTED_SHADOW"/>
+                        <jaxb:typesafeEnumMember name="MARK_PROTECTED"/>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:enumeration>

diff --git a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/CommonInitialObjects.java b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/CommonInitialObjects.java
@@ -99,8 +99,8 @@ public interface CommonInitialObjects {
             SystemObjectsType.MARK_SHADOW_CORRELATION_STATE_CHANGED.value());
 
     TestObject<MarkType> MARK_PROTECTED_SHADOW = TestObject.classPath(
-            MARKS, "750-mark-protected-shadow.xml",
-            SystemObjectsType.MARK_PROTECTED_SHADOW.value());
+            MARKS, "800-mark-protected-shadow.xml",
+            SystemObjectsType.MARK_PROTECTED.value());
 
     String PARAM_SIMULATION_RESULT_REF = "simulationResultRef";
     String PARAM_PATHS_TO_INCLUDE = "pathsToInclude";

diff --git a/...g-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java b/...g-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
@@ -155,8 +155,8 @@ public abstract class AbstractDummyTest extends AbstractProvisioningIntegrationT
 
 
     protected static final TestObject<MarkType> MARK_PROTECTED_SHADOW = TestObject.classPath(
-            "initial-objects/mark", "750-mark-protected-shadow.xml",
-            SystemObjectsType.MARK_PROTECTED_SHADOW.value());
+            "initial-objects/mark", "800-mark-protected-shadow.xml",
+            SystemObjectsType.MARK_PROTECTED.value());
 
     @Autowired
     protected ProvisioningContextFactory provisioningContextFactory;

diff --git a/...mpl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyShadowMarks.java b/...mpl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyShadowMarks.java
@@ -79,8 +79,8 @@ public class TestDummyShadowMarks extends AbstractBasicDummyTest {
             SystemObjectsType.ARCHETYPE_SHADOW_MARK.value());
 
     private static final TestObject<MarkType> TAG_PROTECTED_SHADOW = TestObject.classPath(
-            "initial-objects/mark", "750-mark-protected-shadow.xml",
-            SystemObjectsType.MARK_PROTECTED_SHADOW.value());
+            "initial-objects/mark", "800-mark-protected-shadow.xml",
+            SystemObjectsType.MARK_PROTECTED.value());
 
 
     String piratesIcfUid;
@@ -150,7 +150,7 @@ public void test200MarkShadowProtected() throws Exception {
         assertNull("" + account + " is not protected", account.asObjectable().isProtectedObject());
 
         PolicyStatementType policyStat = new PolicyStatementType()
-                .markRef(SystemObjectsType.MARK_PROTECTED_SHADOW.value(), MarkType.COMPLEX_TYPE)
+                .markRef(SystemObjectsType.MARK_PROTECTED.value(), MarkType.COMPLEX_TYPE)
                 .type(PolicyStatementTypeType.APPLY);
 
         ObjectDelta<ShadowType> shadowDelta = prismContext.deltaFactory().object()
@@ -396,7 +396,7 @@ public void test400RemoveProtectedMark() throws Exception {
 
 
         PolicyStatementType policyStat = new PolicyStatementType()
-                .markRef(SystemObjectsType.MARK_PROTECTED_SHADOW.value(), MarkType.COMPLEX_TYPE)
+                .markRef(SystemObjectsType.MARK_PROTECTED.value(), MarkType.COMPLEX_TYPE)
                 .type(PolicyStatementTypeType.APPLY);
         ObjectDelta<ShadowType> shadowDelta = prismContext.deltaFactory().object()
                 .createModificationDeleteContainer(ShadowType.class, ACCOUNT_DAEMON_OID, ShadowType.F_POLICY_STATEMENT, policyStat);

diff --git a/...mpl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java b/...mpl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java
@@ -57,8 +57,8 @@ public class TestSynchronization extends AbstractIntegrationTest {
 
 
     protected static final TestObject<MarkType> MARK_PROTECTED_SHADOW = TestObject.classPath(
-            "initial-objects/mark", "750-mark-protected-shadow.xml",
-            SystemObjectsType.MARK_PROTECTED_SHADOW.value());
+            "initial-objects/mark", "800-mark-protected-shadow.xml",
+            SystemObjectsType.MARK_PROTECTED.value());
 
     private static final File TEST_DIR = new File("src/test/resources/synchronization/");
 

diff --git a/...o-common/src/main/java/com/evolveum/midpoint/repo/common/ObjectOperationPolicyHelper.java b/...o-common/src/main/java/com/evolveum/midpoint/repo/common/ObjectOperationPolicyHelper.java
@@ -57,7 +57,7 @@ protected abstract ObjectOperationPolicyType computeEffectivePolicy(
 
     }
 
-    private static final String MARK_PROTECTED_SHADOW_OID = SystemObjectsType.MARK_PROTECTED_SHADOW.value();
+    private static final String MARK_PROTECTED_SHADOW_OID = SystemObjectsType.MARK_PROTECTED.value();
 
     private static ObjectOperationPolicyHelper instance = null;
 

diff --git a/...bjects/mark/750-mark-protected-shadow.xml → ...bjects/mark/800-mark-protected-shadow.xml b/...bjects/mark/750-mark-protected-shadow.xml → ...bjects/mark/800-mark-protected-shadow.xml
@@ -6,7 +6,7 @@
   -->
 
 <mark xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-    oid="00000000-0000-0000-0000-000000000750">
+    oid="00000000-0000-0000-0000-000000000800">
     <name>Protected</name>
     <assignment>
         <targetRef oid="00000000-0000-0000-0000-000000000701" type="ArchetypeType"/>

diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
@@ -19,6 +19,7 @@
 import org.springframework.test.context.ContextConfiguration;
 
 import com.evolveum.midpoint.model.test.AbstractModelIntegrationTest;
+import com.evolveum.midpoint.model.test.CommonInitialObjects;
 import com.evolveum.midpoint.prism.PrismConstants;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.PrismReference;
@@ -103,6 +104,11 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
 
         repoAdd(ARCHETYPE_CORRELATION_CASE, initResult);
 
+        if (areMarksSupported()) {
+            repoAdd(CommonInitialObjects.ARCHETYPE_OBJECT_MARK, initResult);
+            repoAdd(CommonInitialObjects.MARK_PROTECTED_SHADOW, initResult);
+        }
+
         // User administrator
         userAdministrator = repoAddObjectFromFile(USER_ADMINISTRATOR_FILE, initResult);
         repoAddObjectFromFile(USER_JACK_FILE, true, initResult);