MID-8842 ninja - bugfixing distribution upgrade

(cherry picked from commit 47d74eb)
Evolveum · Jul 27, 2023 · 54a9e11 · 54a9e11
1 parent f92cd3c
commit 54a9e11
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/ninja/action/upgrade/action/PreUpgradeCheckAction.java b/...rc/main/java/com/evolveum/midpoint/ninja/action/upgrade/action/PreUpgradeCheckAction.java
@@ -54,20 +54,20 @@ private boolean checkDatabaseSchemaVersion(RepositoryService repository) {
 
         boolean result = validateChangeNumber(
                 diag.getAdditionalDetails(), SqaleUtils.SCHEMA_CHANGE_NUMBER,
-                SqaleUtils.SCHEMA_CHANGE_NUMBER);
+                SqaleUtils.CURRENT_SCHEMA_CHANGE_NUMBER);
         if (!result) {
             return false;
         }
 
         // todo this will not work if audit was not configured or is in different database!
         return validateChangeNumber(
                 diag.getAdditionalDetails(), SqaleUtils.SCHEMA_AUDIT_CHANGE_NUMBER,
-                SqaleUtils.SCHEMA_AUDIT_CHANGE_NUMBER);
+                SqaleUtils.CURRENT_SCHEMA_AUDIT_CHANGE_NUMBER);
     }
 
-    private boolean validateChangeNumber(List<LabeledString> list, String label, String expected) {
+    private boolean validateChangeNumber(List<LabeledString> list, String label, int expected) {
         String number = getValue(list, label);
-        boolean equals = Objects.equals(number, expected);
+        boolean equals = Objects.equals(number, Integer.toString(expected));
 
         if (!equals) {
             log.error(ConsoleFormat.formatError(
@@ -120,7 +120,7 @@ private boolean checkNodesVersion(RepositoryService repository) throws SchemaExc
         String version = versions.iterator().next();
         if (!Objects.equals(version, UpgradeConstants.SUPPORTED_VERSION)) {
             log.error(ConsoleFormat.formatErrorMessageWithParameter(
-                    "There are midPoint nodes with versions that doesn't match supported version for upgrade (" +
+                    "There are midPoint nodes with versions {} that doesn't match supported version for upgrade (" +
                             UpgradeConstants.SUPPORTED_VERSION + ")", Arrays.toString(versions.toArray())));
             return false;
         }

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
@@ -91,7 +91,7 @@ public void setCreateDeltaFile(boolean createDeltaFile) {
     }
 
     public void destroy() {
-        if (createDeltaFile) {
+        if (deltaWriter != null) {
             try {
                 deltaWriter.write("</deltas>\n");
             } catch (IOException ex) {
@@ -227,11 +227,13 @@ private void writeDeltaXml(UpgradeValidationResult result) {
                 continue;
             }
 
-            try {
-                deltaWriter.write(DeltaConvertor.serializeDelta(
-                        (ObjectDelta) item.getDelta(), DeltaConversionOptions.createSerializeReferenceNames(), "xml"));
-            } catch (SchemaException | IOException ex) {
-                log.error("Couldn't write object delta to XML file", ex);
+            if (deltaWriter != null) {
+                try {
+                    deltaWriter.write(DeltaConvertor.serializeDelta(
+                            (ObjectDelta) item.getDelta(), DeltaConversionOptions.createSerializeReferenceNames(), "xml"));
+                } catch (SchemaException | IOException ex) {
+                    log.error("Couldn't write object delta to XML file", ex);
+                }
             }
         }
     }