MID-8842 ninja - bugfixing in ninja (xml delta report was producing w…

…rong elements)
Evolveum · Sep 7, 2023 · fe8c9f6 · fe8c9f6
1 parent c636b05
commit fe8c9f6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/ninja/action/upgrade/action/UpgradeDistributionAction.java b/...ain/java/com/evolveum/midpoint/ninja/action/upgrade/action/UpgradeDistributionAction.java
@@ -17,7 +17,6 @@ public String getOperationName() {
     @Override
     public ActionResult<Void> execute() throws Exception {
         File tempDirectory = createTmpDirectory(options.getTempDirectory());
-        // todo: Should we log pre-upgrade checks
 
         // pre-upgrade checks
         if (!options.isSkipPreCheck()) {

diff --git a/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/verify/VerificationReporter.java b/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/verify/VerificationReporter.java
@@ -16,15 +16,15 @@
 import com.evolveum.midpoint.ninja.action.VerifyResult;
 import com.evolveum.midpoint.ninja.impl.Log;
 import com.evolveum.midpoint.ninja.impl.NinjaException;
+import com.evolveum.midpoint.ninja.util.NinjaUtils;
 import com.evolveum.midpoint.prism.Objectable;
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.delta.ObjectDelta;
-import com.evolveum.midpoint.schema.DeltaConversionOptions;
 import com.evolveum.midpoint.schema.DeltaConvertor;
 import com.evolveum.midpoint.schema.validator.*;
 import com.evolveum.midpoint.util.LocalizableMessage;
 import com.evolveum.midpoint.util.exception.SchemaException;
+import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
 
 public class VerificationReporter {
 
@@ -86,7 +86,7 @@ public void setCreateDeltaFile(boolean createDeltaFile) {
     public void destroy() {
         if (deltaWriter != null) {
             try {
-                deltaWriter.write("</deltas>\n");
+                deltaWriter.write(NinjaUtils.XML_DELTAS_SUFFIX);
             } catch (IOException ex) {
                 throw new NinjaException("Couldn't finish file for XML deltas", ex);
             }
@@ -149,11 +149,7 @@ private void initDeltaXmlFile() {
             deltaFile.createNewFile();
 
             deltaWriter = new FileWriter(deltaFile, charset);
-            deltaWriter.write(
-                    "<deltas "
-                            + "xmlns=\"http://midpoint.evolveum.com/xml/ns/public/common/api-types-3\" "
-                            + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
-                            + "xsi:type=\"ObjectDeltaListType\">\n");
+            deltaWriter.write(NinjaUtils.XML_DELTAS_PREFIX);
         } catch (IOException ex) {
             throw new NinjaException("Couldn't create file for XML deltas " + deltaFile.getPath(), ex);
         }
@@ -228,8 +224,10 @@ private void writeDeltaXml(UpgradeValidationResult result) {
 
             if (deltaWriter != null) {
                 try {
-                    deltaWriter.write(DeltaConvertor.serializeDelta(
-                            (ObjectDelta) item.getDelta(), DeltaConversionOptions.createSerializeReferenceNames(), "xml"));
+                    ObjectDeltaType deltaType = DeltaConvertor.toObjectDeltaType(item.getDelta());
+                    String xml = prismContext.xmlSerializer()
+                            .serializeRealValue(deltaType, NinjaUtils.DELTA_LIST_DELTA);
+                    deltaWriter.write(xml);
                 } catch (SchemaException | IOException ex) {
                     log.error("Couldn't write object delta to XML file", ex);
                 }

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
@@ -37,6 +37,8 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
+import javax.xml.namespace.QName;
+
 /**
  * Created by Viliam Repan (lazyman).
  */
@@ -49,7 +51,16 @@ public class NinjaUtils {
             "\txmlns:c=\"http://midpoint.evolveum.com/xml/ns/public/common/common-3\"\n" +
             "\txmlns:org=\"http://midpoint.evolveum.com/xml/ns/public/common/org-3\">\n";
 
-    public static final String XML_OBJECTS_SUFFIX = "</c:objects>";
+    public static final String XML_OBJECTS_SUFFIX = "</c:objects>\n";
+
+    public static final String XML_DELTAS_PREFIX = "<deltas "
+            + "xmlns=\"http://midpoint.evolveum.com/xml/ns/public/common/api-types-3\" "
+            + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
+            + "xsi:type=\"ObjectDeltaListType\">\n";
+
+    public static final String XML_DELTAS_SUFFIX = "</deltas>\n";
+
+    public static final QName DELTA_LIST_DELTA = new QName("http://midpoint.evolveum.com/xml/ns/public/common/api-types-3", "delta");
 
     public static final String JSON_OBJECTS_PREFIX = "[\n";