[ALFREDOPS-864] fix sonarqube problems

xenit-eu · Jan 8, 2025 · 719ae10 · 719ae10
1 parent 3c42a29
commit 719ae10
Show file tree

Hide file tree

Showing 121 changed files with 519 additions and 655 deletions.
diff --git a/...ssor-api/src/main/java/eu/xenit/alfresco/healthprocessor/extensibility/BaseExtension.java b/...ssor-api/src/main/java/eu/xenit/alfresco/healthprocessor/extensibility/BaseExtension.java
@@ -1,6 +1,7 @@
 package eu.xenit.alfresco.healthprocessor.extensibility;
 
 import eu.xenit.alfresco.healthprocessor.extensibility.annotations.InternalUseOnly;
+
 import java.util.Collections;
 import java.util.Map;
 

diff --git a/...ain/java/eu/xenit/alfresco/healthprocessor/extensibility/annotations/InternalUseOnly.java b/...ain/java/eu/xenit/alfresco/healthprocessor/extensibility/annotations/InternalUseOnly.java
@@ -2,8 +2,6 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**

diff --git a/...rc/main/java/eu/xenit/alfresco/healthprocessor/extensibility/annotations/NotForUseIn.java b/...rc/main/java/eu/xenit/alfresco/healthprocessor/extensibility/annotations/NotForUseIn.java
@@ -2,8 +2,6 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**

diff --git a/...c/main/java/eu/xenit/alfresco/healthprocessor/extensibility/annotations/OnlyForUseIn.java b/...c/main/java/eu/xenit/alfresco/healthprocessor/extensibility/annotations/OnlyForUseIn.java
@@ -2,8 +2,6 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**

diff --git a/...ssor-api/src/main/java/eu/xenit/alfresco/healthprocessor/fixer/api/HealthFixerPlugin.java b/...ssor-api/src/main/java/eu/xenit/alfresco/healthprocessor/fixer/api/HealthFixerPlugin.java
@@ -3,8 +3,9 @@
 import eu.xenit.alfresco.healthprocessor.extensibility.BaseExtension;
 import eu.xenit.alfresco.healthprocessor.plugins.api.HealthProcessorPlugin;
 import eu.xenit.alfresco.healthprocessor.reporter.api.NodeHealthReport;
-import java.util.Set;
+
 import javax.annotation.Nonnull;
