Issue #3433: Cut down on Checkstyle's dependencies on Guava (part 2) (#3454)

3 files changed, 86 insertions, 14 deletions

diff --git a/config/checkstyle_sevntu_checks.xml b/config/checkstyle_sevntu_checks.xml
index 615a082d3..ebcd9211f 100644
--- a/config/checkstyle_sevntu_checks.xml
+++ b/config/checkstyle_sevntu_checks.xml
@@ -42,7 +42,9 @@
              com.google.common.base.Charsets,com.google.common.base.MoreObjects,
              com.google.common.base.Optional,com.google.common.base.Equivalence,
              com.google.common.base.Preconditions,com.google.common.base.Predicate,
-             com.google.common.io.CharSource,com.google.common.annotations.Beta"/>
+             com.google.common.io.CharSource,com.google.common.annotations.Beta,
+             com.google.common.collect.Queues,com.google.common.collect.Sets,
+             com.google.common.collect.Lists"/>
         </module>
         <module name="ForbidCCommentsInMethods"/>
         <module name="FinalizeImplementationCheck"/>
@@ -108,7 +110,8 @@
             com\.google\.common\.base\.Charsets|com\.google\.common\.base\.MoreObjects|
             com\.google\.common\.base\.Equivalence|com\.google\.common\.base\.Preconditions|
             com\.google\.common\.base\.Optional|com\.google\.common\.io\.CharSource|
-            com\.google\.common\.primitives.*"/>
+            com\.google\.common\.primitives.*|com\.google\.common\.collect\.Sets|
+            com\.google\.common\.collect\.Queues|com\.google\.common\.collect\.Lists"/>
             <property name="forbiddenImportsExcludesRegexp" value=""/>
         </module>
         <module name="ForbidCertainImports">
diff --git a/config/findbugs-exclude.xml b/config/findbugs-exclude.xml
index 17f3274c2..195cfd60f 100644
--- a/config/findbugs-exclude.xml
+++ b/config/findbugs-exclude.xml
@@ -89,6 +89,8 @@
         <!-- beginProcessing() is kind of c-tor -->
         <Class name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpMultilineCheck" />
         <Class name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineCheck" />
+        <!--Uses setters to set fields values-->
+        <Class name="com.puppycrawl.tools.checkstyle.api.AbstractCheck" />
       </Or>
       <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" />
     </Match>
diff --git a/config/import-control.xml b/config/import-control.xml
index 3779acb91..92d1aaf7a 100644
--- a/config/import-control.xml
+++ b/config/import-control.xml
@@ -7,7 +7,6 @@
 
   <allow pkg="antlr"/>
   <allow pkg="org.antlr.v4.runtime"/>
-  <allow pkg="com.google.common.collect"/>
   <allow pkg="com.puppycrawl.tools.checkstyle.api"/>
   <allow pkg="com.puppycrawl.tools.checkstyle.checks"/>
   <allow pkg="java.io"/>
@@ -21,25 +20,31 @@
   <allow pkg="com.puppycrawl.tools.checkstyle"/>
   <allow pkg="java.lang.reflect"/>
 
-  <allow class="com.google.common.annotations.GwtCompatible" />
-  <allow class="com.google.common.annotations.GwtIncompatible"/>
-  <allow class="com.google.common.annotations.VisibleForTesting"/>
-  <allow class="com.google.common.base.Ascii"/>
-  <allow class="com.google.common.base.CaseFormat"/>
-  <allow class="com.google.common.base.CharMatcher"/>
-  <allow class="com.google.common.io.Closeables"/>
-  <allow class="com.google.common.io.Flushables"/>
-  <allow class="com.google.common.io.Files"/>
-  <allow class="com.google.common.reflect.ClassPath"/>
-
   <!-- The local ones -->
   <allow class="java.security.MessageDigest" local-only="true"/>
   <allow class="java.security.NoSuchAlgorithmException" local-only="true"/>
   <allow class="javax.xml.bind.DatatypeConverter" local-only="true"/>
+  <allow class="com.google.common.base.CaseFormat" local-only="true"/>
+  <allow class="com.google.common.io.Closeables" local-only="true"/>
+  <allow class="com.google.common.io.Flushables" local-only="true"/>
+  <allow class="com.google.common.collect.HashMultimap" local-only="true"/>
+  <allow class="com.google.common.collect.ImmutableCollection" local-only="true"/>
+  <allow class="com.google.common.collect.ImmutableList" local-only="true"/>
+  <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
+  <allow class="com.google.common.collect.MapDifference" local-only="true"/>
+  <allow class="com.google.common.collect.Maps" local-only="true"/>
+  <allow class="com.google.common.collect.Multimap" local-only="true"/>
   <allow pkg="com.puppycrawl.tools.checkstyle.grammars" local-only="true"/>
   <allow pkg="org.apache.commons.cli" local-only="true"/>
 
+  <subpackage name="utils">
+    <allow class="com.google.common.base.CharMatcher" local-only="true"/>
+    <allow class="com.google.common.collect.ImmutableCollection" local-only="true"/>
+    <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
+  </subpackage>
+
   <subpackage name="ant">
+    <allow class="com.google.common.io.Closeables" local-only="true"/>
     <allow pkg="org.apache.tools.ant" local-only="true"/>
     <disallow pkg="com.puppycrawl.tools.checkstyle.checks"/>
     <disallow pkg="com.puppycrawl.tools.checkstyle.filters"/>
