Fixing problem with objectPolicy matching, which also should fix MID-…

…2236
Evolveum · Mar 2, 2015 · 0689dd4 · 0689dd4
1 parent d4f1ced
commit 0689dd4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
@@ -172,7 +172,7 @@ public static ObjectTypes getObjectTypeFromTypeQName(QName typeQName) {
         // END OF UGLY HACK
 
         for (ObjectTypes type : values()) {
-            if (type.getTypeQName().equals(typeQName)) {
+            if (QNameUtil.match(type.getTypeQName(), typeQName)) {
                 return type;
             }
         }

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
@@ -252,6 +252,10 @@ public ObjectTemplateType getFocusTemplate() {
 		return focusTemplate;
 	}
 
+	public void setFocusTemplate(ObjectTemplateType focusTemplate) {
+		this.focusTemplate = focusTemplate;
+	}
+
 	public LensProjectionContext findProjectionContext(ResourceShadowDiscriminator rat, String oid) {
 		LensProjectionContext projectionContext = findProjectionContext(rat);
 
@@ -271,10 +275,6 @@ public void setSystemConfiguration(
 		this.systemConfiguration = systemConfiguration;
 	}
 
-	public void setFocusTemplate(ObjectTemplateType focusTemplate) {
-		this.focusTemplate = focusTemplate;
-	}
-
 	public ProjectionPolicyType getAccountSynchronizationSettings() {
 		return accountSynchronizationSettings;
 	}

diff --git a/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java b/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
@@ -404,12 +404,12 @@ private <F extends ObjectType> PrismObject<ObjectTemplateType> determineFocusTem
 		}
 		ObjectPolicyConfigurationType policyConfigurationType = focusContext.getObjectPolicyConfigurationType();
 		if (policyConfigurationType == null) {
-			LOGGER.trace("No default object template");
+			LOGGER.trace("No default object template (no policy)");
 			return null;
 		}
 		ObjectReferenceType templateRef = policyConfigurationType.getObjectTemplateRef();
 		if (templateRef == null) {
-			LOGGER.trace("No default object template");
+			LOGGER.trace("No default object template (no templateRef)");
 			return null;
 		}
 

diff --git a/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
@@ -94,6 +94,7 @@
 import com.evolveum.midpoint.test.util.TestUtil;
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.MiscUtil;
+import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.CommunicationException;
 import com.evolveum.midpoint.util.exception.ConfigurationException;
 import com.evolveum.midpoint.util.exception.ExpressionEvaluationException;
@@ -1539,7 +1540,7 @@ protected void setDefaultObjectTemplate(QName objectType, String userTemplateOid
 
 		PrismContainerValue<ObjectPolicyConfigurationType> oldValue = null;
 		for (ObjectPolicyConfigurationType focusPolicyType: systemConfig.asObjectable().getDefaultObjectPolicyConfiguration()) {
-			if (objectType.equals(focusPolicyType.getType())) {
+			if (QNameUtil.match(objectType, focusPolicyType.getType())) {
 				oldValue = focusPolicyType.asPrismContainerValue();
 			}
 		}

diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
@@ -1,6 +1,6 @@
 package com.evolveum.midpoint.testing.story;
 /*
- * Copyright (c) 2014 Evolveum
+ * Copyright (c) 2014-2015 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -335,6 +335,10 @@ public void test000Sanity() throws Exception {
         OperationResult testResultOpenDj = modelService.testResource(RESOURCE_OPENDJ_OID, task);
         TestUtil.assertSuccess(testResultOpenDj);
 
+        SystemConfigurationType systemConfiguration = getSystemConfiguration();
+        assertNotNull("No system configuration", systemConfiguration);
+        display("System config", systemConfiguration);
+
         waitForTaskStart(TASK_TRIGGER_SCANNER_OID, true);
         waitForTaskStart(TASK_VALIDITY_SCANNER_OID, true);
         waitForTaskStart(TASK_LIVE_SYNC_DUMMY_SOURCE_OID, false);