fixing protected shadows (protected flag should not be stored in repo)..

Evolveum · May 30, 2014 · 7d6c80a · 7d6c80a
1 parent 4832451
commit 7d6c80a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.../provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java b/.../provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
@@ -1556,7 +1556,7 @@ private PrismObject<ShadowType> completeShadow(ConnectorInstance connector, Pris
 			accessChecker.filterGetAttributes(resultAttibutes, objectClassDefinition, parentResult);
 			resultShadow.add(resultAttibutes);
 
-			resultShadowType.setProtectedObject(resourceShadowType.isProtectedObject());
+//			resultShadowType.setProtectedObject(resourceShadowType.isProtectedObject());
 			resultShadowType.setIgnored(resourceShadowType.isIgnored());
 
 			resultShadowType.setActivation(resourceShadowType.getActivation());
@@ -1566,6 +1566,10 @@ private PrismObject<ShadowType> completeShadow(ConnectorInstance connector, Pris
 			ShadowType resourceAccountShadow = resourceShadow.asObjectable();
 			resultAccountShadow.setCredentials(resourceAccountShadow.getCredentials());
 		}
+
+		//protected
+		resouceObjectConverter.setProtectedFlag(resource, objectClassDefinition, resultShadow);
+//		resultShadowType.setProtectedObject();
 
 		// Activation
 		ActivationType resultActivationType = resultShadowType.getActivation();

diff --git a/...rovisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java b/...rovisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
@@ -576,6 +576,7 @@ public PrismObject<ShadowType> createRepositoryShadow(PrismObject<ShadowType> sh
 		ShadowType repoShadowType = repoShadow.asObjectable();
 
         setKindIfNecessary(repoShadowType, objectClassDefinition);
+//        setIntentIfNecessary(repoShadowType, objectClassDefinition);
 
         // We don't want to store credentials in the repo
 		repoShadowType.setCredentials(null);
@@ -601,6 +602,10 @@ public PrismObject<ShadowType> createRepositoryShadow(PrismObject<ShadowType> sh
 			repoShadowType.setObjectClass(attributesContainer.getDefinition().getTypeName());
 		}
 
+		if (repoShadowType.isProtectedObject() != null){
+			repoShadowType.setProtectedObject(null);
+		}
+
 		normalizeAttributes(repoShadow, objectClassDefinition);
 
 		return repoShadow;
@@ -611,6 +616,12 @@ public void setKindIfNecessary(ShadowType repoShadowType, RefinedObjectClassDefi
             repoShadowType.setKind(objectClassDefinition.getKind());
         }
     }
+
+    public void setIntentIfNecessary(ShadowType repoShadowType, RefinedObjectClassDefinition objectClassDefinition) {
+        if (repoShadowType.getIntent() == null && objectClassDefinition.getIntent() != null) {
+            repoShadowType.setIntent(objectClassDefinition.getIntent());
+        }
+    }
 
     private void normalizeAttributes(PrismObject<ShadowType> shadow, RefinedObjectClassDefinition objectClassDefinition) throws SchemaException {
 		for (ResourceAttribute<?> attribute: ShadowUtil.getAttributes(shadow)) {