+import java.util.Set;
 
 /**
  * Extension point for plugging in logic into the Health-Processor to fix unhealthy nodes.

diff --git a/...rocessor-api/src/main/java/eu/xenit/alfresco/healthprocessor/fixer/api/NodeFixReport.java b/...rocessor-api/src/main/java/eu/xenit/alfresco/healthprocessor/fixer/api/NodeFixReport.java
@@ -5,20 +5,12 @@
 import eu.xenit.alfresco.healthprocessor.extensibility.annotations.OnlyForUseIn;
 import eu.xenit.alfresco.healthprocessor.reporter.api.NodeHealthReport;
 import eu.xenit.alfresco.healthprocessor.reporter.api.NodeHealthReport.PersistableData;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import javax.annotation.Nonnull;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
-import lombok.Value;
+import lombok.*;
 import org.alfresco.service.cmr.repository.NodeRef;
 
+import javax.annotation.Nonnull;
+import java.util.*;
+
 /**
  * Attachment to a {@link NodeHealthReport} that contains attempted fixes made on a {@link NodeHealthReport}.
  *

diff --git a/...rc/main/java/eu/xenit/alfresco/healthprocessor/fixer/api/ToggleableHealthFixerPlugin.java b/...rc/main/java/eu/xenit/alfresco/healthprocessor/fixer/api/ToggleableHealthFixerPlugin.java
@@ -1,8 +1,5 @@
 package eu.xenit.alfresco.healthprocessor.fixer.api;
 
-import lombok.Getter;
-import lombok.Setter;
-
 /**
  * {@link HealthFixerPlugin} that already has an <code>enabled</code> property
  *

diff --git a/...pi/src/main/java/eu/xenit/alfresco/healthprocessor/plugins/api/HealthProcessorPlugin.java b/...pi/src/main/java/eu/xenit/alfresco/healthprocessor/plugins/api/HealthProcessorPlugin.java
@@ -2,10 +2,11 @@
 
 import eu.xenit.alfresco.healthprocessor.extensibility.BaseExtension;
 import eu.xenit.alfresco.healthprocessor.reporter.api.NodeHealthReport;
-import java.util.Set;
-import javax.annotation.Nonnull;
 import org.alfresco.service.cmr.repository.NodeRef;
 
+import javax.annotation.Nonnull;
+import java.util.Set;
+
 /**
  * Main extension point for plugging in (custom) logic into the Health-Processor. All implementations available in the
  * Spring context (of the Health-Processor subsystem) will be registered and, {@link #isEnabled() if enabled}, triggered

diff --git a/...n/java/eu/xenit/alfresco/healthprocessor/plugins/api/SingleNodeHealthProcessorPlugin.java b/...n/java/eu/xenit/alfresco/healthprocessor/plugins/api/SingleNodeHealthProcessorPlugin.java
@@ -1,13 +1,14 @@
 package eu.xenit.alfresco.healthprocessor.plugins.api;
 
 import eu.xenit.alfresco.healthprocessor.reporter.api.NodeHealthReport;
-import java.util.HashSet;
-import java.util.Set;
-import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.slf4j.Logger;
 
+import javax.annotation.Nonnull;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Health processor plugin that divides a batch into individual calls.
  *

diff --git a/...n/java/eu/xenit/alfresco/healthprocessor/plugins/api/ToggleableHealthProcessorPlugin.java b/...n/java/eu/xenit/alfresco/healthprocessor/plugins/api/ToggleableHealthProcessorPlugin.java
@@ -2,14 +2,15 @@
 
 import eu.xenit.alfresco.healthprocessor.fixer.api.HealthFixerPlugin;
 import eu.xenit.alfresco.healthprocessor.reporter.api.NodeHealthReport;
-import java.util.Set;
-import javax.annotation.Nonnull;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.slf4j.Logger;
 
+import javax.annotation.Nonnull;
+import java.util.Set;
+
 /**
  * {@link HealthFixerPlugin} that already has an <code>enabled</code> property
  */

diff --git a/...essor-api/src/main/java/eu/xenit/alfresco/healthprocessor/reporter/api/CycleProgress.java b/...essor-api/src/main/java/eu/xenit/alfresco/healthprocessor/reporter/api/CycleProgress.java
@@ -1,8 +1,8 @@
 package eu.xenit.alfresco.healthprocessor.reporter.api;
 
+import javax.annotation.Nonnull;
 import java.time.Duration;
 import java.util.Optional;
