Move persistent collections classes from sonar-java to analyzer-commons

SonarSource · Sep 3, 2021 · 4ac959a · 4ac959a
1 parent 7dbf9cd
commit 4ac959a
Show file tree

Hide file tree

Showing 134 changed files with 135 additions and 2,201 deletions.
diff --git a/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/Expectations.java b/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/Expectations.java
@@ -58,7 +58,7 @@
 import org.sonar.java.RspecKey;
 import org.sonar.java.annotations.VisibleForTesting;
 import org.sonar.java.checks.verifier.CheckVerifier;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.java.reporting.AnalyzerMessage;
 import org.sonar.java.reporting.JavaQuickFix;
 import org.sonar.java.reporting.JavaTextEdit;

diff --git a/...hecks-testkit/src/test/java/org/sonar/java/checks/verifier/internal/ExpectationsTest.java b/...hecks-testkit/src/test/java/org/sonar/java/checks/verifier/internal/ExpectationsTest.java
@@ -28,7 +28,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.java.reporting.AnalyzerMessage.TextSpan;
 import org.sonar.java.reporting.JavaQuickFix;
 import org.sonar.java.reporting.JavaTextEdit;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/AbstractHashAlgorithmChecker.java b/java-checks/src/main/java/org/sonar/java/checks/AbstractHashAlgorithmChecker.java
@@ -26,7 +26,7 @@
 import java.util.Optional;
 import org.sonar.java.checks.helpers.JavaPropertiesHelper;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.tree.ExpressionTree;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/AbstractPrintfChecker.java b/java-checks/src/main/java/org/sonar/java/checks/AbstractPrintfChecker.java
@@ -33,7 +33,7 @@
 import javax.annotation.Nullable;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.java.model.LiteralUtils;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.semantic.Type;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/BooleanInversionCheck.java b/java-checks/src/main/java/org/sonar/java/checks/BooleanInversionCheck.java
@@ -20,7 +20,7 @@
 package org.sonar.java.checks;
 
 import org.sonar.check.Rule;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.tree.BinaryExpressionTree;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/CORSCheck.java b/java-checks/src/main/java/org/sonar/java/checks/CORSCheck.java
@@ -26,7 +26,7 @@
 import java.util.stream.Collectors;
 import org.sonar.check.Rule;
 import org.sonar.java.checks.helpers.ExpressionsHelper;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.JavaFileScannerContext.Location;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/CastArithmeticOperandCheck.java b/java-checks/src/main/java/org/sonar/java/checks/CastArithmeticOperandCheck.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 import javax.annotation.Nullable;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.plugins.java.api.JavaFileScanner;
 import org.sonar.plugins.java.api.JavaFileScannerContext;
 import org.sonar.plugins.java.api.semantic.Symbol;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/CollectionImplementationReferencedCheck.java b/java-checks/src/main/java/org/sonar/java/checks/CollectionImplementationReferencedCheck.java
@@ -25,7 +25,7 @@
 import javax.annotation.Nullable;
 import org.sonar.check.Rule;
 import org.sonar.java.checks.helpers.QuickFixHelper;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.java.model.ModifiersUtils;
 import org.sonar.java.reporting.JavaQuickFix;
 import org.sonar.java.reporting.JavaTextEdit;

diff --git a/...hecks/src/main/java/org/sonar/java/checks/CollectionMethodsWithLinearComplexityCheck.java b/...hecks/src/main/java/org/sonar/java/checks/CollectionMethodsWithLinearComplexityCheck.java
@@ -27,8 +27,8 @@
 import java.util.stream.Stream;
 import javax.annotation.CheckForNull;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.MapBuilder;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/CollectionsEmptyConstantsCheck.java b/java-checks/src/main/java/org/sonar/java/checks/CollectionsEmptyConstantsCheck.java
@@ -20,7 +20,7 @@
 package org.sonar.java.checks;
 
 import org.sonar.check.Rule;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.plugins.java.api.JavaFileScanner;
 import org.sonar.plugins.java.api.JavaFileScannerContext;
 import org.sonar.plugins.java.api.tree.BaseTreeVisitor;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/ConfusingOverloadCheck.java b/java-checks/src/main/java/org/sonar/java/checks/ConfusingOverloadCheck.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Set;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.semantic.Symbol;
 import org.sonar.plugins.java.api.semantic.Type;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/DateUtilsTruncateCheck.java b/java-checks/src/main/java/org/sonar/java/checks/DateUtilsTruncateCheck.java
