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

Evolveum · Mar 23, 2016 · e23505d · e23505d
2 parents 8614427 + e18c84e
commit e23505d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/...-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java b/...-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
@@ -204,7 +204,7 @@ private <F extends FocusType> void processInboundExpressionsForProjection(LensCo
             PropertyDelta<?> accountAttributeDelta = null;
             if (aPrioriDelta != null) {
                 accountAttributeDelta = aPrioriDelta.findPropertyDelta(new ItemPath(SchemaConstants.C_ATTRIBUTES), accountAttributeName);
-                if (accountAttributeDelta == null && !projContext.isFullShadow()) {
+                if (accountAttributeDelta == null && !projContext.isFullShadow() && !LensUtil.hasDependentContext(context, projContext)) {
 					LOGGER.trace("Skipping inbound for {} in {}: Not a full shadow and account a priori delta exists, but doesn't have change for processed property.",
 							accountAttributeName, projContext.getResourceShadowDiscriminator());
 					continue;

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
@@ -529,8 +529,8 @@ public void test230ScroogeAddAccountDummyConflictingNoShadow() throws Exception
 		dummyResourcePink.addAccount(account);
 
 		PrismObject<UserType> userScrooge = createUser("scrooge", "Scrooge McDuck", true);
-		ShadowType newPinkyShadow = createShadow(resourceDummyPinkType.asPrismObject(), null, null).asObjectable();
-		userScrooge.asObjectable().getLink().add(newPinkyShadow);
+		PrismObject<ShadowType> newPinkyShadow = createShadow(resourceDummyPinkType.asPrismObject(), null, null);
+		userScrooge.asObjectable().getLink().add(newPinkyShadow.asObjectable());
 
 		Collection<ObjectDelta<? extends ObjectType>> deltas = new ArrayList<ObjectDelta<? extends ObjectType>>();
 		deltas.add(ObjectDelta.createAddDelta(userScrooge));
@@ -577,8 +577,8 @@ public void test235HackerAddAccountDummyEternalConflict() throws Exception {
 		dummyAuditService.clear();
 
 		PrismObject<UserType> userJoeHacker = createUser("hacker", "Joe Hacker", true);
-		ShadowType newPinkyShadow = createShadow(resourceDummyPinkType.asPrismObject(), null, null).asObjectable();
-		userJoeHacker.asObjectable().getLink().add(newPinkyShadow);
+		PrismObject<ShadowType> newPinkyShadow = createShadow(resourceDummyPinkType.asPrismObject(), null, null);
+		userJoeHacker.asObjectable().getLink().add(newPinkyShadow.asObjectable());
 
 		Collection<ObjectDelta<? extends ObjectType>> deltas = new ArrayList<ObjectDelta<? extends ObjectType>>();
 		deltas.add(ObjectDelta.createAddDelta(userJoeHacker));

diff --git a/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java b/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
@@ -638,13 +638,17 @@ private <T extends ObjectType> PrismObject<T> completeObject(Class<T> type, Pris
 				PrismObject<ResourceType> completeResource = resourceManager.getResource((PrismObject<ResourceType>) inObject, 
 						SelectorOptions.findRootOptions(options), result);
 				return (PrismObject<T>) completeResource;
-		} else {
+		} else if (ShadowType.class.equals(type)) {
 			//TODO: applyDefinition??? 
 			applyDefinition(inObject, result);
 			setProtectedShadow((PrismObject<ShadowType>) inObject, result);
 			return inObject;
 
+		} else {
+			//TODO: connectors etc..
+
 		}
+		return inObject;
 
 	}
 

diff --git a/testing/story/src/test/resources/science/resource-dummy-unix.xml b/testing/story/src/test/resources/science/resource-dummy-unix.xml
@@ -121,13 +121,13 @@
                   <modify>false</modify>
                </access>
             </limitations>
-            <outbound>
-               <strength>weak</strength>
-               <source>
-                  <c:path xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-                          xmlns:ext="http://midpoint.evolveum.com/xml/ns/science/user/ext">extension/ext:aixUserId</c:path>
-               </source>
-            </outbound>
+<!--             <outbound> -->
+<!--                <strength>weak</strength> -->
+<!--                <source> -->
+<!--                   <c:path xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" -->
+<!--                           xmlns:ext="http://midpoint.evolveum.com/xml/ns/science/user/ext">extension/ext:aixUserId</c:path> -->
+<!--                </source> -->
+<!--             </outbound> -->
             <inbound>
             <strength>strong</strength>
                <target>
@@ -148,7 +148,7 @@
          </attribute>
          <dependency>
             <resourceRef oid="10000000-0000-0000-0000-0000000001ad"/>
-            <strictness>strict</strictness>
+            <strictness>relaxed</strictness>
          </dependency>
 
          <activation>