Decrease coupling with Guava

2 files changed, 4 insertions, 7 deletions

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginPredicate.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginPredicate.java
index befc42c1ea0..dc39f5c0ced 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginPredicate.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginPredicate.java
@@ -22,6 +22,7 @@ package org.sonar.scanner.bootstrap;
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicate;
 import com.google.common.base.Splitter;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -33,8 +34,6 @@ import org.sonar.api.config.Configuration;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 
-import static com.google.common.collect.Sets.newHashSet;
-
 /**
  * Filters the plugins to be enabled during analysis
  */
@@ -46,8 +45,8 @@ public class ScannerPluginPredicate implements Predicate<String> {
   private static final String BUILDBREAKER_PLUGIN_KEY = "buildbreaker";
   private static final Joiner COMMA_JOINER = Joiner.on(", ");
 
-  private final Set<String> whites = newHashSet();
-  private final Set<String> blacks = newHashSet();
+  private final Set<String> whites = new HashSet<>();
+  private final Set<String> blacks = new HashSet<>();
   private final GlobalMode mode;
 
   public ScannerPluginPredicate(Configuration settings, GlobalMode mode) {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/IssuePattern.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/IssuePattern.java
index 689d4158d8d..a6c50cd4715 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/IssuePattern.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/IssuePattern.java
@@ -19,13 +19,11 @@
  */
 package org.sonar.scanner.issue.ignore.pattern;
 
-import com.google.common.collect.Sets;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
-
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.sonar.api.rule.RuleKey;
@@ -76,7 +74,7 @@ public class IssuePattern {
   }
 
   Set<Integer> getAllLines() {
-    Set<Integer> allLines = Sets.newLinkedHashSet(lines);
+    Set<Integer> allLines = new LinkedHashSet<>(lines);
     for (LineRange lineRange : lineRanges) {
       allLines.addAll(lineRange.toLines());
     }