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

Evolveum · Feb 19, 2016 · 83533be · 83533be
2 parents 74fced8 + f0a0c9a
commit 83533be
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 9 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java b/...src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import com.evolveum.midpoint.model.impl.lens.LensProjectionContext;
 import com.evolveum.midpoint.model.impl.lens.LensUtil;
 import com.evolveum.midpoint.prism.ItemDefinition;
+import com.evolveum.midpoint.prism.PrismContainer;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
 import com.evolveum.midpoint.prism.PrismContainerValue;
 import com.evolveum.midpoint.prism.PrismContext;
@@ -293,15 +294,32 @@ public boolean isAuthoritative() {
         }
 
         // AUXILIARY OBJECT CLASSES
+        ItemPath auxiliaryObjectClassItemPath = new ItemPath(ShadowType.F_AUXILIARY_OBJECT_CLASS);
+        PrismPropertyDefinition<QName> auxiliaryObjectClassPropertyDef = projCtx.getObjectDefinition().findPropertyDefinition(auxiliaryObjectClassItemPath);
+        PropertyDelta<QName> auxiliaryObjectClassAPrioriDelta = null;
+        ObjectDelta<ShadowType> projDelta = projCtx.getDelta();
+        if (projDelta != null) {
+        	auxiliaryObjectClassAPrioriDelta = projDelta.findPropertyDelta(auxiliaryObjectClassItemPath);
+        }
         for (Entry<QName, DeltaSetTriple<ItemValueWithOrigin<PrismPropertyValue<QName>, PrismPropertyDefinition<QName>>>> entry : squeezedAuxiliaryObjectClasses.entrySet()) {
         	DeltaSetTriple<ItemValueWithOrigin<PrismPropertyValue<QName>, PrismPropertyDefinition<QName>>> ivwoTriple = entry.getValue();
-        	PropertyDelta<QName> propDelta = (PropertyDelta)new PropertyDelta<>(projCtx.getObjectDefinition().findPropertyDefinition(ShadowType.F_AUXILIARY_OBJECT_CLASS), prismContext);
-        	for (ItemValueWithOrigin<PrismPropertyValue<QName>,PrismPropertyDefinition<QName>> ivwo: ivwoTriple.getPlusSet()) {
-        		propDelta.addValueToAdd(ivwo.getItemValue());
+
+        	LOGGER.trace("CONSOLIDATE auxiliary object classes\n({})",
+            		new Object[]{ discr });
+        	if (LOGGER.isTraceEnabled()) {
+        		LOGGER.trace("Auxiliary object class triple:\n{}",ivwoTriple.debugDump());
         	}
-        	for (ItemValueWithOrigin<PrismPropertyValue<QName>,PrismPropertyDefinition<QName>> ivwo: ivwoTriple.getMinusSet()) {
-        		propDelta.addValueToDelete(ivwo.getItemValue());
+
+        	ItemDelta<PrismPropertyValue<QName>, PrismPropertyDefinition<QName>> itemDelta = LensUtil.consolidateTripleToDelta(
+        			auxiliaryObjectClassItemPath, ivwoTriple, auxiliaryObjectClassPropertyDef,
+        			auxiliaryObjectClassAPrioriDelta, projCtx.getObjectNew(), null, null, addUnchangedValues, completeAccount, false, 
+        			discr.toHumanReadableString(), false);
+        	PropertyDelta<QName> propDelta = (PropertyDelta)itemDelta;
+
+        	if (LOGGER.isTraceEnabled()) {
+        		LOGGER.trace("Auxiliary object class delta:\n{}",propDelta.debugDump());
         	}
+
         	if (!propDelta.isEmpty()) {
         		objectDelta.addModification(propDelta);
         	}

diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
@@ -992,7 +992,16 @@ public void test256UnAssignUserRangerSealsKeepRangers() throws Exception {
 
         PrismObject<ShadowType> shadow = getShadowModel(accountOid);
         display("Shadow (model)", shadow);
-        assertBasicAccount(shadow);
+        assertPosixAccount(shadow, USER_RANGER_UID_NUMBER);
+
+        // account should still be in the rangers group
+        Entry groupRangers = openDJController.fetchEntry(groupRangersDn);
+        openDJController.assertAttribute(groupRangers, "memberUid", Integer.toString(USER_RANGER_UID_NUMBER));
+
+        // account should not be in the group anymore. memberUid should be
+        // empty...
+        Entry groupSeals = openDJController.fetchEntry(groupSealsDn);
+        openDJController.assertNoAttribute(groupSeals, "memberUid");
 	}
 
 

diff --git a/testing/story/src/test/resources/logback-test.xml b/testing/story/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2016 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -46,7 +46,8 @@
 	<logger name="com.evolveum.midpoint.model.impl.lens.ChangeExecutor" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.model.impl.lens.ShadowConstraintsChecker" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.model.impl.lens.LensUtil" level="TRACE" />
-	<logger name="com.evolveum.midpoint.model.impl.lens.projector.ValueMatcher" level="TRACE" />
+	<logger name="com.evolveum.midpoint.model.impl.lens.projector.ValueMatcher" level="DEBUG" />
+	<logger name="com.evolveum.midpoint.model.impl.lens.projector.ConsolidationProcessor" level="TRACE" />
 	<logger name="com.evolveum.midpoint.model.impl.expr" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.model.impl.util" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.model.impl.sync" level="DEBUG" />