Scheduled Cleanup

Author: Vincent Potucek

lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java

@@ -25,6 +25,10 @@
 import java.util.Map;
 import java.util.Properties;
 
+import dev.equo.solstice.NestedJars;
+import dev.equo.solstice.ShimIdeBootstrapServices;
+import dev.equo.solstice.Solstice;
+import dev.equo.solstice.p2.CacheLocations;
 import org.codehaus.groovy.eclipse.GroovyLogManager;
 import org.codehaus.groovy.eclipse.IGroovyLogger;
 import org.codehaus.groovy.eclipse.TraceCategory;
@@ -43,11 +47,6 @@
 import org.eclipse.text.edits.TextEdit;
 import org.osgi.framework.Constants;
 
-import dev.equo.solstice.NestedJars;
-import dev.equo.solstice.ShimIdeBootstrapServices;
-import dev.equo.solstice.Solstice;
-import dev.equo.solstice.p2.CacheLocations;
-
 /** Spotless-Formatter step which calls out to the Groovy-Eclipse formatter. */
 public class GrEclipseFormatterStepImpl {
 	static {

lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java

@@ -28,6 +28,8 @@
 
 import javax.annotation.Nullable;
 
+import dev.equo.solstice.p2.P2Model;
+
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
@@ -37,8 +39,6 @@
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.SerializedFunction;
 
-import dev.equo.solstice.p2.P2Model;
-
 /**
  * Generic Eclipse based formatter step {@link State} builder.
  */

lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java

@@ -30,6 +30,9 @@
 
 import javax.annotation.Nullable;
 
+import com.googlecode.concurrenttrees.radix.ConcurrentRadixTree;
+import com.googlecode.concurrenttrees.radix.node.concrete.DefaultCharSequenceNodeFactory;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.eclipse.jgit.attributes.Attribute;
 import org.eclipse.jgit.attributes.AttributesNode;
 import org.eclipse.jgit.attributes.AttributesRule;
@@ -45,17 +48,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.googlecode.concurrenttrees.radix.ConcurrentRadixTree;
-import com.googlecode.concurrenttrees.radix.node.concrete.DefaultCharSequenceNodeFactory;
-
 import com.diffplug.common.base.Errors;
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.LazyForwardingEquality;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.extra.GitWorkarounds.RepositorySpecificResolver;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Uses <a href="https://git-scm.com/docs/gitattributes">.gitattributes</a> to determine
  * the appropriate line ending. Falls back to the {@code core.eol} and {@code core.autocrlf} properties in the

lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java

@@ -20,6 +20,7 @@
 
 import javax.annotation.Nullable;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.ConfigConstants;
@@ -32,8 +33,6 @@
 
 import com.diffplug.common.base.Errors;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Utility methods for Git workarounds.
  */

lib-extra/src/main/java/com/diffplug/spotless/extra/P2Provisioner.java

@@ -22,15 +22,15 @@
 
 import javax.annotation.Nullable;
 
-import com.diffplug.spotless.Provisioner;
-
 import dev.equo.solstice.NestedJars;
 import dev.equo.solstice.p2.CacheLocations;
 import dev.equo.solstice.p2.P2ClientCache;
 import dev.equo.solstice.p2.P2Model;
 import dev.equo.solstice.p2.P2QueryCache;
 import dev.equo.solstice.p2.P2QueryResult;
 
+import com.diffplug.spotless.Provisioner;
+
 /**
  * Provisions dependencies from Eclipse P2 repositories.
  * Similar to {@link Provisioner} but for P2/OSGi bundles.

lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java

@@ -18,15 +18,15 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Properties;
 
+import dev.equo.solstice.p2.P2Model;
+
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.P2Provisioner;
 
-import dev.equo.solstice.p2.P2Model;
-
 /**
  * Formatter step which calls out to the Eclipse CDT formatter.
  * <p>

lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java

@@ -19,15 +19,15 @@
 import java.util.List;
 import java.util.Properties;
 
+import dev.equo.solstice.p2.P2Model;
+
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.P2Provisioner;
 
-import dev.equo.solstice.p2.P2Model;
-
 /** Formatter step which calls out to the Groovy-Eclipse formatter. */
 public final class GrEclipseFormatterStep {
 	// prevent direct instantiation

lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java

@@ -19,6 +19,8 @@
 import java.util.Map;
 import java.util.Properties;
 
+import dev.equo.solstice.p2.P2Model;
+
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.Jvm;
@@ -27,8 +29,6 @@
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.P2Provisioner;
 
-import dev.equo.solstice.p2.P2Model;
-
 /** Formatter step which calls out to the Eclipse JDT formatter. */
 public final class EclipseJdtFormatterStep {
 	// prevent direct instantiation

lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java

@@ -21,18 +21,17 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.diffplug.spotless.FormatterFunc;
-
 import eu.solven.cleanthat.config.pojo.CleanthatEngineProperties;
 import eu.solven.cleanthat.config.pojo.SourceCodeProperties;
 import eu.solven.cleanthat.engine.java.IJdkVersionConstants;
 import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorer;
 import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorerProperties;
 import eu.solven.cleanthat.formatter.LineEnding;
 import eu.solven.cleanthat.formatter.PathAndContent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.FormatterFunc;
 
 /**
  * The glue for CleanThat: it is build over the version in build.gradle, but at runtime it will be executed over

lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java

@@ -22,15 +22,13 @@
 
 import javax.annotation.Nullable;
 
-import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
-
 import com.pinterest.ktlint.core.KtLint;
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.RuleSet;
 import com.pinterest.ktlint.core.api.EditorConfigOverride;
-
 import kotlin.Unit;
 import kotlin.jvm.functions.Function2;
+import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
 
 public class DiktatCompat1Dot2Dot5Adapter implements DiktatCompatAdapter {
 	private final List<RuleSet> ruleSets;