MID-7913: Audit Import should use compat mode

Because audit import may be importing old legacy data, compat parser mode should be enabled to preserve that data and do not fail on them.
Evolveum · May 2, 2022 · a17f354 · a17f354
1 parent e850457
commit a17f354
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
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
@@ -78,6 +78,7 @@ private ImportProducerWorker<AuditEventRecordType> importByFilter(
             BlockingQueue<AuditEventRecordType> queue, OperationStatus status) {
         ImportProducerWorker ret = new ImportProducerWorker<>(context, options, queue, status, filter, stopAfterFound, false);
         ret.setConvertMissingType(true);
+        ret.setCompatMode(true);
         return ret;
     }
 

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
@@ -46,6 +46,7 @@ public class ImportProducerWorker<T extends Containerable>
 
     private String currentOid = null;
     private boolean convertMissingType = false;
+    private boolean compatMode = false;
 
     public ImportProducerWorker(
             NinjaContext context, BasicImportOptions options, BlockingQueue<T> queue,
@@ -162,14 +163,12 @@ public void handleGlobalError(OperationResult currentResult, Exception cause) {
                 // Should we log error?
                 operation.incrementError();
                 String message = getErrorMessage();
-                if (continueOnInputError) {
-
-                    if (context.isVerbose()) {
-                        context.getLog().error(message, cause);
-                    } else {
-                        context.getLog().error(message + ", reason: {}", cause.getMessage());
-                    }
+                if (context.isVerbose()) {
+                    context.getLog().error(message, cause);
                 } else {
+                    context.getLog().error(message + ", reason: {}", cause.getMessage());
+                }
+                if (!continueOnInputError) {
                     // We need to throw runtime exception in order to stop validator, otherwise validator will continue
                     // fill queue and this may result in deadlock
                     operation.finish();
@@ -181,6 +180,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.setCompatMode(compatMode);
         validator.setConvertMissingType(isConvertMissingType());
         OperationResult result = operation.getResult();
 
@@ -218,4 +218,8 @@ public boolean isConvertMissingType() {
     public void setConvertMissingType(boolean convertMissingType) {
         this.convertMissingType = convertMissingType;
     }
+
+    public void setCompatMode(boolean mode) {
+        this.compatMode = mode;
+    }
 }