Issue #4676: move AbstractTypeAwareCheck and ClassResolver to javadoc

checkstyle · Aug 6, 2017 · 16f91dd · 16f91dd
1 parent 6cdae0f
commit 16f91dd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/...kstyle/checks/AbstractTypeAwareCheck.java → ...hecks/javadoc/AbstractTypeAwareCheck.java b/...kstyle/checks/AbstractTypeAwareCheck.java → ...hecks/javadoc/AbstractTypeAwareCheck.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.puppycrawl.tools.checkstyle.checks;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 import java.util.ArrayDeque;
 import java.util.Deque;

diff --git a/...ools/checkstyle/checks/ClassResolver.java → ...ckstyle/checks/javadoc/ClassResolver.java b/...ools/checkstyle/checks/ClassResolver.java → ...ckstyle/checks/javadoc/ClassResolver.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.puppycrawl.tools.checkstyle.checks;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java
@@ -36,7 +36,6 @@
 import com.puppycrawl.tools.checkstyle.api.Scope;
 import com.puppycrawl.tools.checkstyle.api.TextBlock;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.checks.AbstractTypeAwareCheck;
 import com.puppycrawl.tools.checkstyle.utils.CheckUtils;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtils;
 import com.puppycrawl.tools.checkstyle.utils.ScopeUtils;

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractTypeAwareCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractTypeAwareCheckTest.java
@@ -35,7 +35,6 @@
 import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
-import com.puppycrawl.tools.checkstyle.checks.AbstractTypeAwareCheck;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtils;
 
 @SuppressWarnings("deprecation")
@@ -64,8 +63,8 @@ public void testIsSubclassWithNulls() throws Exception {
 
     @Test
     public void testTokenToString() throws Exception {
-        final Class<?> tokenType = Class
-                .forName("com.puppycrawl.tools.checkstyle.checks.AbstractTypeAwareCheck$Token");
+        final Class<?> tokenType = Class.forName("com.puppycrawl.tools.checkstyle.checks.javadoc."
+                + "AbstractTypeAwareCheck$Token");
         final Constructor<?> tokenConstructor = tokenType.getDeclaredConstructor(String.class,
                 int.class, int.class);
         final Object token = tokenConstructor.newInstance("blablabla", 1, 1);
@@ -76,12 +75,12 @@ public void testTokenToString() throws Exception {
 
     @Test
     public void testClassRegularClass() throws Exception {
-        final Class<?> tokenType = Class
-                .forName("com.puppycrawl.tools.checkstyle.checks.AbstractTypeAwareCheck$Token");
+        final Class<?> tokenType = Class.forName("com.puppycrawl.tools.checkstyle.checks.javadoc."
+                + "AbstractTypeAwareCheck$Token");
 
         final Class<?> regularClassType = Class
-                .forName(
-                    "com.puppycrawl.tools.checkstyle.checks.AbstractTypeAwareCheck$RegularClass");
+                .forName("com.puppycrawl.tools.checkstyle.checks.javadoc."
+                        + "AbstractTypeAwareCheck$RegularClass");
         final Constructor<?> regularClassConstructor = regularClassType.getDeclaredConstructor(
                 tokenType, String.class, AbstractTypeAwareCheck.class);
         regularClassConstructor.setAccessible(true);
@@ -124,12 +123,12 @@ public void testClassRegularClass() throws Exception {
 
     @Test
     public void testClassAliasToString() throws Exception {
-        final Class<?> tokenType = Class
-                .forName("com.puppycrawl.tools.checkstyle.checks.AbstractTypeAwareCheck$Token");
+        final Class<?> tokenType = Class.forName("com.puppycrawl.tools.checkstyle.checks.javadoc."
+                + "AbstractTypeAwareCheck$Token");
 
         final Class<?> regularClassType = Class
-                .forName(
-                    "com.puppycrawl.tools.checkstyle.checks.AbstractTypeAwareCheck$RegularClass");
+                .forName("com.puppycrawl.tools.checkstyle.checks.javadoc."
+                        + "AbstractTypeAwareCheck$RegularClass");
         final Constructor<?> regularClassConstructor = regularClassType.getDeclaredConstructor(
                 tokenType, String.class, AbstractTypeAwareCheck.class);
         regularClassConstructor.setAccessible(true);
@@ -142,9 +141,10 @@ public void testClassAliasToString() throws Exception {
                 new JavadocMethodCheck());
 
         final Class<?> classAliasType = Class.forName(
-                "com.puppycrawl.tools.checkstyle.checks.AbstractTypeAwareCheck$ClassAlias");
-        final Class<?> abstractTypeInfoType = Class.forName(
-                "com.puppycrawl.tools.checkstyle.checks.AbstractTypeAwareCheck$AbstractClassInfo");
+                "com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractTypeAwareCheck$ClassAlias");
+        final Class<?> abstractTypeInfoType = Class
+                .forName("com.puppycrawl.tools.checkstyle.checks.javadoc."
+                        + "AbstractTypeAwareCheck$AbstractClassInfo");
 
         final Constructor<?> classAliasConstructor = classAliasType
                 .getDeclaredConstructor(tokenType, abstractTypeInfoType);

diff --git a/.../checkstyle/checks/ClassResolverTest.java → ...yle/checks/javadoc/ClassResolverTest.java b/.../checkstyle/checks/ClassResolverTest.java → ...yle/checks/javadoc/ClassResolverTest.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.puppycrawl.tools.checkstyle.checks;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;