@@ -57,22 +62,71 @@
            local-only="true"/>
     <allow class="com.puppycrawl.tools.checkstyle.Utils"
            local-only="true"/>
+    <allow class="com.google.common.io.Closeables" local-only="true"/>
+    <allow class="com.google.common.collect.ImmutableCollection" local-only="true"/>
+    <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
   </subpackage>
 
   <subpackage name="checks">
     <allow pkg="com.puppycrawl.tools.checkstyle.checks"/>
     <allow class="com.puppycrawl.tools.checkstyle.Definitions"/>
+    <allow class="com.google.common.io.Files" local-only="true"/>
+    <allow class="com.google.common.io.Closeables" local-only="true"/>
+    <allow class="com.google.common.collect.HashMultiset" local-only="true"/>
+    <allow class="com.google.common.collect.HashMultimap" local-only="true"/>
+    <allow class="com.google.common.collect.ImmutableList" local-only="true"/>
+    <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
+    <allow class="com.google.common.collect.ImmutableMultiset" local-only="true"/>
+    <allow class="com.google.common.collect.ImmutableSet" local-only="true"/>
+    <allow class="com.google.common.collect.Multimap" local-only="true"/>
+    <allow class="com.google.common.collect.Multiset" local-only="true"/>
+    <allow class="com.google.common.collect.Multiset.Entry" local-only="true"/>
+    <allow class="com.google.common.collect.SetMultimap" local-only="true"/>
     <allow pkg="java.math"/>
 
     <subpackage name="indentation">
       <allow pkg="java.lang.reflect"/>
+      <allow class="com.google.common.collect.Range" local-only="true"/>
+      <allow class="com.google.common.collect.RangeMap" local-only="true"/>
     </subpackage>
     <subpackage name="header">
       <allow class="java.nio.charset.Charset" local-only="true"/>
+      <allow class="com.google.common.io.Closeables" local-only="true"/>
+      <allow class="com.google.common.collect.ImmutableList" local-only="true"/>
+      <allow class="com.google.common.collect.ImmutableSet" local-only="true"/>
     </subpackage>
     <subpackage name="javadoc">
       <allow pkg="com.puppycrawl.tools.checkstyle.grammars.javadoc"/>
       <allow pkg="java.lang.reflect"/>
+      <allow class="com.google.common.base.CharMatcher" local-only="true"/>
+      <allow class="com.google.common.annotations.GwtCompatible" local-only="true"/>
+      <allow class="com.google.common.annotations.GwtIncompatible" local-only="true"/>
+      <allow class="com.google.common.collect.ImmutableList" local-only="true"/>
+      <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
+      <allow class="com.google.common.collect.ImmutableSortedSet" local-only="true"/>
+      <allow class="com.google.common.collect.Multiset" local-only="true"/>
+    </subpackage>
+    <subpackage name="whitespace">
+      <allow class="com.google.common.annotations.GwtCompatible" local-only="true"/>
+    </subpackage>
+    <subpackage name="design">
+      <allow class="com.google.common.annotations.VisibleForTesting" local-only="true"/>
+      <allow class="com.google.common.collect.ImmutableList" local-only="true"/>
+      <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
+    </subpackage>
+    <subpackage name="regexp">
+      <allow class="com.google.common.io.Files" local-only="true"/>
+    </subpackage>
+    <subpackage name="imports">
+      <allow class="com.google.common.collect.HashMultimap" local-only="true"/>
+      <allow class="com.google.common.collect.ImmutableSet" local-only="true"/>
+    </subpackage>
+    <subpackage name="coding">
+      <allow class="com.google.common.collect.ImmutableCollection" local-only="true"/>
+      <allow class="com.google.common.collect.ImmutableSet" local-only="true"/>
+    </subpackage>
+    <subpackage name="metrics">
+      <allow class="com.google.common.collect.ImmutableSet" local-only="true"/>
     </subpackage>
   </subpackage>
 
@@ -86,6 +140,11 @@
 
   <subpackage name="filters">
     <allow pkg="java.lang.ref"/>
+    <allow class="com.google.common.io.Closeables" local-only="true"/>
+    <allow class="com.google.common.base.CaseFormat" local-only="true"/>
+    <allow class="com.google.common.collect.ImmutableCollection" local-only="true"/>
+    <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
+    <allow class="com.google.common.collect.ImmutableSet" local-only="true"/>
     <!-- is not possible till pkg is not a regexp -->
     <!-- <disallow pkg="com.puppycrawl.tools.checkstyle.checks.*"/> -->
     <disallow pkg="com.puppycrawl.tools.checkstyle.ant"/>
@@ -96,9 +155,17 @@
   <subpackage name="gui">
     <allow pkg="java.awt"/>
     <allow pkg="javax.swing"/>
+    <allow class="com.google.common.collect.ImmutableList" local-only="true"/>
     <disallow pkg="com.puppycrawl.tools.checkstyle.checks"/>
     <disallow pkg="com.puppycrawl.tools.checkstyle.ant"/>
     <disallow pkg="com.puppycrawl.tools.checkstyle.doclets"/>
     <disallow pkg="com.puppycrawl.tools.checkstyle.filters"/>
   </subpackage>
+
+  <subpackage name="internal">
+    <allow class="com.google.common.reflect.ClassPath" local-only="true"/>
+    <allow class="com.google.common.io.Files" local-only="true"/>
+    <allow class="com.google.common.collect.FluentIterable" local-only="true"/>
+    <allow class="com.google.common.collect.TreeTraverser"/>
+  </subpackage>
 </import-control>