@@ -23,7 +23,7 @@
 import org.sonar.check.Rule;
 import org.sonar.java.JavaVersionAwareVisitor;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.plugins.java.api.JavaVersion;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/EscapedUnicodeCharactersCheck.java b/java-checks/src/main/java/org/sonar/java/checks/EscapedUnicodeCharactersCheck.java
@@ -27,7 +27,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.java.model.LiteralUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.tree.LiteralTree;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/FilesExistsJDK8Check.java b/java-checks/src/main/java/org/sonar/java/checks/FilesExistsJDK8Check.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 import org.sonar.check.Rule;
 import org.sonar.java.JavaVersionAwareVisitor;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.plugins.java.api.JavaVersion;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/HiddenFieldCheck.java b/java-checks/src/main/java/org/sonar/java/checks/HiddenFieldCheck.java
@@ -30,8 +30,8 @@
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.MapBuilder;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.java.model.JavaTree;
 import org.sonar.java.model.ModifiersUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/IdenticalOperandOnBinaryExpressionCheck.java b/java-checks/src/main/java/org/sonar/java/checks/IdenticalOperandOnBinaryExpressionCheck.java
@@ -25,7 +25,7 @@
 import java.util.Set;
 import javax.annotation.CheckForNull;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.java.model.SyntacticEquivalence;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.JavaFileScannerContext;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/ImmediateReverseBoxingCheck.java b/java-checks/src/main/java/org/sonar/java/checks/ImmediateReverseBoxingCheck.java
@@ -27,7 +27,7 @@
 import java.util.function.Predicate;
 import org.sonar.check.Rule;
 import org.sonar.java.checks.helpers.QuickFixHelper;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.java.reporting.AnalyzerMessage;
 import org.sonar.java.reporting.JavaQuickFix;
 import org.sonar.java.reporting.JavaTextEdit;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/ImmediatelyReturnedVariableCheck.java b/java-checks/src/main/java/org/sonar/java/checks/ImmediatelyReturnedVariableCheck.java
@@ -25,7 +25,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.sonar.check.Rule;
 import org.sonar.java.checks.helpers.QuickFixHelper;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.java.reporting.JavaQuickFix;
 import org.sonar.java.reporting.JavaTextEdit;
 import org.sonar.plugins.java.api.JavaFileScanner;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/IndentationCheck.java b/java-checks/src/main/java/org/sonar/java/checks/IndentationCheck.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
-import org.sonar.java.collections.ListUtils;
+import org.sonarsource.analyzer.commons.collections.ListUtils;
 import org.sonar.java.model.JavaTree;
 import org.sonar.plugins.java.api.JavaFileScanner;
 import org.sonar.plugins.java.api.JavaFileScannerContext;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/JdbcDriverExplicitLoadingCheck.java b/java-checks/src/main/java/org/sonar/java/checks/JdbcDriverExplicitLoadingCheck.java
@@ -23,7 +23,7 @@
 import org.sonar.check.Rule;
 import org.sonar.java.JavaVersionAwareVisitor;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.plugins.java.api.JavaVersion;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/KeySetInsteadOfEntrySetCheck.java b/java-checks/src/main/java/org/sonar/java/checks/KeySetInsteadOfEntrySetCheck.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import javax.annotation.CheckForNull;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.ListUtils;
+import org.sonarsource.analyzer.commons.collections.ListUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.semantic.Symbol;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/LambdaTypeParameterCheck.java b/java-checks/src/main/java/org/sonar/java/checks/LambdaTypeParameterCheck.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.ListUtils;
+import org.sonarsource.analyzer.commons.collections.ListUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.tree.IdentifierTree;
 import org.sonar.plugins.java.api.tree.LambdaExpressionTree;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/LeftCurlyBraceBaseTreeVisitor.java b/java-checks/src/main/java/org/sonar/java/checks/LeftCurlyBraceBaseTreeVisitor.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.java.checks;
 
