MID-8842 code cleanup

Evolveum · May 31, 2023 · 5c575f3 · 5c575f3
1 parent 31ba3a5
commit 5c575f3
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 125 deletions.
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/CountRepositoryAction.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/CountRepositoryAction.java
@@ -7,6 +7,9 @@
 
 package com.evolveum.midpoint.ninja.action;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.evolveum.midpoint.ninja.impl.LogTarget;
 import com.evolveum.midpoint.ninja.impl.NinjaException;
 import com.evolveum.midpoint.ninja.opts.CountOptions;
@@ -16,12 +19,6 @@
 import com.evolveum.midpoint.repo.api.RepositoryService;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 /**
  * Created by Viliam Repan (lazyman).

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/DeleteRepositoryAction.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/DeleteRepositoryAction.java
@@ -41,7 +41,7 @@ public class DeleteRepositoryAction extends RepositoryAction<DeleteOptions> {
 
     private enum State {
 
-        DELETE, SKIP, STOP;
+        DELETE, SKIP, STOP
     }
 
     @Override

diff --git a/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/DistributionManager.java b/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/DistributionManager.java
@@ -41,14 +41,9 @@ public File downloadDistribution(@NotNull String version, ProgressListener liste
         FileUtils.forceMkdirParent(file);
         file.createNewFile();
 
-        StringBuilder url = new StringBuilder();
-        url.append(DOWNLOAD_URL);
-        url.append(version);
-        url.append("/");
-        url.append(distributionFile);
-
+        String url = DOWNLOAD_URL + version + "/" + distributionFile;
         Request request = new Request.Builder()
-                .url(url.toString())
+                .url(url)
                 .build();
 
         OkHttpClient client = new OkHttpClient.Builder()

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/UpgradePhase.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/UpgradePhase.java
@@ -2,5 +2,5 @@
 
 public enum UpgradePhase {
 
-    BEFORE, AFTER;
+    BEFORE, AFTER
 }
diff --git a/...ja/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/step/UpgradePreCheckStep.java b/...ja/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/step/UpgradePreCheckStep.java
@@ -78,7 +78,7 @@ public UpgradePreCheckResult execute() throws Exception {
             }
 
             String version = versions.iterator().next();
-            boolean match = Arrays.stream(UpgradeConstants.SUPPORTED_VERSIONS).anyMatch(v -> v.equals(version));
+            boolean match = Arrays.asList(UpgradeConstants.SUPPORTED_VERSIONS).contains(version);
             if (!match) {
                 // todo error, version didn't match. Ask whether to continue?
 

diff --git a/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/VerifyConsumerWorker.java b/...s/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/VerifyConsumerWorker.java
@@ -26,7 +26,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.xml.serialize.LineSeparator;
 
 /**
  * @author Radovan Semancik

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/VerifyOptions.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/opts/VerifyOptions.java
@@ -9,8 +9,6 @@
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
-import java.io.File;
-
 /**
  * @author semancik
  */
@@ -22,10 +20,10 @@ public class VerifyOptions extends ExportOptions {
 
     public static final String P_CREATE_REPORT = "--create-report";
 
-    @Parameter(names = {P_WARN, P_WARN_LONG}, descriptionKey = "verify.warn")
+    @Parameter(names = { P_WARN, P_WARN_LONG }, descriptionKey = "verify.warn")
     private String warn;
 
-    @Parameter(names = {P_CREATE_REPORT}, descriptionKey = "verify.createReport")
+    @Parameter(names = { P_CREATE_REPORT }, descriptionKey = "verify.createReport")
     private Boolean createReport;
 
     public String getWarn() {

diff --git a/.../ninja/src/main/java/com/evolveum/midpoint/ninja/util/BasicAuthenticationInterceptor.java b/.../ninja/src/main/java/com/evolveum/midpoint/ninja/util/BasicAuthenticationInterceptor.java
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/OperationStatus.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/OperationStatus.java
@@ -19,7 +19,7 @@
 public class OperationStatus {
 
     public enum State {
-        NOT_STARTED, STARTED, PRODUCER_FINISHED, FINISHED;
+        NOT_STARTED, STARTED, PRODUCER_FINISHED, FINISHED
     }
 
     private final NinjaContext context;

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/ProxyCreator.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/ProxyCreator.java