SONARPHP-1550 Add spotless import formatter (#1290)

SonarSource · Oct 24, 2024 · d8025b3 · d8025b3
1 parent 6a17f4c
commit d8025b3
Show file tree

Hide file tree

Showing 35 changed files with 25 additions and 46 deletions.
diff --git a/php-checks/src/main/java/org/sonar/php/checks/ForLoopIncrementSignCheck.java b/php-checks/src/main/java/org/sonar/php/checks/ForLoopIncrementSignCheck.java
@@ -20,7 +20,6 @@
 package org.sonar.php.checks;
 
 import java.util.List;
-import java.util.stream.Collectors;
 import org.sonar.check.Rule;
 import org.sonar.php.checks.utils.CheckUtils;
 import org.sonar.php.checks.utils.SyntacticEquivalence;

diff --git a/...hecks/src/main/java/org/sonar/php/checks/HardCodedCredentialsInVariablesAndUrisCheck.java b/...hecks/src/main/java/org/sonar/php/checks/HardCodedCredentialsInVariablesAndUrisCheck.java
@@ -23,7 +23,6 @@
 import java.net.URISyntaxException;
 import java.util.List;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import org.sonar.check.Rule;

diff --git a/php-checks/src/main/java/org/sonar/php/checks/LoopExecutingAtMostOnceCheck.java b/php-checks/src/main/java/org/sonar/php/checks/LoopExecutingAtMostOnceCheck.java
@@ -28,7 +28,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 import javax.annotation.CheckForNull;
 import org.sonar.check.Rule;
 import org.sonar.php.checks.utils.CheckUtils;

diff --git a/php-checks/src/main/java/org/sonar/php/checks/ParameterSequenceCheck.java b/php-checks/src/main/java/org/sonar/php/checks/ParameterSequenceCheck.java
@@ -21,7 +21,6 @@
 
 import java.util.HashSet;
 import java.util.List;
-import java.util.stream.Collectors;
 import org.sonar.check.Rule;
 import org.sonar.php.checks.utils.CheckUtils;
 import org.sonar.php.symbols.FunctionSymbol;

diff --git a/php-checks/src/main/java/org/sonar/php/checks/UnusedPrivateFieldCheck.java b/php-checks/src/main/java/org/sonar/php/checks/UnusedPrivateFieldCheck.java
@@ -23,7 +23,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 import org.sonar.check.Rule;
 import org.sonar.php.tree.TreeUtils;
 import org.sonar.plugins.php.api.symbols.Symbol;

diff --git a/php-checks/src/main/java/org/sonar/php/checks/UselessExpressionStatementCheck.java b/php-checks/src/main/java/org/sonar/php/checks/UselessExpressionStatementCheck.java
@@ -19,6 +19,9 @@
  */
 package org.sonar.php.checks;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
 import org.apache.commons.lang3.tuple.Pair;
 import org.sonar.check.Rule;
 import org.sonar.php.checks.utils.CheckUtils;
@@ -32,10 +35,6 @@
 import org.sonar.plugins.php.api.tree.statement.ExpressionStatementTree;
 import org.sonar.plugins.php.api.visitors.PHPVisitorCheck;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
 @Rule(key = UselessExpressionStatementCheck.KEY)
 public class UselessExpressionStatementCheck extends PHPVisitorCheck {
 

diff --git a/php-checks/src/main/java/org/sonar/php/checks/formatting/IndentationCheck.java b/php-checks/src/main/java/org/sonar/php/checks/formatting/IndentationCheck.java
@@ -23,7 +23,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.sonar.php.api.PHPPunctuator;
 import org.sonar.php.checks.FormattingStandardCheck;

diff --git a/php-checks/src/main/java/org/sonar/php/checks/phpunit/AssertionInTryCatchCheck.java b/php-checks/src/main/java/org/sonar/php/checks/phpunit/AssertionInTryCatchCheck.java
@@ -22,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.sonar.check.Rule;
 import org.sonar.php.checks.utils.PhpUnitCheck;

diff --git a/php-checks/src/main/java/org/sonar/php/checks/regex/GroupReplacementCheck.java b/php-checks/src/main/java/org/sonar/php/checks/regex/GroupReplacementCheck.java
@@ -26,7 +26,6 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import org.sonar.check.Rule;
 import org.sonar.php.checks.utils.CheckUtils;
 import org.sonar.plugins.php.api.tree.expression.FunctionCallTree;

diff --git a/php-checks/src/main/java/org/sonar/php/checks/regex/InvalidRegexCheck.java b/php-checks/src/main/java/org/sonar/php/checks/regex/InvalidRegexCheck.java
@@ -20,7 +20,6 @@
 package org.sonar.php.checks.regex;
 
 import java.util.List;
-import java.util.stream.Collectors;
 import org.sonar.check.Rule;
 import org.sonar.plugins.php.api.tree.expression.FunctionCallTree;
 import org.sonarsource.analyzer.commons.regex.RegexIssueLocation;

diff --git a/php-checks/src/main/java/org/sonar/php/checks/security/AuthorizationsCheck.java b/php-checks/src/main/java/org/sonar/php/checks/security/AuthorizationsCheck.java
@@ -26,7 +26,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import org.sonar.check.Rule;
 import org.sonar.php.checks.utils.CheckUtils;
 import org.sonar.plugins.php.api.symbols.QualifiedName;

diff --git a/php-checks/src/main/java/org/sonar/php/checks/security/CookieDomainCheck.java b/php-checks/src/main/java/org/sonar/php/checks/security/CookieDomainCheck.java
@@ -25,7 +25,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 import org.sonar.check.Rule;
 import org.sonar.php.checks.utils.CheckUtils;
 import org.sonar.php.checks.utils.FunctionUsageCheck;

diff --git a/php-frontend/src/main/java/org/sonar/php/symbols/FunctionSymbol.java b/php-frontend/src/main/java/org/sonar/php/symbols/FunctionSymbol.java
@@ -19,12 +19,11 @@
  */
 package org.sonar.php.symbols;
 
+import java.util.List;
 import org.sonar.plugins.php.api.symbols.QualifiedName;
 import org.sonar.plugins.php.api.symbols.ReturnType;
 import org.sonar.plugins.php.api.visitors.LocationInFile;
 
-import java.util.List;
-
 public interface FunctionSymbol extends Symbol {
   LocationInFile location();
 

diff --git a/php-frontend/src/main/java/org/sonar/php/symbols/FunctionSymbolData.java b/php-frontend/src/main/java/org/sonar/php/symbols/FunctionSymbolData.java
@@ -19,12 +19,11 @@
  */
 package org.sonar.php.symbols;
 
+import java.util.List;
 import org.sonar.plugins.php.api.symbols.QualifiedName;
 import org.sonar.plugins.php.api.symbols.ReturnType;
 import org.sonar.plugins.php.api.visitors.LocationInFile;
 
-import java.util.List;
-
 public class FunctionSymbolData {
   private final LocationInFile location;
   private final QualifiedName qualifiedName;

diff --git a/php-frontend/src/main/java/org/sonar/php/tree/impl/declaration/EnumDeclarationTreeImpl.java b/php-frontend/src/main/java/org/sonar/php/tree/impl/declaration/EnumDeclarationTreeImpl.java
@@ -21,7 +21,6 @@
 
 import java.util.Iterator;
 import java.util.List;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.sonar.php.tree.impl.SeparatedListImpl;
 import org.sonar.php.tree.impl.lexical.InternalSyntaxToken;

diff --git a/php-frontend/src/main/java/org/sonar/php/tree/impl/expression/AnonymousClassTreeImpl.java b/php-frontend/src/main/java/org/sonar/php/tree/impl/expression/AnonymousClassTreeImpl.java
@@ -21,7 +21,6 @@
 
 import java.util.Iterator;
 import java.util.List;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.sonar.php.symbols.ClassSymbol;
 import org.sonar.php.tree.impl.PHPTree;

diff --git a/...end/src/main/java/org/sonar/php/tree/impl/expression/ExpandableStringLiteralTreeImpl.java b/...end/src/main/java/org/sonar/php/tree/impl/expression/ExpandableStringLiteralTreeImpl.java
@@ -21,7 +21,6 @@
 
 import java.util.Iterator;
 import java.util.List;
-import java.util.stream.Collectors;
 import org.sonar.php.tree.impl.PHPTree;
 import org.sonar.php.tree.impl.lexical.InternalSyntaxToken;
 import org.sonar.php.utils.collections.IteratorUtils;

diff --git a/php-frontend/src/main/java/org/sonar/php/tree/impl/expression/FunctionCallTreeImpl.java b/php-frontend/src/main/java/org/sonar/php/tree/impl/expression/FunctionCallTreeImpl.java
@@ -21,7 +21,6 @@
 
 import java.util.Iterator;
 import java.util.List;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.sonar.php.symbols.FunctionSymbol;
 import org.sonar.php.symbols.UnknownFunctionSymbol;

diff --git a/...ontend/src/main/java/org/sonar/php/tree/impl/expression/HeredocStringLiteralTreeImpl.java b/...ontend/src/main/java/org/sonar/php/tree/impl/expression/HeredocStringLiteralTreeImpl.java
@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import org.sonar.api.utils.Preconditions;
 import org.sonar.php.parser.LexicalConstant;
 import org.sonar.php.parser.PHPLexicalGrammar;

diff --git a/php-frontend/src/main/java/org/sonar/php/tree/symbols/SymbolReturnType.java b/php-frontend/src/main/java/org/sonar/php/tree/symbols/SymbolReturnType.java
@@ -19,13 +19,12 @@
  */
 package org.sonar.php.tree.symbols;
 
+import javax.annotation.Nullable;
 import org.sonar.php.tree.impl.declaration.ClassNamespaceNameTreeImpl;
 import org.sonar.plugins.php.api.symbols.ReturnType;
 import org.sonar.plugins.php.api.tree.declaration.ReturnTypeClauseTree;
 import org.sonar.plugins.php.api.tree.declaration.TypeTree;
 
-import javax.annotation.Nullable;
-
 public record SymbolReturnType(boolean isPresent, boolean isVoid) implements ReturnType {
   public static SymbolReturnType from(@Nullable ReturnTypeClauseTree returnTypeClause) {
     if (returnTypeClause == null) {

diff --git a/php-frontend/src/main/java/org/sonar/php/tree/visitors/AssignmentExpressionVisitor.java b/php-frontend/src/main/java/org/sonar/php/tree/visitors/AssignmentExpressionVisitor.java
@@ -23,7 +23,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 import javax.annotation.CheckForNull;
 import org.sonar.php.tree.impl.VariableIdentifierTreeImpl;
 import org.sonar.php.tree.symbols.SymbolImpl;

diff --git a/php-frontend/src/main/java/org/sonar/php/utils/collections/ListUtils.java b/php-frontend/src/main/java/org/sonar/php/utils/collections/ListUtils.java
@@ -23,7 +23,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 

diff --git a/php-frontend/src/main/java/org/sonar/plugins/php/api/cfg/ControlFlowGraphBuilder.java b/php-frontend/src/main/java/org/sonar/plugins/php/api/cfg/ControlFlowGraphBuilder.java
@@ -29,7 +29,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.sonar.api.utils.Preconditions;
 import org.sonar.php.tree.impl.PHPTree;

diff --git a/php-frontend/src/main/java/org/sonar/plugins/php/api/tests/PHPCheckTest.java b/php-frontend/src/main/java/org/sonar/plugins/php/api/tests/PHPCheckTest.java
@@ -24,7 +24,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import org.sonar.php.parser.PHPParserBuilder;
 import org.sonar.plugins.php.api.tests.TestIssue.Location;
 import org.sonar.plugins.php.api.tree.CompilationUnitTree;

diff --git a/pom.xml b/pom.xml
@@ -331,6 +331,12 @@
             <encoding>UTF-8</encoding>
             <java>
               <toggleOffOn/>
+              <importOrder>
+                <file>
+                  https://raw.githubusercontent.com/SonarSource/sonar-developer-toolset/refs/heads/master/eclipse/sonar.importorder
+                </file>
+              </importOrder>
+              <removeUnusedImports/>
               <eclipse>
                 <version>4.22.0</version>
                 <file>https://raw.githubusercontent.com/SonarSource/sonar-developer-toolset/master/eclipse/sonar-formatter.xml</file>

diff --git a/sonar-php-plugin/src/main/java/org/sonar/plugins/php/PHPSensor.java b/sonar-php-plugin/src/main/java/org/sonar/plugins/php/PHPSensor.java
@@ -22,6 +22,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.DurationStatistics;
 import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.FileSystem;
@@ -32,8 +34,6 @@
 import org.sonar.api.batch.sensor.SensorDescriptor;
 import org.sonar.api.issue.NoSonarFilter;
 import org.sonar.api.measures.FileLinesContextFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.sonar.php.cache.CacheContextImpl;
 import org.sonar.php.checks.CheckList;
 import org.sonar.php.symbols.ProjectSymbolData;

diff --git a/sonar-php-plugin/src/main/java/org/sonar/plugins/php/PhpExclusionsFileFilter.java b/sonar-php-plugin/src/main/java/org/sonar/plugins/php/PhpExclusionsFileFilter.java
@@ -25,12 +25,12 @@
 import java.util.List;
 import java.util.Scanner;
 import java.util.regex.Pattern;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.InputFileFilter;
 import org.sonar.api.config.Configuration;
 import org.sonar.api.utils.WildcardPattern;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.sonar.php.parser.LexicalConstant;
 import org.sonar.plugins.php.api.Php;
 

diff --git a/sonar-php-plugin/src/main/java/org/sonar/plugins/php/PhpIniSensor.java b/sonar-php-plugin/src/main/java/org/sonar/plugins/php/PhpIniSensor.java
@@ -20,6 +20,7 @@
 package org.sonar.plugins.php;
 
 import com.sonar.sslr.api.RecognitionException;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.fs.FileSystem;
@@ -39,7 +40,6 @@
 import org.sonar.php.ini.PhpIniParser;
 import org.sonar.php.ini.tree.PhpIniFile;
 import org.sonar.plugins.php.api.Php;
-import java.util.List;
 
 public class PhpIniSensor implements Sensor {
 

diff --git a/sonar-php-plugin/src/main/java/org/sonar/plugins/php/Scanner.java b/sonar-php-plugin/src/main/java/org/sonar/plugins/php/Scanner.java
@@ -22,7 +22,6 @@
 import java.security.MessageDigest;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.DurationStatistics;

diff --git a/sonar-php-plugin/src/main/java/org/sonar/plugins/php/SymbolScanner.java b/sonar-php-plugin/src/main/java/org/sonar/plugins/php/SymbolScanner.java
@@ -21,8 +21,6 @@
 
 import com.sonar.sslr.api.RecognitionException;
 import com.sonar.sslr.api.typed.ActionParser;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import javax.annotation.CheckForNull;
 import org.slf4j.Logger;

diff --git a/sonar-php-plugin/src/main/java/org/sonar/plugins/php/reports/ReportImporter.java b/sonar-php-plugin/src/main/java/org/sonar/plugins/php/reports/ReportImporter.java
@@ -21,8 +21,8 @@
 
 import java.io.File;
 import java.util.List;
-import org.sonar.api.batch.sensor.SensorContext;
 import org.slf4j.Logger;
+import org.sonar.api.batch.sensor.SensorContext;
 
 public interface ReportImporter {
 

diff --git a/...hp-plugin/src/main/java/org/sonar/plugins/php/reports/phpunit/CoverageResultImporter.java b/...hp-plugin/src/main/java/org/sonar/plugins/php/reports/phpunit/CoverageResultImporter.java
@@ -22,12 +22,12 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.function.Consumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.coverage.NewCoverage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.sonar.plugins.php.reports.phpunit.xml.FileNode;
 import org.sonar.plugins.php.reports.phpunit.xml.LineNode;
 import org.sonar.plugins.php.warning.AnalysisWarningsWrapper;

diff --git a/sonar-php-plugin/src/main/java/org/sonar/plugins/php/reports/phpunit/PhpUnitSensor.java b/sonar-php-plugin/src/main/java/org/sonar/plugins/php/reports/phpunit/PhpUnitSensor.java
@@ -22,14 +22,14 @@
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.util.Iterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.Sensor;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.sonar.plugins.php.api.Php;
 import org.sonar.plugins.php.warning.AnalysisWarningsWrapper;
 

diff --git a/sonar-php-plugin/src/main/java/org/sonar/plugins/php/reports/phpunit/TestFileReport.java b/sonar-php-plugin/src/main/java/org/sonar/plugins/php/reports/phpunit/TestFileReport.java
@@ -28,8 +28,8 @@
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.measures.CoreMetrics;
-import org.sonar.plugins.php.reports.ExternalReportFileHandler;
 import org.sonar.plugins.php.api.Php;
+import org.sonar.plugins.php.reports.ExternalReportFileHandler;
 import org.sonar.plugins.php.reports.phpunit.xml.TestCase;
 
 /**

diff --git a/sonar-php-plugin/src/test/java/org/sonar/plugins/php/PHPRulesDefinitionTest.java b/sonar-php-plugin/src/test/java/org/sonar/plugins/php/PHPRulesDefinitionTest.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.plugins.php;
 
+import java.util.List;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.Test;
 import org.sonar.api.SonarEdition;
 import org.sonar.api.SonarQubeSide;
@@ -27,8 +29,6 @@
 import org.sonar.api.server.rule.RulesDefinition.Rule;
 import org.sonar.api.utils.Version;
 import org.sonar.php.checks.CheckList;
-import java.util.List;
-import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;