-import org.sonar.java.collections.ListUtils;
+import org.sonarsource.analyzer.commons.collections.ListUtils;
 import org.sonar.plugins.java.api.JavaCheck;
 import org.sonar.plugins.java.api.JavaFileScanner;
 import org.sonar.plugins.java.api.JavaFileScannerContext;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/NonShortCircuitLogicCheck.java b/java-checks/src/main/java/org/sonar/java/checks/NonShortCircuitLogicCheck.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Map;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.semantic.Type;
 import org.sonar.plugins.java.api.tree.BaseTreeVisitor;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/NullShouldNotBeUsedWithOptionalCheck.java b/java-checks/src/main/java/org/sonar/java/checks/NullShouldNotBeUsedWithOptionalCheck.java
@@ -21,7 +21,7 @@
 
 import java.util.Set;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.java.se.NullableAnnotationUtils;
 import org.sonar.plugins.java.api.JavaFileScanner;
 import org.sonar.plugins.java.api.JavaFileScannerContext;

diff --git a/...s/src/main/java/org/sonar/java/checks/ObjectFinalizeOverridenCallsSuperFinalizeCheck.java b/...s/src/main/java/org/sonar/java/checks/ObjectFinalizeOverridenCallsSuperFinalizeCheck.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import javax.annotation.Nullable;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.ListUtils;
+import org.sonarsource.analyzer.commons.collections.ListUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.semantic.Symbol;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/OperatorPrecedenceCheck.java b/java-checks/src/main/java/org/sonar/java/checks/OperatorPrecedenceCheck.java
@@ -29,7 +29,7 @@
 import java.util.Set;
 import org.apache.commons.lang.BooleanUtils;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.plugins.java.api.JavaFileScanner;
 import org.sonar.plugins.java.api.JavaFileScannerContext;
 import org.sonar.plugins.java.api.tree.AnnotationTree;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/PseudoRandomCheck.java b/java-checks/src/main/java/org/sonar/java/checks/PseudoRandomCheck.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Set;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/RedundantStreamCollectCheck.java b/java-checks/src/main/java/org/sonar/java/checks/RedundantStreamCollectCheck.java
@@ -21,7 +21,7 @@
 
 import java.util.Map;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/ReplaceGuavaWithJavaCheck.java b/java-checks/src/main/java/org/sonar/java/checks/ReplaceGuavaWithJavaCheck.java
@@ -24,7 +24,7 @@
 import java.util.Map;
 import org.sonar.check.Rule;
 import org.sonar.java.JavaVersionAwareVisitor;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
 import org.sonar.plugins.java.api.JavaVersion;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/RestrictedIdentifiersUsageCheck.java b/java-checks/src/main/java/org/sonar/java/checks/RestrictedIdentifiersUsageCheck.java
@@ -20,7 +20,7 @@
 package org.sonar.java.checks;
 
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.tree.IdentifierTree;
 import org.sonar.plugins.java.api.tree.MethodTree;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/SillyEqualsCheck.java b/java-checks/src/main/java/org/sonar/java/checks/SillyEqualsCheck.java
@@ -21,7 +21,7 @@
 
 import org.sonar.check.Rule;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
-import org.sonar.java.collections.ListUtils;
+import org.sonarsource.analyzer.commons.collections.ListUtils;
 import org.sonar.java.model.ExpressionUtils;
 import org.sonar.java.model.JUtils;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/StandardCharsetsConstantsCheck.java b/java-checks/src/main/java/org/sonar/java/checks/StandardCharsetsConstantsCheck.java
@@ -29,8 +29,8 @@
 import java.util.stream.Collectors;
 import org.sonar.check.Rule;
 import org.sonar.java.JavaVersionAwareVisitor;
-import org.sonar.java.collections.ListUtils;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.ListUtils;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
 import org.sonar.plugins.java.api.JavaVersion;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/StringBufferAndBuilderWithCharCheck.java b/java-checks/src/main/java/org/sonar/java/checks/StringBufferAndBuilderWithCharCheck.java
