verify in ninja updated, new validation types available

Evolveum · Apr 15, 2024 · f0c2e22 · f0c2e22
1 parent f0632cf
commit f0c2e22
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 32 deletions.
diff --git a/...a/schema/src/main/java/com/evolveum/midpoint/schema/validator/ObjectUpgradeValidator.java b/...a/schema/src/main/java/com/evolveum/midpoint/schema/validator/ObjectUpgradeValidator.java
@@ -17,6 +17,10 @@ public ObjectUpgradeValidator(@NotNull PrismContext prismContext) {
         this.validator = new ObjectValidator();
     }
 
+    public void setTypeToCheck(@NotNull ValidationItemType item, boolean check) {
+        this.validator.setTypeToCheck(item, check);
+    }
+
     public void setWarnDeprecated(boolean value) {
         this.validator.setWarnDeprecated(value);
     }

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/validator/ObjectValidator.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/validator/ObjectValidator.java
@@ -91,8 +91,7 @@ public void setWarnRemoved(boolean warnRemoved) {
         setTypeToCheck(ValidationItemType.REMOVED_ITEM, warnRemoved);
     }
 
-    @Deprecated
-    private void setTypeToCheck(ValidationItemType type, boolean set) {
+    public void setTypeToCheck(@NotNull ValidationItemType type, boolean set) {
         if (set) {
             typesToCheck.add(type);
         } else {

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/validator/UpgradeProcessor.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/validator/UpgradeProcessor.java
@@ -55,10 +55,12 @@ private <T extends ObjectType> UpgradeValidationItem process(PrismObject<T> obje
         PrismObject<T> cloned = object.clone();
 
         UpgradeObjectProcessor<?> processor = null;
-        for (UpgradeObjectProcessor<?> p : PROCESSORS) {
-            if (p.isApplicable(cloned, path)) {
-                processor = p;
-                break;
+        if (path != null && !path.isEmpty()) {
+            for (UpgradeObjectProcessor<?> p : PROCESSORS) {
+                if (p.isApplicable(cloned, path)) {
+                    processor = p;
+                    break;
+                }
             }
         }
 

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/VerifyOptions.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/VerifyOptions.java
@@ -12,12 +12,10 @@
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-
-import com.evolveum.midpoint.schema.validator.ValidationItemType;
-
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.ninja.util.EnumConverterValidator;
+import com.evolveum.midpoint.schema.validator.ValidationItemType;
 
 /**
  * // todo fix these options, extending Export options is messing up help messages (it's using export.* keys)
@@ -42,13 +40,27 @@ public ReportStyleConverter() {
 
     public enum VerificationCategory {
 
-        DEPRECATED,
+        DEPRECATED(ValidationItemType.DEPRECATED_ITEM),
+
+        REMOVED(ValidationItemType.REMOVED_ITEM),
+
+        PLANNED_REMOVAL(ValidationItemType.PLANNED_REMOVAL_ITEM),
 
-        REMOVED,
+        INCORRECT_OIDS(ValidationItemType.INCORRECT_OID_FORMAT),
 
-        PLANNED_REMOVAL,
+        MULTI_VALUE_REF_WITHOUT_OID(ValidationItemType.MULTIVALUE_REF_WITHOUT_OID),
 
-        INCORRECT_OIDS
+        MISSING_NATURAL_KEY(ValidationItemType.MISSING_NATURAL_KEY),
+
+        MULTIVALUE_BYTE_ARRAY(ValidationItemType.MULTIVALUE_BYTE_ARRAY),
+
+        PROTECTED_DATA_NOT_EXTERNAL(ValidationItemType.PROTECTED_DATA_NOT_EXTERNAL);
+
+        public final ValidationItemType validationItemType;
+
+        VerificationCategory(ValidationItemType validationItemType) {
+            this.validationItemType = validationItemType;
+        }
     }
 
     public static class VerificationCategoryConverter extends EnumConverterValidator<VerificationCategory> {
@@ -65,6 +77,7 @@ public VerificationCategoryConverter() {
     public static final String P_STOP_ON_CRITICAL_ERROR = "--stop-on-critical-error";
 
     public static final String P_FILE = "--file";
+
     public static final String P_PLANNED_REMOVAL_VERSION = "--planned-removal-version";
 
     @Parameter(names = { P_VERIFICATION_CATEGORY_LONG }, descriptionKey = "verify.verificationCategory",

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
@@ -109,24 +109,7 @@ public void init() {
         if (categories.isEmpty()) {
             validator.showAllWarnings();
         } else {
-            for (VerifyOptions.VerificationCategory category : categories) {
-                switch (category) {
-                    case DEPRECATED:
-                        validator.setWarnDeprecated(true);
-                        break;
-                    case INCORRECT_OIDS:
-                        validator.setWarnIncorrectOids(true);
-                        break;
-                    case PLANNED_REMOVAL:
-                        validator.setWarnPlannedRemoval(true);
-                        break;
-                    case REMOVED:
-                        validator.setWarnRemoved(true);
-                        break;
-                    default:
-                        throw new IllegalArgumentException("Unknown category " + category);
-                }
-            }
+            categories.forEach(c -> validator.setTypeToCheck(c.validationItemType, true));
         }
     }
 
@@ -327,6 +310,10 @@ private void writeValidationItem(Writer writer, PrismObject<?> object, UpgradeVa
             writer.append("INFO ");
         }
 
+        if (item.getItem().type() != null) {
+            items.add(item.getItem().type());
+        }
+
         UpgradePriority priority = item.getPriority();
         if (priority != null) {
             items.add(priority);

diff --git a/tools/ninja/src/main/resources/messages.properties b/tools/ninja/src/main/resources/messages.properties
@@ -89,7 +89,8 @@ Without NFKD processing the whole character will be removed.
 base.psn.trimWhitespace=PolyString normalizer trim whitespace
 base.psn.lowercase=PolyString normalizer lowercase
 verify.reportStyle=Report format. Allowed values CSV, PLAIN.
-verify.verificationCategory=Verification category. Allowed values DEPRECATED, REMOVED, PLANNED_REMOVAL, INCORRECT_OIDS.
+verify.verificationCategory=Verification category. Allowed values DEPRECATED, REMOVED, PLANNED_REMOVAL, INCORRECT_OIDS, \
+  MULTI_VALUE_REF_WITHOUT_OID, MISSING_NATURAL_KEY, MULTIVALUE_BYTE_ARRAY, PROTECTED_DATA_NOT_EXTERNAL.
 upgradeDistribution=Upgrade midPoint distribution and related DB schema
 upgradeDistribution.tempDir=Temp directory. By default, JVM temp directory is used.
 upgradeDistribution.distributionArchive=Distribution archive file. This can be used to skip downloading archive.