Review: Minor class renaming

codecholeric · codecholeric · commit 264220f34a57 · 2020-01-10T17:39:09.000+01:00
I think `InnerMemberClass` is more narrow than `NonStaticNestedClass`, because technically a local or anonymous class also is a non-static nested class. It might not always be relevant in the context, but `InnerMemberClass` at least gives me a quick understanding of exactly what type of class this is. Also `ClassAccessingLocalClass` is AFAIS a `ClassBeingAccessedByLocalClass` (it does not access the local class, but vice versa, and this is also correct for the test).

Signed-off-by: Peter Gafert &lt;peter.gafert@tngtech.com&gt;
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java
@@ -1491,12 +1491,12 @@ public void notBeMemberClasses(ArchRule rule, Class<?> satisfied, Class<?> viola
 
     @DataProvider
     public static Object[][] beInnerClasses_rules() {
-        Class<?> nonStaticNestedClass = NestedClassWithSomeMoreClasses.NonStaticNestedClass.class;
+        Class<?> innerMemberClass = NestedClassWithSomeMoreClasses.InnerMemberClass.class;
         Class<?> staticNestedClass = NestedClassWithSomeMoreClasses.StaticNestedClass.class;
 
         return $$(
-                $(classes().should().beInnerClasses(), nonStaticNestedClass, staticNestedClass),
-                $(classes().should(ArchConditions.beInnerClasses()), nonStaticNestedClass, staticNestedClass)
+                $(classes().should().beInnerClasses(), innerMemberClass, staticNestedClass),
+                $(classes().should(ArchConditions.beInnerClasses()), innerMemberClass, staticNestedClass)
         );
     }
 
@@ -1513,7 +1513,7 @@ public void beInnerClasses(ArchRule rule, Class<?> satisfied, Class<?> violated)
 
     @DataProvider
     public static Object[][] notBeInnerClasses_rules() {
-        Class<?> nonStaticNestedClass = NestedClassWithSomeMoreClasses.NonStaticNestedClass.class;
+        Class<?> nonStaticNestedClass = NestedClassWithSomeMoreClasses.InnerMemberClass.class;
         Class<?> staticNestedClass = NestedClassWithSomeMoreClasses.StaticNestedClass.class;
 
         return $$(
@@ -1952,7 +1952,7 @@ static class StaticNestedClass {
         }
 
         @SuppressWarnings("InnerClassMayBeStatic")
-        class NonStaticNestedClass {
+        class InnerMemberClass {
         }
 
         static Class<?> getAnonymousClass() {
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenClassesThatTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenClassesThatTest.java
@@ -658,7 +658,7 @@ public void areNotEnums_predicate() {
     public void areTopLevelClasses_predicate() {
         List<JavaClass> classes = filterResultOf(classes().that().areTopLevelClasses())
                 .on(List.class, Map.class, Map.Entry.class, NestedClassWithSomeMoreClasses.class,
-                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.NonStaticNestedClass.class,
+                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.InnerMemberClass.class,
                         NestedClassWithSomeMoreClasses.getAnonymousClass(), NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatClasses(classes).matchInAnyOrder(List.class, Map.class);
@@ -668,33 +668,33 @@ public void areTopLevelClasses_predicate() {
     public void areNotTopLevelClasses_predicate() {
         List<JavaClass> classes = filterResultOf(classes().that().areNotTopLevelClasses())
                 .on(List.class, Map.class, Map.Entry.class, NestedClassWithSomeMoreClasses.class,
-                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.NonStaticNestedClass.class,
+                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.InnerMemberClass.class,
                         NestedClassWithSomeMoreClasses.getAnonymousClass(), NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatClasses(classes)
                 .matchInAnyOrder(Map.Entry.class, NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
     }
 
     @Test
     public void areNestedClasses_predicate() {
         List<JavaClass> classes = filterResultOf(classes().that().areNestedClasses())
                 .on(List.class, Map.class, Map.Entry.class, NestedClassWithSomeMoreClasses.class,
-                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.NonStaticNestedClass.class,
+                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.InnerMemberClass.class,
                         NestedClassWithSomeMoreClasses.getAnonymousClass(), NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatClasses(classes)
                 .matchInAnyOrder(Map.Entry.class, NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
     }
 
     @Test
     public void areNotNestedClasses_predicate() {
         List<JavaClass> classes = filterResultOf(classes().that().areNotNestedClasses())
                 .on(List.class, Map.class, Map.Entry.class, NestedClassWithSomeMoreClasses.class,
-                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.NonStaticNestedClass.class,
+                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.InnerMemberClass.class,
                         NestedClassWithSomeMoreClasses.getAnonymousClass(), NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatClasses(classes).matchInAnyOrder(List.class, Map.class);
@@ -704,19 +704,19 @@ public void areNotNestedClasses_predicate() {
     public void areMemberClasses_predicate() {
         List<JavaClass> classes = filterResultOf(classes().that().areMemberClasses())
                 .on(List.class, Map.class, Map.Entry.class, NestedClassWithSomeMoreClasses.class,
-                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.NonStaticNestedClass.class,
+                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.InnerMemberClass.class,
                         NestedClassWithSomeMoreClasses.getAnonymousClass(), NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatClasses(classes)
                 .matchInAnyOrder(Map.Entry.class, NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class);
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class);
     }
 
     @Test
     public void areNotMemberClasses_predicate() {
         List<JavaClass> classes = filterResultOf(classes().that().areNotMemberClasses())
                 .on(List.class, Map.class, Map.Entry.class, NestedClassWithSomeMoreClasses.class,
-                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.NonStaticNestedClass.class,
+                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.InnerMemberClass.class,
                         NestedClassWithSomeMoreClasses.getAnonymousClass(), NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatClasses(classes).matchInAnyOrder(List.class, Map.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
@@ -727,19 +727,19 @@ public void areNotMemberClasses_predicate() {
     public void areInnerClasses_predicate() {
         List<JavaClass> classes = filterResultOf(classes().that().areInnerClasses())
                 .on(List.class, Map.class, Map.Entry.class, NestedClassWithSomeMoreClasses.class,
-                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.NonStaticNestedClass.class,
+                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.InnerMemberClass.class,
                         NestedClassWithSomeMoreClasses.getAnonymousClass(), NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatClasses(classes)
-                .matchInAnyOrder(NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                .matchInAnyOrder(NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
     }
 
     @Test
     public void areNotInnerClasses_predicate() {
         List<JavaClass> classes = filterResultOf(classes().that().areNotInnerClasses())
                 .on(List.class, Map.class, Map.Entry.class, NestedClassWithSomeMoreClasses.class,
-                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.NonStaticNestedClass.class,
+                        NestedClassWithSomeMoreClasses.StaticNestedClass.class, NestedClassWithSomeMoreClasses.InnerMemberClass.class,
                         NestedClassWithSomeMoreClasses.getAnonymousClass(), NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatClasses(classes).matchInAnyOrder(List.class, Map.class, Map.Entry.class, NestedClassWithSomeMoreClasses.class,
@@ -911,7 +911,7 @@ static class StaticNestedClass {
         }
 
         @SuppressWarnings("InnerClassMayBeStatic")
-        class NonStaticNestedClass {
+        class InnerMemberClass {
         }
 
         static Class<?> getAnonymousClass() {
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersDeclaredInClassesThatTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersDeclaredInClassesThatTest.java
@@ -655,7 +655,7 @@ public void areNotEnums_predicate() {
     public void areTopLevelClasses_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areTopLevelClasses())
                 .on(String.class, NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatMembers(members).matchInAnyOrderMembersOf(String.class);
@@ -665,33 +665,33 @@ public void areTopLevelClasses_predicate() {
     public void areNotTopLevelClasses_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areNotTopLevelClasses())
                 .on(String.class, NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatMembers(members)
                 .matchInAnyOrderMembersOf(NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
     }
 
     @Test
     public void areNestedClasses_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areNestedClasses())
                 .on(String.class, NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatMembers(members)
                 .matchInAnyOrderMembersOf(NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
     }
 
     @Test
     public void areNotNestedClasses_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areNotNestedClasses())
                 .on(String.class, NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatMembers(members).matchInAnyOrderMembersOf(String.class);
@@ -701,19 +701,19 @@ public void areNotNestedClasses_predicate() {
     public void areMemberClasses_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areMemberClasses())
                 .on(String.class, NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatMembers(members)
                 .matchInAnyOrderMembersOf(NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class);
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class);
     }
 
     @Test
     public void areNotMemberClasses_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areNotMemberClasses())
                 .on(String.class, NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatMembers(members).matchInAnyOrderMembersOf(String.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
@@ -724,18 +724,18 @@ public void areNotMemberClasses_predicate() {
     public void areInnerClasses_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areInnerClasses())
                 .on(String.class, NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
 
-        assertThatMembers(members).matchInAnyOrderMembersOf(NestedClassWithSomeMoreClasses.NonStaticNestedClass.class,
+        assertThatMembers(members).matchInAnyOrderMembersOf(NestedClassWithSomeMoreClasses.InnerMemberClass.class,
                 NestedClassWithSomeMoreClasses.getAnonymousClass(), NestedClassWithSomeMoreClasses.getLocalClass());
     }
 
     @Test
     public void areNotInnerClasses_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areNotInnerClasses())
                 .on(String.class, NestedClassWithSomeMoreClasses.class, NestedClassWithSomeMoreClasses.StaticNestedClass.class,
-                        NestedClassWithSomeMoreClasses.NonStaticNestedClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
+                        NestedClassWithSomeMoreClasses.InnerMemberClass.class, NestedClassWithSomeMoreClasses.getAnonymousClass(),
                         NestedClassWithSomeMoreClasses.getLocalClass());
 
         assertThatMembers(members)
@@ -905,7 +905,7 @@ static class StaticNestedClass {
         }
 
         @SuppressWarnings("InnerClassMayBeStatic")
-        class NonStaticNestedClass {
+        class InnerMemberClass {
             String member;
         }
 
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ShouldClassesThatTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ShouldClassesThatTest.java
@@ -837,17 +837,17 @@ public void areNotMemberClasses_predicate(ClassesThat<ClassesShouldConjunction>
     public void areInnerClasses_predicate(ClassesThat<ClassesShouldConjunction> noClassesShouldThatRuleStart) {
         Set<JavaClass> classes = filterClassesAppearingInFailureReport(
                 noClassesShouldThatRuleStart.areInnerClasses())
-                .on(ClassAccessingNonStaticNestedClass.class, ClassAccessingTopLevelClass.class);
+                .on(ClassAccessingInnerMemberClass.class, ClassAccessingTopLevelClass.class);
 
-        assertThatClasses(classes).matchInAnyOrder(ClassAccessingNonStaticNestedClass.class);
+        assertThatClasses(classes).matchInAnyOrder(ClassAccessingInnerMemberClass.class);
     }
 
     @Test
     @UseDataProvider("no_classes_should_that_rule_starts")
     public void areNotInnerClasses_predicate(ClassesThat<ClassesShouldConjunction> noClassesShouldThatRuleStart) {
         Set<JavaClass> classes = filterClassesAppearingInFailureReport(
                 noClassesShouldThatRuleStart.areNotInnerClasses())
-                .on(ClassAccessingNonStaticNestedClass.class, ClassAccessingTopLevelClass.class);
+                .on(ClassAccessingInnerMemberClass.class, ClassAccessingTopLevelClass.class);
 
         assertThatClasses(classes).matchInAnyOrder(ClassAccessingTopLevelClass.class);
     }
@@ -1821,14 +1821,14 @@ static void access() {
         }
     }
 
-    private static class ClassAccessingNonStaticNestedClass {
+    private static class ClassAccessingInnerMemberClass {
         @SuppressWarnings("unused")
         void access() {
-            new NonStaticNestedClass().access();
+            new InnerMemberClass().access();
         }
 
         @SuppressWarnings("InnerClassMayBeStatic")
-        private class NonStaticNestedClass {
+        private class InnerMemberClass {
             void access() {
             }
         }
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ShouldOnlyByClassesThatTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ShouldOnlyByClassesThatTest.java

Original file line number	Diff line number	Diff line change
`@@ -837,17 +837,17 @@ public void areNotMemberClasses_predicate(ClassesThat<ClassesShouldConjunction>`
`837`	`837`	`public void areInnerClasses_predicate(ClassesThat<ClassesShouldConjunction> noClassesShouldThatRuleStart) {`
`838`	`838`	`Set<JavaClass> classes = filterClassesAppearingInFailureReport(`
`839`	`839`	`noClassesShouldThatRuleStart.areInnerClasses())`
`840`		`- .on(ClassAccessingNonStaticNestedClass.class, ClassAccessingTopLevelClass.class);`
	`840`	`+ .on(ClassAccessingInnerMemberClass.class, ClassAccessingTopLevelClass.class);`
`841`	`841`
`842`		`- assertThatClasses(classes).matchInAnyOrder(ClassAccessingNonStaticNestedClass.class);`
	`842`	`+ assertThatClasses(classes).matchInAnyOrder(ClassAccessingInnerMemberClass.class);`
`843`	`843`	`}`
`844`	`844`
`845`	`845`	`@Test`
`846`	`846`	`@UseDataProvider("no_classes_should_that_rule_starts")`
`847`	`847`	`public void areNotInnerClasses_predicate(ClassesThat<ClassesShouldConjunction> noClassesShouldThatRuleStart) {`
`848`	`848`	`Set<JavaClass> classes = filterClassesAppearingInFailureReport(`
`849`	`849`	`noClassesShouldThatRuleStart.areNotInnerClasses())`
`850`		`- .on(ClassAccessingNonStaticNestedClass.class, ClassAccessingTopLevelClass.class);`
	`850`	`+ .on(ClassAccessingInnerMemberClass.class, ClassAccessingTopLevelClass.class);`
`851`	`851`
`852`	`852`	`assertThatClasses(classes).matchInAnyOrder(ClassAccessingTopLevelClass.class);`
`853`	`853`	`}`
`@@ -1821,14 +1821,14 @@ static void access() {`
`1821`	`1821`	`}`
`1822`	`1822`	`}`
`1823`	`1823`
`1824`		`- private static class ClassAccessingNonStaticNestedClass {`
	`1824`	`+ private static class ClassAccessingInnerMemberClass {`
`1825`	`1825`	`@SuppressWarnings("unused")`
`1826`	`1826`	`void access() {`
`1827`		`- new NonStaticNestedClass().access();`
	`1827`	`+ new InnerMemberClass().access();`
`1828`	`1828`	`}`
`1829`	`1829`
`1830`	`1830`	`@SuppressWarnings("InnerClassMayBeStatic")`
`1831`		`- private class NonStaticNestedClass {`
	`1831`	`+ private class InnerMemberClass {`
`1832`	`1832`	`void access() {`
`1833`	`1833`	`}`
`1834`	`1834`	`}`