fixing TestRetirement

Evolveum · Apr 11, 2018 · 0c35283 · 0c35283
1 parent f4145af
commit 0c35283
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java b/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
@@ -106,20 +106,11 @@ public class ResourceObjectConverter {
 	private static final String OPERATION_REFRESH_OPERATION_STATUS = DOT_CLASS + "refreshOperationStatus";
 
 
-	@Autowired
-	private EntitlementConverter entitlementConverter;
-
-	@Autowired
-	private MatchingRuleRegistry matchingRuleRegistry;
-
-	@Autowired
-	private ResourceObjectReferenceResolver resourceObjectReferenceResolver;
-
-	@Autowired
-	private Clock clock;
-
-	@Autowired
-	private PrismContext prismContext;
+	@Autowired private EntitlementConverter entitlementConverter;
+	@Autowired private MatchingRuleRegistry matchingRuleRegistry;	
+	@Autowired private ResourceObjectReferenceResolver resourceObjectReferenceResolver;
+	@Autowired private Clock clock;
+	@Autowired private PrismContext prismContext;
 
 	private static final Trace LOGGER = TraceManager.getTrace(ResourceObjectConverter.class);
 

diff --git a/...rc/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java b/...rc/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
@@ -102,6 +102,7 @@ PrismObject<ShadowType> resolve(ProvisioningContext ctx, ResourceObjectReference
 			if (resourceObjectReference.getResolutionFrequency() == null
 					|| resourceObjectReference.getResolutionFrequency() == ResourceObjectReferenceResolutionFrequencyType.ONCE) {
 				PrismObject<ShadowType> shadow = repositoryService.getObject(ShadowType.class, shadowRef.getOid(), null, result);
+				shadowCache.applyDefinition(shadow, result);
 				return shadow;
 			}
 		} else if (resourceObjectReference.getResolutionFrequency() == ResourceObjectReferenceResolutionFrequencyType.NEVER) {
@@ -126,7 +127,7 @@ PrismObject<ShadowType> resolve(ProvisioningContext ctx, ResourceObjectReference
 		ObjectFilter filter = AndFilter.createAnd(baseFilter, evaluatedRefQuery.getFilter());
 		ObjectQuery query = ObjectQuery.createObjectQuery(filter);
 
-		// TODO: implement "repo" search strategies
+		// TODO: implement "repo" search strategies, don't forget to apply definitions
 
 		Collection<SelectorOptions<GetOperationOptions>> options = null;
 
@@ -165,6 +166,7 @@ Collection<? extends ResourceAttribute<?>> resolvePrimaryIdentifier(Provisioning
 		if (repoShadow == null) {
 			return null;
 		}
+		shadowCache.applyDefinition(repoShadow, result);
 		PrismContainer<Containerable> attributesContainer = repoShadow.findContainer(ShadowType.F_ATTRIBUTES);
 		if (attributesContainer == null) {
 			return null;