@@ -21,7 +21,7 @@
 
 import java.util.Set;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.plugins.java.api.JavaFileScanner;
 import org.sonar.plugins.java.api.JavaFileScannerContext;
 import org.sonar.plugins.java.api.tree.BaseTreeVisitor;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/SynchronizationOnStringOrBoxedCheck.java b/java-checks/src/main/java/org/sonar/java/checks/SynchronizationOnStringOrBoxedCheck.java
@@ -24,7 +24,7 @@
 import java.util.Optional;
 import java.util.Set;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.semantic.Type;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/SynchronizedClassUsageCheck.java b/java-checks/src/main/java/org/sonar/java/checks/SynchronizedClassUsageCheck.java
@@ -30,7 +30,7 @@
 import java.util.stream.Collectors;
 import org.sonar.check.Rule;
 import org.sonar.java.checks.helpers.ExpressionsHelper;
-import org.sonar.java.collections.MapBuilder;
+import org.sonarsource.analyzer.commons.collections.MapBuilder;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.semantic.Symbol;
 import org.sonar.plugins.java.api.semantic.Type;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/ToStringUsingBoxingCheck.java b/java-checks/src/main/java/org/sonar/java/checks/ToStringUsingBoxingCheck.java
@@ -24,7 +24,7 @@
 import java.util.Set;
 import javax.annotation.CheckForNull;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.tree.ExpressionTree;
 import org.sonar.plugins.java.api.tree.IdentifierTree;

diff --git a/...hecks/src/main/java/org/sonar/java/checks/UnnecessaryEscapeSequencesInTextBlockCheck.java b/...hecks/src/main/java/org/sonar/java/checks/UnnecessaryEscapeSequencesInTextBlockCheck.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Set;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.tree.LiteralTree;
 import org.sonar.plugins.java.api.tree.Tree;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/UnnecessarySemicolonCheck.java b/java-checks/src/main/java/org/sonar/java/checks/UnnecessarySemicolonCheck.java
@@ -20,7 +20,7 @@
 package org.sonar.java.checks;
 
 import org.sonar.check.Rule;
-import org.sonar.java.collections.ListUtils;
+import org.sonarsource.analyzer.commons.collections.ListUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.tree.ListTree;
 import org.sonar.plugins.java.api.tree.Tree;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/WrongAssignmentOperatorCheck.java b/java-checks/src/main/java/org/sonar/java/checks/WrongAssignmentOperatorCheck.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Set;
 import org.sonar.check.Rule;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.tree.AssignmentExpressionTree;
 import org.sonar.plugins.java.api.tree.SyntaxToken;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/helpers/Javadoc.java b/java-checks/src/main/java/org/sonar/java/checks/helpers/Javadoc.java
@@ -36,7 +36,7 @@
 import javax.annotation.Nullable;
 import org.sonar.java.annotations.VisibleForTesting;
 import org.sonar.java.ast.visitors.PublicApiChecker;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.plugins.java.api.tree.ClassTree;
 import org.sonar.plugins.java.api.tree.IdentifierTree;
 import org.sonar.plugins.java.api.tree.MemberSelectExpressionTree;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/helpers/QuickFixHelper.java b/java-checks/src/main/java/org/sonar/java/checks/helpers/QuickFixHelper.java
@@ -31,7 +31,7 @@
 import javax.annotation.Nullable;
 import org.sonar.java.annotations.Beta;
 import org.sonar.java.annotations.VisibleForTesting;
-import org.sonar.java.collections.ListUtils;
+import org.sonarsource.analyzer.commons.collections.ListUtils;
 import org.sonar.java.model.DefaultJavaFileScannerContext;
 import org.sonar.java.model.JavaTree;
 import org.sonar.java.reporting.InternalJavaIssueBuilder;

diff --git a/java-checks/src/main/java/org/sonar/java/checks/helpers/ValueBasedUtils.java b/java-checks/src/main/java/org/sonar/java/checks/helpers/ValueBasedUtils.java
@@ -20,7 +20,7 @@
 package org.sonar.java.checks.helpers;
 
 import java.util.Set;
-import org.sonar.java.collections.SetUtils;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
 import org.sonar.plugins.java.api.semantic.Type;
 import org.sonar.plugins.java.api.semantic.Type.ArrayType;