MID-8842 upgrade, optimized imports

Evolveum · Jun 20, 2023 · b3c177f · b3c177f
1 parent 0444c64
commit b3c177f
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 48 deletions.
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/Main.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/Main.java
@@ -20,15 +20,14 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.fusesource.jansi.AnsiConsole;
+import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.ninja.action.Action;
 import com.evolveum.midpoint.ninja.action.BaseOptions;
 import com.evolveum.midpoint.ninja.impl.Command;
 import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.util.NinjaUtils;
 
-import org.jetbrains.annotations.NotNull;
-
 public class Main {
 
     private PrintStream out = System.out;

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/BaseImportExportOptions.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/BaseImportExportOptions.java
@@ -6,15 +6,16 @@
  */
 package com.evolveum.midpoint.ninja.action;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import com.beust.jcommander.Parameter;
+
 import com.evolveum.midpoint.ninja.util.FileReference;
 import com.evolveum.midpoint.ninja.util.FileReferenceConverter;
 import com.evolveum.midpoint.ninja.util.ObjectTypesConverter;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * Created by Viliam Repan (lazyman).
  */

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/BaseOptions.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/BaseOptions.java
@@ -7,7 +7,6 @@
 
 package com.evolveum.midpoint.ninja.action;
 
-import java.io.File;
 import java.nio.charset.StandardCharsets;
 
 import com.beust.jcommander.Parameter;

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/CountOptions.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/CountOptions.java
@@ -7,16 +7,17 @@
 
 package com.evolveum.midpoint.ninja.action;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
+
 import com.evolveum.midpoint.ninja.util.FileReference;
 import com.evolveum.midpoint.ninja.util.FileReferenceConverter;
 import com.evolveum.midpoint.ninja.util.ObjectTypesConverter;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * Created by Viliam Repan (lazyman).
  */

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/DeleteOptions.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/DeleteOptions.java
@@ -8,9 +8,10 @@
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-import com.evolveum.midpoint.schema.constants.ObjectTypes;
+
 import com.evolveum.midpoint.ninja.util.FileReference;
 import com.evolveum.midpoint.ninja.util.FileReferenceConverter;
+import com.evolveum.midpoint.schema.constants.ObjectTypes;
 
 /**
  * Created by Viliam Repan (lazyman).

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
@@ -6,14 +6,14 @@
  */
 package com.evolveum.midpoint.ninja.action;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
 import com.evolveum.midpoint.ninja.util.EnumConverterValidator;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author semancik
  */

diff --git a/...a/src/main/java/com/evolveum/midpoint/ninja/action/mining/ExportMiningConsumerWorker.java b/...a/src/main/java/com/evolveum/midpoint/ninja/action/mining/ExportMiningConsumerWorker.java
@@ -14,8 +14,10 @@
 import java.io.Writer;
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
+import javax.xml.namespace.QName;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import com.evolveum.midpoint.common.RoleMiningExportUtils;
 import com.evolveum.midpoint.ninja.action.worker.AbstractWriterConsumerWorker;
@@ -34,10 +36,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
-import org.jetbrains.annotations.Nullable;
-
-import javax.xml.namespace.QName;
-
 public class ExportMiningConsumerWorker extends AbstractWriterConsumerWorker<ExportMiningOptions, FocusType> {
 
     OperationResult operationResult = new OperationResult(DOT_CLASS + "searchObjectByCondition");

diff --git a/...src/main/java/com/evolveum/midpoint/ninja/action/mining/ExportMiningRepositoryAction.java b/...src/main/java/com/evolveum/midpoint/ninja/action/mining/ExportMiningRepositoryAction.java
@@ -11,6 +11,8 @@
 import java.util.List;
 import java.util.concurrent.*;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.evolveum.midpoint.ninja.action.RepositoryAction;
 import com.evolveum.midpoint.ninja.action.worker.ProgressReporterWorker;
 import com.evolveum.midpoint.ninja.impl.LogTarget;
@@ -26,8 +28,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
-import org.jetbrains.annotations.NotNull;
-
 public class ExportMiningRepositoryAction extends RepositoryAction<ExportMiningOptions, Void> {
 
     private static final int QUEUE_CAPACITY_PER_THREAD = 100;

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/trace/EditTraceOptions.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/trace/EditTraceOptions.java
@@ -6,11 +6,11 @@
  */
 package com.evolveum.midpoint.ninja.action.trace;
 
+import java.util.List;
+
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
-import java.util.List;
-
 /**
  *
  */

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/trace/TraceStatistics.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/trace/TraceStatistics.java
@@ -7,17 +7,17 @@
 
 package com.evolveum.midpoint.ninja.action.trace;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.schema.util.OperationResultUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.exception.SystemException;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TracingOutputType;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 /**
  *
  */

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
@@ -7,8 +7,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import com.evolveum.midpoint.ninja.util.NinjaUtils;
-
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.QuoteMode;

diff --git a/...src/main/java/com/evolveum/midpoint/ninja/action/worker/AbstractWriterConsumerWorker.java b/...src/main/java/com/evolveum/midpoint/ninja/action/worker/AbstractWriterConsumerWorker.java
@@ -11,9 +11,9 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
+import com.evolveum.midpoint.ninja.action.BasicExportOptions;
 import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.impl.NinjaException;
-import com.evolveum.midpoint.ninja.action.BasicExportOptions;
 import com.evolveum.midpoint.ninja.util.Log;
 import com.evolveum.midpoint.ninja.util.NinjaUtils;
 import com.evolveum.midpoint.ninja.util.OperationStatus;

diff --git a/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ExportConsumerWorker.java b/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ExportConsumerWorker.java
@@ -10,8 +10,8 @@
 import java.io.Writer;
 import java.util.concurrent.BlockingQueue;
 
-import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.action.ExportOptions;
+import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.util.NinjaUtils;
 import com.evolveum.midpoint.ninja.util.OperationStatus;
 import com.evolveum.midpoint.prism.PrismSerializer;

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
@@ -21,9 +21,9 @@
 import com.evolveum.midpoint.common.validator.EventHandler;
 import com.evolveum.midpoint.common.validator.EventResult;
 import com.evolveum.midpoint.common.validator.LegacyValidator;
+import com.evolveum.midpoint.ninja.action.BasicImportOptions;
 import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.impl.NinjaException;
-import com.evolveum.midpoint.ninja.action.BasicImportOptions;
 import com.evolveum.midpoint.ninja.util.Log;
 import com.evolveum.midpoint.ninja.util.OperationStatus;
 import com.evolveum.midpoint.prism.Containerable;

diff --git a/...c/main/java/com/evolveum/midpoint/ninja/action/worker/ImportRepositoryConsumerWorker.java b/...c/main/java/com/evolveum/midpoint/ninja/action/worker/ImportRepositoryConsumerWorker.java
@@ -13,8 +13,8 @@
 import org.springframework.context.ApplicationContext;
 
 import com.evolveum.midpoint.common.crypto.CryptoUtil;
-import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.action.ImportOptions;
+import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.util.OperationStatus;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.crypto.Protector;

diff --git a/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/SearchProducerWorker.java b/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/SearchProducerWorker.java
@@ -9,9 +9,9 @@
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
 
+import com.evolveum.midpoint.ninja.action.ExportOptions;
 import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.impl.NinjaException;
-import com.evolveum.midpoint.ninja.action.ExportOptions;
 import com.evolveum.midpoint.ninja.util.Log;
 import com.evolveum.midpoint.ninja.util.NinjaUtils;
 import com.evolveum.midpoint.ninja.util.OperationStatus;

diff --git a/...a/src/main/java/com/evolveum/midpoint/ninja/util/BasicLightweightIdentifierGenerator.java b/...a/src/main/java/com/evolveum/midpoint/ninja/util/BasicLightweightIdentifierGenerator.java
@@ -6,11 +6,11 @@
  */
 package com.evolveum.midpoint.ninja.util;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.evolveum.midpoint.task.api.LightweightIdentifier;
 import com.evolveum.midpoint.task.api.LightweightIdentifierGenerator;
 
-import org.jetbrains.annotations.NotNull;
-
 /**
  * Created by Viliam Repan (lazyman).
  */

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/EnumConverterValidator.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/EnumConverterValidator.java
@@ -1,15 +1,12 @@
 package com.evolveum.midpoint.ninja.util;
 
+import java.util.Arrays;
+
 import com.beust.jcommander.IParameterValidator;
 import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.ParameterException;
-
-import com.evolveum.midpoint.ninja.action.RunSqlOptions;
-
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
-
 public class EnumConverterValidator<T extends Enum> implements IStringConverter<T>, IParameterValidator {
 
     private Class<T> enumClass;

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/FileReferenceConverter.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/FileReferenceConverter.java
@@ -6,13 +6,13 @@
  */
 package com.evolveum.midpoint.ninja.util;
 
+import java.io.File;
+
 import com.beust.jcommander.IParameterValidator;
 import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.ParameterException;
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.File;
-
 /**
  * Created by Viliam Repan (lazyman).
  */

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
@@ -19,6 +19,7 @@
 
 import com.beust.jcommander.JCommander;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 
 import com.evolveum.midpoint.ninja.action.BaseOptions;
 import com.evolveum.midpoint.ninja.action.ConnectionOptions;
@@ -37,8 +38,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
-import org.apache.commons.io.FilenameUtils;
-
 /**
  * Created by Viliam Repan (lazyman).
  */

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/ObjectTypesConverter.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/ObjectTypesConverter.java
@@ -6,14 +6,15 @@
  */
 package com.evolveum.midpoint.ninja.util;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import com.beust.jcommander.IParameterValidator;
 import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.ParameterException;
-import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.HashSet;
-import java.util.Set;
+import com.evolveum.midpoint.schema.constants.ObjectTypes;
 
 /**
  * Created by Viliam Repan (lazyman).

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/URIConverter.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/URIConverter.java
@@ -6,12 +6,12 @@
  */
 package com.evolveum.midpoint.ninja.util;
 
+import java.net.URI;
+
 import com.beust.jcommander.IParameterValidator;
 import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.ParameterException;
 
-import java.net.URI;
-
 /**
  * Created by Viliam Repan (lazyman).
  */