MID-8842 ninja - misc fixes around distribution upgrade objects

Evolveum · Jul 31, 2023 · 540a86e · 540a86e
1 parent 4a00595
commit 540a86e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.../java/com/evolveum/midpoint/schema/validator/processor/PersonaTargetSubtypeProcessor.java b/.../java/com/evolveum/midpoint/schema/validator/processor/PersonaTargetSubtypeProcessor.java
@@ -51,4 +51,9 @@ public boolean isApplicable(PrismObject<?> object, ItemPath path) {
     public boolean process(PrismObject<ObjectType> object, ItemPath path) {
         return false;
     }
+
+    @Override
+    public String upgradeDescription(PrismObject<ObjectType> object, ItemPath path) {
+        return "Matching of personas by subtype values is not supported anymore. Any such use should be migrated to the use of archetypes.";
+    }
 }
diff --git a/...rc/main/java/com/evolveum/midpoint/ninja/action/upgrade/UpgradeObjectsConsumerWorker.java b/...rc/main/java/com/evolveum/midpoint/ninja/action/upgrade/UpgradeObjectsConsumerWorker.java
@@ -80,7 +80,7 @@ private void processObject(RepositoryService repository, T object) throws Except
 
         OperationResult opResult = new OperationResult("Modify object");
         try {
-            ObjectDelta<?> delta = cloned.diff(prismObject);
+            ObjectDelta<?> delta = prismObject.diff(cloned);
             Collection<? extends ItemDelta<?, ?>> modifications = delta.getModifications();
             RepoModifyOptions opts = modifications.isEmpty() ? RepoModifyOptions.createForceReindex() : new RepoModifyOptions();
 
@@ -90,9 +90,11 @@ private void processObject(RepositoryService repository, T object) throws Except
         } finally {
             opResult.computeStatusIfUnknown();
 
-            log.error(
-                    "Modification of '{} ({})' didn't finished with success\n{}",
-                    object.getName(), object.getOid(), opResult.shortDump());
+            if (!opResult.isSuccess()) {
+                log.error(
+                        "Modification of '{} ({})' didn't finished with success\n{}",
+                        object.getName(), object.getOid(), opResult.debugDumpLazily());
+            }
         }
     }
 }