-import javax.annotation.Nonnull;
 
 /**
  * Progress indicator for the health processor cycle.

diff --git a/.../src/main/java/eu/xenit/alfresco/healthprocessor/reporter/api/DisabledHealthReporter.java b/.../src/main/java/eu/xenit/alfresco/healthprocessor/reporter/api/DisabledHealthReporter.java
@@ -1,8 +1,9 @@
 package eu.xenit.alfresco.healthprocessor.reporter.api;
 
 import eu.xenit.alfresco.healthprocessor.plugins.api.HealthProcessorPlugin;
-import java.util.Set;
+
 import javax.annotation.Nonnull;
+import java.util.Set;
 
 final class DisabledHealthReporter implements HealthReporter {
 

diff --git a/...ssor-api/src/main/java/eu/xenit/alfresco/healthprocessor/reporter/api/HealthReporter.java b/...ssor-api/src/main/java/eu/xenit/alfresco/healthprocessor/reporter/api/HealthReporter.java
@@ -2,9 +2,10 @@
 
 import eu.xenit.alfresco.healthprocessor.extensibility.BaseExtension;
 import eu.xenit.alfresco.healthprocessor.plugins.api.HealthProcessorPlugin;
+
+import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Set;
-import javax.annotation.Nonnull;
 
 /**
  * Extension point for plugging in logic into the Health-Processor to report results.

diff --git a/...or-api/src/main/java/eu/xenit/alfresco/healthprocessor/reporter/api/NodeHealthReport.java b/...or-api/src/main/java/eu/xenit/alfresco/healthprocessor/reporter/api/NodeHealthReport.java
@@ -4,25 +4,14 @@
 import eu.xenit.alfresco.healthprocessor.extensibility.annotations.InternalUseOnly;
 import eu.xenit.alfresco.healthprocessor.extensibility.annotations.NotForUseIn;
 import eu.xenit.alfresco.healthprocessor.extensibility.annotations.OnlyForUseIn;
+import lombok.*;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+import javax.annotation.Nonnull;
 import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
-import lombok.Value;
-import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
  * A health report for an Alfresco node.

diff --git a/...src/main/java/eu/xenit/alfresco/healthprocessor/reporter/api/ProcessorPluginOverview.java b/...src/main/java/eu/xenit/alfresco/healthprocessor/reporter/api/ProcessorPluginOverview.java
@@ -1,10 +1,11 @@
 package eu.xenit.alfresco.healthprocessor.reporter.api;
 
 import eu.xenit.alfresco.healthprocessor.plugins.api.HealthProcessorPlugin;
+import lombok.Value;
+
+import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
-import lombok.Value;
 
 /**
  * End-of-cycle summary of a certain {@link HealthProcessorPlugin} for {@link HealthReporter}s

diff --git a/.../main/java/eu/xenit/alfresco/healthprocessor/reporter/api/SingleReportHealthReporter.java b/.../main/java/eu/xenit/alfresco/healthprocessor/reporter/api/SingleReportHealthReporter.java
@@ -1,10 +1,11 @@
 package eu.xenit.alfresco.healthprocessor.reporter.api;
 
 import eu.xenit.alfresco.healthprocessor.plugins.api.HealthProcessorPlugin;
+
+import javax.annotation.Nonnull;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import javax.annotation.Nonnull;
 
 /**
  * Health reporter that divides a batch into individual calls.

diff --git a/...cessor-platform/src/main/java/eu/xenit/alfresco/healthprocessor/fixer/NodeFixService.java b/...cessor-platform/src/main/java/eu/xenit/alfresco/healthprocessor/fixer/NodeFixService.java
@@ -7,16 +7,13 @@
 import eu.xenit.alfresco.healthprocessor.reporter.api.NodeHealthReport;
 import eu.xenit.alfresco.healthprocessor.reporter.api.NodeHealthStatus;
 import eu.xenit.alfresco.healthprocessor.util.TransactionHelper;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
 @AllArgsConstructor
 @Slf4j
 public class NodeFixService {

diff --git a/...c/main/java/eu/xenit/alfresco/healthprocessor/fixer/solr/AbstractSolrNodeFixerPlugin.java b/...c/main/java/eu/xenit/alfresco/healthprocessor/fixer/solr/AbstractSolrNodeFixerPlugin.java
@@ -6,18 +6,18 @@
 import eu.xenit.alfresco.healthprocessor.plugins.api.HealthProcessorPlugin;
 import eu.xenit.alfresco.healthprocessor.plugins.solr.NodeIndexHealthReport;
 import eu.xenit.alfresco.healthprocessor.plugins.solr.SolrRequestExecutor;
-import eu.xenit.alfresco.healthprocessor.plugins.solr.SolrRequestExecutor.SolrNodeCommand;
 import eu.xenit.alfresco.healthprocessor.plugins.solr.SolrRequestExecutor.SolrActionResponse;
+import eu.xenit.alfresco.healthprocessor.plugins.solr.SolrRequestExecutor.SolrNodeCommand;
 import eu.xenit.alfresco.healthprocessor.reporter.api.NodeHealthReport;
-import java.util.HashSet;
-import java.util.Set;
-import javax.annotation.Nonnull;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
+import javax.annotation.Nonnull;
+import java.util.HashSet;
+import java.util.Set;
+
 @RequiredArgsConstructor
 @Slf4j
 abstract class AbstractSolrNodeFixerPlugin implements ToggleableHealthFixerPlugin {

diff --git a/...n/java/eu/xenit/alfresco/healthprocessor/fixer/solr/SolrDuplicateNodeFixerPluginImpl.java b/...n/java/eu/xenit/alfresco/healthprocessor/fixer/solr/SolrDuplicateNodeFixerPluginImpl.java
@@ -7,6 +7,7 @@
 import eu.xenit.alfresco.healthprocessor.plugins.solr.SolrRequestExecutor;
 import eu.xenit.alfresco.healthprocessor.plugins.solr.SolrRequestExecutor.SolrNodeCommand;
 import eu.xenit.alfresco.healthprocessor.reporter.api.NodeHealthReport;
+
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;

diff --git a/.../src/main/java/eu/xenit/alfresco/healthprocessor/indexing/Alfresco7TrackingComponent.java b/.../src/main/java/eu/xenit/alfresco/healthprocessor/indexing/Alfresco7TrackingComponent.java
@@ -1,12 +1,13 @@
 package eu.xenit.alfresco.healthprocessor.indexing;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 import lombok.AllArgsConstructor;
 import org.alfresco.repo.search.SearchTrackingComponent;
 import org.alfresco.repo.solr.NodeParameters;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 @AllArgsConstructor
 public class Alfresco7TrackingComponent implements TrackingComponent {
 

diff --git a/...tform/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/IndexingConfiguration.java b/...tform/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/IndexingConfiguration.java
@@ -1,7 +1,7 @@
 package eu.xenit.alfresco.healthprocessor.indexing;
 
-import java.util.Map;
 import javax.annotation.Nonnull;
+import java.util.Map;
 
 public interface IndexingConfiguration {
 

diff --git a/...ain/java/eu/xenit/alfresco/healthprocessor/indexing/IndexingConfigurationFactoryBean.java b/...ain/java/eu/xenit/alfresco/healthprocessor/indexing/IndexingConfigurationFactoryBean.java
@@ -1,10 +1,11 @@
 package eu.xenit.alfresco.healthprocessor.indexing;
 
-import java.util.Collection;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 
+import java.util.Collection;
+
 @AllArgsConstructor
 @Slf4j
 public final class IndexingConfigurationFactoryBean extends AbstractFactoryBean<IndexingConfiguration> {

diff --git a/...r-platform/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/IndexingStrategy.java b/...r-platform/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/IndexingStrategy.java
@@ -1,13 +1,14 @@
 package eu.xenit.alfresco.healthprocessor.indexing;
 
 import eu.xenit.alfresco.healthprocessor.reporter.api.CycleProgress;
+import lombok.Getter;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import lombok.Getter;
-import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
  * Strategy used by the Health-Processor to iterate over (a subset of) Alfresco nodes. Once {@link #getNextNodeIds(int)}

diff --git a/...-platform/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/NullCycleProgress.java b/...-platform/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/NullCycleProgress.java
@@ -1,9 +1,10 @@
 package eu.xenit.alfresco.healthprocessor.indexing;
 
 import eu.xenit.alfresco.healthprocessor.reporter.api.CycleProgress;
+
+import javax.annotation.Nonnull;
 import java.time.Duration;
 import java.util.Optional;
-import javax.annotation.Nonnull;
 
 
 public final class NullCycleProgress implements CycleProgress {

diff --git a/...latform/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/SimpleCycleProgress.java b/...latform/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/SimpleCycleProgress.java
@@ -1,12 +1,13 @@
 package eu.xenit.alfresco.healthprocessor.indexing;
 
 import eu.xenit.alfresco.healthprocessor.reporter.api.CycleProgress;
+import lombok.RequiredArgsConstructor;
+
+import javax.annotation.Nonnull;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Optional;
 import java.util.function.LongSupplier;
-import javax.annotation.Nonnull;
-import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 public class SimpleCycleProgress implements CycleProgress {

diff --git a/...-platform/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/TrackingComponent.java b/...-platform/src/main/java/eu/xenit/alfresco/healthprocessor/indexing/TrackingComponent.java
@@ -1,11 +1,12 @@
 package eu.xenit.alfresco.healthprocessor.indexing;
 
-import java.util.List;
-import java.util.Set;
 import lombok.Value;
 import org.alfresco.repo.solr.NodeParameters;
 import org.alfresco.service.cmr.repository.NodeRef;
 
+import java.util.List;
+import java.util.Set;
+
 public interface TrackingComponent {
 
     long getMaxTxnId();