From 0c352838c3a738e8ca3d3be2efc27678a7d6bbf7 Mon Sep 17 00:00:00 2001 From: Katarina Valalikova Date: Wed, 11 Apr 2018 16:17:22 +0200 Subject: [PATCH] fixing TestRetirement --- .../impl/ResourceObjectConverter.java | 19 +++++-------------- .../impl/ResourceObjectReferenceResolver.java | 4 +++- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java index ec5ee1dd04e..d80f0ee638c 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java +++ b/provisioning/provisioning-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/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java index 09be671c2b1..683d2852e58 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java +++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java @@ -102,6 +102,7 @@ PrismObject resolve(ProvisioningContext ctx, ResourceObjectReference if (resourceObjectReference.getResolutionFrequency() == null || resourceObjectReference.getResolutionFrequency() == ResourceObjectReferenceResolutionFrequencyType.ONCE) { PrismObject 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 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> options = null; @@ -165,6 +166,7 @@ Collection> resolvePrimaryIdentifier(Provisioning if (repoShadow == null) { return null; } + shadowCache.applyDefinition(repoShadow, result); PrismContainer attributesContainer = repoShadow.findContainer(ShadowType.F_ATTRIBUTES); if (attributesContainer == null) { return null;