Fix SimulationResultProcessedObjectType parsing

1. Fixed null delta handling. 2. Temporarily disabled parsing of before/after full object state (until it's implemented in the repository).
Evolveum · Dec 20, 2022 · 18236e8 · 18236e8
1 parent 3a3331a
commit 18236e8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
@@ -34,6 +34,8 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectDeltaOperationType;
 import com.evolveum.prism.xml.ns._public.types_3.*;
 
+import org.jetbrains.annotations.Nullable;
+
 /**
  * Converts between "XML" (i.e. XML/JSON/YAML/bean) and "native" (ObjectDelta and company) form.
  *
@@ -85,6 +87,13 @@ public static <T extends Objectable> ObjectDelta<T> createObjectDelta(
         return createObjectDelta(deltaBean);
     }
 
+    @Contract("null -> null; !null -> !null")
+    public static <T extends Objectable> ObjectDelta<T> createObjectDeltaNullable(@Nullable ObjectDeltaType objectDeltaBean)
+            throws SchemaException {
+        return objectDeltaBean != null ?
+                createObjectDelta(objectDeltaBean) : null;
+    }
+
     /**
      * Object delta: XML -> native
      */

diff --git a/...l/model-api/src/main/java/com/evolveum/midpoint/model/api/simulation/ProcessedObject.java b/...l/model-api/src/main/java/com/evolveum/midpoint/model/api/simulation/ProcessedObject.java
@@ -80,7 +80,7 @@ private ProcessedObject(
         this.delta = delta;
     }
 
-    public static <O extends ObjectType>  ProcessedObject<O> parse(@NotNull SimulationResultProcessedObjectType bean)
+    public static <O extends ObjectType> ProcessedObject<O> parse(@NotNull SimulationResultProcessedObjectType bean)
             throws SchemaException {
         Class<?> type = PrismContext.get().getSchemaRegistry().determineClassForTypeRequired(bean.getType());
         argCheck(ObjectType.class.isAssignableFrom(type), "Type is not an ObjectType: %s", type);
@@ -91,9 +91,9 @@ public static <O extends ObjectType>  ProcessedObject<O> parse(@NotNull Simulati
                 bean.getName(),
                 MiscUtil.argNonNull(bean.getState(), () -> "No processing state in " + bean),
                 bean.getMetricIdentifier(),
-                (O) bean.getBefore(),
-                (O) bean.getAfter(),
-                DeltaConvertor.createObjectDelta(bean.getDelta()));
+                null, // (O) bean.getBefore(), // temporarily disabled
+                null, // (O) bean.getAfter(), // temporarily disabled
+                DeltaConvertor.createObjectDeltaNullable(bean.getDelta()));
     }
 
     public static <O extends ObjectType> ProcessedObject<?> create(