chore(deps): update dependency com.diffplug.spotless:spotless-maven-p…

…lugin to v2.36.0 (#1014) * chore(deps): update dependency com.diffplug.spotless:spotless-maven-plugin to v2.36.0 * style: comply with spotless * style: please spotless --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Aman Sharma <[email protected]>
ASSERT-KTH · May 3, 2023 · 1d65137 · 1d65137
1 parent 91e67bd
commit 1d65137
Show file tree

Hide file tree

Showing 105 changed files with 478 additions and 295 deletions.
diff --git a/pom.xml b/pom.xml
@@ -176,7 +176,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.35.0</version>
+                <version>2.36.0</version>
                 <configuration>
                     <java>
                         <includes>

diff --git a/sorald-api/pom.xml b/sorald-api/pom.xml
@@ -181,7 +181,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.35.0</version>
+                <version>2.36.0</version>
                 <configuration>
                     <java>
                         <includes>

diff --git a/sorald-api/src/main/java/sorald/api/ProcessorRepository.java b/sorald-api/src/main/java/sorald/api/ProcessorRepository.java
@@ -1,9 +1,11 @@
 package sorald.api;
 
+import sorald.processor.SoraldAbstractProcessor;
+
 import java.util.List;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import sorald.processor.SoraldAbstractProcessor;
 
 /**
  * This interfaces describes a repository of processors. Each processor is a class that implements

diff --git a/sorald-api/src/main/java/sorald/api/RuleRepository.java b/sorald-api/src/main/java/sorald/api/RuleRepository.java
@@ -1,10 +1,12 @@
 package sorald.api;
 
-import java.util.Collection;
-import javax.annotation.Nonnull;
 import sorald.rule.IRuleType;
 import sorald.rule.Rule;
 
+import java.util.Collection;
+
+import javax.annotation.Nonnull;
+
 /**
  * This class defines the interface for a repository of rules. It is used by Sorald to find all
  * rules to use. All implementing classes need a no-arg constructor.

diff --git a/sorald-api/src/main/java/sorald/event/models/CrashEvent.java b/sorald-api/src/main/java/sorald/event/models/CrashEvent.java
@@ -1,10 +1,11 @@
 package sorald.event.models;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import sorald.event.EventType;
 import sorald.event.SoraldEvent;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 /** Event recording a crash. */
 public class CrashEvent implements SoraldEvent {
     private final String description;

diff --git a/sorald-api/src/main/java/sorald/event/models/RepairEvent.java b/sorald-api/src/main/java/sorald/event/models/RepairEvent.java
@@ -3,6 +3,7 @@
 import sorald.event.EventType;
 import sorald.event.SoraldEvent;
 import sorald.rule.RuleViolation;
+
 import spoon.reflect.declaration.CtElement;
 
 /**

diff --git a/sorald-api/src/main/java/sorald/processor/SoraldAbstractProcessor.java b/sorald-api/src/main/java/sorald/processor/SoraldAbstractProcessor.java
@@ -1,21 +1,23 @@
 package sorald.processor;
 
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 import sorald.annotations.IncompleteProcessor;
 import sorald.annotations.ProcessorAnnotation;
 import sorald.event.EventHelper;
 import sorald.event.SoraldEventHandler;
 import sorald.event.models.CrashEvent;
 import sorald.event.models.RepairEvent;
 import sorald.rule.RuleViolation;
+
 import spoon.processing.AbstractProcessor;
 import spoon.reflect.declaration.CtElement;
 
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 /** superclass for all processors */
 public abstract class SoraldAbstractProcessor<E extends CtElement> extends AbstractProcessor<E> {
     private int maxFixes = Integer.MAX_VALUE;

diff --git a/sorald-api/src/main/java/sorald/rule/RuleViolation.java b/sorald-api/src/main/java/sorald/rule/RuleViolation.java
@@ -1,10 +1,11 @@
 package sorald.rule;
 
+import sorald.Constants;
+
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import sorald.Constants;
 
 /** Representation of a violation of some Sonar rule */
 public abstract class RuleViolation implements Comparable<RuleViolation> {

diff --git a/sorald-api/src/main/java/sorald/rule/StaticAnalyzer.java b/sorald-api/src/main/java/sorald/rule/StaticAnalyzer.java
@@ -1,9 +1,10 @@
 package sorald.rule;
 
+import sorald.cli.CLIConfigForStaticAnalyzer;
+
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
-import sorald.cli.CLIConfigForStaticAnalyzer;
 
 /** A static analyzer for Java source code */
 public interface StaticAnalyzer {

diff --git a/sorald/pom.xml b/sorald/pom.xml
@@ -280,7 +280,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.35.0</version>
+                <version>2.36.0</version>
                 <configuration>
                     <java>
                         <includes>

diff --git a/sorald/src/main/java/sorald/CodeGenerator.java b/sorald/src/main/java/sorald/CodeGenerator.java
@@ -1,10 +1,12 @@
 package sorald;
 
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import sorald.sonar.ProcessorsClassGenerator;
+
 import spoon.Launcher;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 /** Wrapper class for all (present and future) code generation in Sorald. */
 public class CodeGenerator {
 

diff --git a/sorald/src/main/java/sorald/FileUtils.java b/sorald/src/main/java/sorald/FileUtils.java
@@ -1,5 +1,8 @@
 package sorald;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -10,8 +13,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.json.JSONArray;
-import org.json.JSONObject;
 
 public class FileUtils {
     private FileUtils() {}

diff --git a/sorald/src/main/java/sorald/Processors.java b/sorald/src/main/java/sorald/Processors.java
@@ -1,13 +1,14 @@
 package sorald;
 
+import sorald.api.ProcessorRepository;
+import sorald.processor.SoraldAbstractProcessor;
+
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.ServiceLoader;
 import java.util.stream.Collectors;
-import sorald.api.ProcessorRepository;
-import sorald.processor.SoraldAbstractProcessor;
 
 public class Processors {
     private Processors() {}

diff --git a/sorald/src/main/java/sorald/Repair.java b/sorald/src/main/java/sorald/Repair.java
@@ -1,23 +1,5 @@
 package sorald;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.IdentityHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import sorald.event.EventHelper;
 import sorald.event.EventType;
 import sorald.event.SoraldEventHandler;
@@ -29,6 +11,7 @@
 import sorald.segment.Node;
 import sorald.segment.SoraldTreeBuilderAlgorithm;
 import sorald.sonar.BestFitScanner;
+
 import spoon.Launcher;
 import spoon.MavenLauncher;
 import spoon.compiler.Environment;
@@ -48,6 +31,25 @@
 import spoon.support.QueueProcessingManager;
 import spoon.support.sniper.SniperJavaPrettyPrinter;
 
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /** Class for repairing projects. */
 public class Repair {
     private final SoraldConfig config;

diff --git a/sorald/src/main/java/sorald/SelectiveForceImport.java b/sorald/src/main/java/sorald/SelectiveForceImport.java
@@ -1,14 +1,15 @@
 package sorald;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.IdentityHashMap;
-import java.util.Set;
 import spoon.reflect.path.CtRole;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.ForceImportProcessor;
 import spoon.reflect.visitor.LexicalScope;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Set;
+
 /**
  * Processor that force-imports type references only if they are not present in the excluded
  * references.

diff --git a/sorald/src/main/java/sorald/SoraldConfig.java b/sorald/src/main/java/sorald/SoraldConfig.java
@@ -1,12 +1,13 @@
 package sorald;
 
+import sorald.cli.CLIConfigForStaticAnalyzer;
+import sorald.rule.Rule;
+
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import sorald.cli.CLIConfigForStaticAnalyzer;
-import sorald.rule.Rule;
 
 /* All config settings of Sorald should be gathered here */
 public class SoraldConfig implements CLIConfigForStaticAnalyzer {

diff --git a/sorald/src/main/java/sorald/cli/BaseCommand.java b/sorald/src/main/java/sorald/cli/BaseCommand.java
@@ -1,21 +1,24 @@
 package sorald.cli;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.Callable;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.configurator.BasicComponentConfigurator;
 import org.codehaus.plexus.component.configurator.ComponentConfigurator;
 import org.codehaus.plexus.component.configurator.converters.basic.AbstractBasicConverter;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+
 import picocli.CommandLine;
+
 import sorald.Constants;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Callable;
+
 /** Base command containing the options in common for all Sorald subcommands. */
 @CommandLine.Command()
 abstract class BaseCommand extends AbstractMojo implements Callable<Integer> {

diff --git a/sorald/src/main/java/sorald/cli/Cli.java b/sorald/src/main/java/sorald/cli/Cli.java
@@ -1,8 +1,9 @@
 package sorald.cli;
 
-import java.util.concurrent.Callable;
 import picocli.CommandLine;
 
+import java.util.concurrent.Callable;
+
 /** Class containing the CLI for Sorald. */
 public class Cli {
     private Cli() {}

diff --git a/sorald/src/main/java/sorald/cli/MineCommand.java b/sorald/src/main/java/sorald/cli/MineCommand.java
@@ -1,16 +1,13 @@
 package sorald.cli;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.*;
-import java.util.stream.Collectors;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.json.JSONObject;
+
 import picocli.CommandLine;
+
 import sorald.Constants;
 import sorald.FileUtils;
 import sorald.SoraldConfig;
@@ -25,6 +22,12 @@
 import sorald.sonar.SonarRuleType;
 import sorald.util.MavenUtils;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.*;
+import java.util.stream.Collectors;
+
 /** CLI Command for Sorald's mining functionality. */
 @Mojo(name = Constants.MINE_COMMAND_NAME)
 @CommandLine.Command(

diff --git a/sorald/src/main/java/sorald/cli/RealFileConverter.java b/sorald/src/main/java/sorald/cli/RealFileConverter.java
@@ -1,8 +1,9 @@
 package sorald.cli;
 
+import picocli.CommandLine;
+
 import java.io.File;
 import java.nio.file.Paths;
-import picocli.CommandLine;
 
 /** Converter that converts a String to a real file that's validated to exist in the file system. */
 public class RealFileConverter implements CommandLine.ITypeConverter<File> {

diff --git a/sorald/src/main/java/sorald/cli/RepairCommand.java b/sorald/src/main/java/sorald/cli/RepairCommand.java
@@ -1,16 +1,13 @@
 package sorald.cli;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.stream.Collectors;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.codehaus.plexus.component.configurator.converters.basic.AbstractBasicConverter;
+
 import picocli.CommandLine;
+
 import sorald.*;
 import sorald.event.EventHelper;
 import sorald.event.EventType;
@@ -28,6 +25,12 @@
 import sorald.sonar.SonarRule;
 import sorald.util.MavenUtils;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.stream.Collectors;
+
 /** The CLI command for the primary repair application. */
 @Mojo(name = Constants.REPAIR_COMMAND_NAME)
 @CommandLine.Command(