MID-7669: During import of audit enable support for missing legacy types

Evolveum · Mar 9, 2022 · 1a6349b · 1a6349b
1 parent b4e7e28
commit 1a6349b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/validator/LegacyValidator.java b/infra/common/src/main/java/com/evolveum/midpoint/common/validator/LegacyValidator.java
@@ -76,6 +76,7 @@ public class LegacyValidator<T extends Containerable> {
     private long errors = 0;
     private long stopAfterErrors = 0;
     private boolean compatMode = false;
+    private boolean convertMissingType = false;
 
     public LegacyValidator(PrismContext prismContext) {
         this.prismContext = prismContext;
@@ -383,6 +384,9 @@ private EventResult validateObjectInternal(Element objectElement, OperationResul
             if (compatMode) {
                 parser = parser.compat();
             }
+            if (convertMissingType) {
+                parser = parser.convertMissingTypes();
+            }
             T containerable = parser.parseRealValue();
 
             objectResult.addContext(OperationResult.CONTEXT_OBJECT, containerable.toString());
@@ -533,4 +537,12 @@ private void error(String message, Objectable object, String propertyName, Opera
         subResult.addContext(OperationResult.CONTEXT_ITEM, propertyName);
         subResult.recordFatalError("<" + propertyName + ">: " + message);
     }
+
+    public boolean isConvertMissingType() {
+        return convertMissingType;
+    }
+
+    public void setConvertMissingType(boolean convertMissingType) {
+        this.convertMissingType = convertMissingType;
+    }
 }
diff --git a/...a/src/main/java/com/evolveum/midpoint/ninja/action/audit/ImportAuditRepositoryAction.java b/...a/src/main/java/com/evolveum/midpoint/ninja/action/audit/ImportAuditRepositoryAction.java
@@ -76,7 +76,9 @@ public LogTarget getInfoLogTarget() {
     private ImportProducerWorker<AuditEventRecordType> importByFilter(
             ObjectFilter filter, boolean stopAfterFound,
             BlockingQueue<AuditEventRecordType> queue, OperationStatus status) {
-        return new ImportProducerWorker<>(context, options, queue, status, filter, stopAfterFound, false);
+        ImportProducerWorker ret = new ImportProducerWorker<>(context, options, queue, status, filter, stopAfterFound, false);
+        ret.setConvertMissingType(true);
+        return ret;
     }
 
     private List<ImportAuditConsumerWorker> createConsumers(

diff --git a/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java b/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java
@@ -45,6 +45,7 @@ public class ImportProducerWorker<T extends Containerable>
     private boolean continueOnInputError;
 
     private String currentOid = null;
+    private boolean convertMissingType = false;
 
     public ImportProducerWorker(
             NinjaContext context, BasicImportOptions options, BlockingQueue<T> queue,
@@ -180,6 +181,7 @@ public void handleGlobalError(OperationResult currentResult, Exception cause) {
         // FIXME: MID-5151: If validateSchema is false we are not validating unknown attributes on import
         LegacyValidator<?> validator = new LegacyValidator<>(prismContext, handler);
         validator.setValidateSchema(false);
+        validator.setConvertMissingType(isConvertMissingType());
         OperationResult result = operation.getResult();
 
         Charset charset = context.getCharset();
@@ -208,4 +210,12 @@ private String getErrorMessage() {
             return "Couldn't import object";
         }
     }
+
+    public boolean isConvertMissingType() {
+        return convertMissingType;
+    }
+
+    public void setConvertMissingType(boolean convertMissingType) {
+        this.convertMissingType = convertMissingType;
+    }
 }