adding of both names of resources to error message for resource depen…

…dency error (MID-5417)
Evolveum · Mar 25, 2020 · 90e7c0e · 90e7c0e
1 parent aa0e1e8
commit 90e7c0e
Showing 1 changed file with 36 additions and 7 deletions.
diff --git a/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java b/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
@@ -11,11 +11,18 @@
 import java.util.Iterator;
 import java.util.List;
 
+import com.evolveum.midpoint.schema.GetOperationOptions;
+import com.evolveum.midpoint.schema.PointInTimeType;
+import com.evolveum.midpoint.schema.SelectorOptions;
+import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.task.api.TaskManager;
+import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.ChangeTypeType;
 import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.model.api.context.SynchronizationPolicyDecision;
@@ -30,7 +37,6 @@
 import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
 import com.evolveum.midpoint.schema.util.ResourceTypeUtil;
 import com.evolveum.midpoint.util.PrettyPrinter;
-import com.evolveum.midpoint.util.exception.PolicyViolationException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 
@@ -45,6 +51,8 @@ public class DependencyProcessor {
 
     @Autowired
     private ProvisioningService provisioningService;
+    @Autowired
+    private TaskManager taskManager;
 
     public <F extends ObjectType> void resetWaves(LensContext<F> context) throws PolicyViolationException {
     }
@@ -134,26 +142,32 @@ private <F extends ObjectType> LensProjectionContext determineProjectionWaveProv
             LensProjectionContext dependencyProjectionContext = findDependencyTargetContext(context, projectionContext, outDependency);
             if (dependencyProjectionContext == null || dependencyProjectionContext.isDelete()) {
                 ResourceObjectTypeDependencyStrictnessType outDependencyStrictness = ResourceTypeUtil.getDependencyStrictness(outDependency);
+                String nameRefResource = getResourceNameFromRef(refDiscr);
+                String refResourceMessage = "";
+                if (nameRefResource != null) {
+                    refResourceMessage = " resource "+nameRefResource+"(oid:"+refDiscr.getResourceOid()+") ";
+                }
+                String projectionResourceMessage = " resource "+projectionContext.getResourceName()+"(oid:"+projectionContext.getResourceOid()+")";
                 if (outDependencyStrictness == ResourceObjectTypeDependencyStrictnessType.STRICT) {
                     if (LOGGER.isTraceEnabled()) {
                         LOGGER.trace("  processing dependency: {}: unsatisfied strict dependency", PrettyPrinter.prettyPrint(outDependency));
                     }
-                    throw new PolicyViolationException("Unsatisfied strict dependency in resource "+projectionContext.getResourceName()+"(oid:" + projectionContext.getResourceOid()+
-                            ") of account "+projectionContext.getResourceShadowDiscriminator()+" dependent on "+refDiscr+": Account not provisioned");
+                    throw new PolicyViolationException("Unsatisfied strict dependency of account ["+projectionContext.getResourceShadowDiscriminator()+projectionResourceMessage+
+                            "] dependent on ["+refDiscr+refResourceMessage+"]: Account not provisioned");
                 } else if (outDependencyStrictness == ResourceObjectTypeDependencyStrictnessType.LAX) {
                     if (LOGGER.isTraceEnabled()) {
                         LOGGER.trace("  processing dependency: {}: unsatisfied lax dependency", PrettyPrinter.prettyPrint(outDependency));
                     }
                     // independent object not in the context, just ignore it
-                    LOGGER.debug("Unsatisfied lax dependency in resource "+projectionContext.getResourceName()+"(oid:" + projectionContext.getResourceOid()+
-                            ") of account "+projectionContext.getResourceShadowDiscriminator()+" dependent on "+refDiscr+"; dependency skipped");
+                    LOGGER.debug("Unsatisfied lax dependency of account ["+projectionContext.getResourceShadowDiscriminator()+projectionResourceMessage+
+                            "] dependent on ["+refDiscr+refResourceMessage+"]: dependency skipped");
                 } else if (outDependencyStrictness == ResourceObjectTypeDependencyStrictnessType.RELAXED) {
                     if (LOGGER.isTraceEnabled()) {
                         LOGGER.trace("  processing dependency: {}: unsatisfied relaxed dependency", PrettyPrinter.prettyPrint(outDependency));
                     }
                     // independent object not in the context, just ignore it
-                    LOGGER.debug("Unsatisfied relaxed dependency in resource "+projectionContext.getResourceName()+"(oid:" + projectionContext.getResourceOid()+
-                            ") of account "+projectionContext.getResourceShadowDiscriminator()+" dependent on "+refDiscr+"; dependency skipped");
+                    LOGGER.debug("Unsatisfied relaxed dependency of account ["+projectionContext.getResourceShadowDiscriminator()+projectionResourceMessage+
+                            "] dependent on ["+refDiscr+refResourceMessage+"]: dependency skipped");
                 } else {
                     throw new IllegalArgumentException("Unknown dependency strictness "+outDependency.getStrictness()+" in "+refDiscr);
                 }
@@ -192,6 +206,21 @@ private <F extends ObjectType> LensProjectionContext determineProjectionWaveProv
         return resultAccountContext;
     }
 
+    private String getResourceNameFromRef(ResourceShadowDiscriminator refDiscr) {
+        String name = null;
+        try {
+            Task task = taskManager.createTaskInstance("Load resource");
+            GetOperationOptions rootOpts = GetOperationOptions.createNoFetch();
+            Collection<SelectorOptions<GetOperationOptions>> options = SelectorOptions.createCollection(rootOpts);
+            PrismObject<ResourceType> resource = provisioningService.getObject(ResourceType.class, refDiscr.getResourceOid(), options, task, task.getResult());
+            name = resource.getName().getOrig();
+        } catch (Exception e) {
+            //ignoring exception and return null
+            return null;
+        }
+        return name;
+    }
+
     private <F extends ObjectType> LensProjectionContext determineProjectionWaveDeprovision(LensContext<F> context,
                 LensProjectionContext projectionContext, ResourceObjectTypeDependencyType inDependency, List<ResourceObjectTypeDependencyType> depPath) throws PolicyViolationException {
         if (depPath == null) {