Clean up

enofex · Jun 18, 2024 · eb44c8f · eb44c8f
1 parent 3272bc9
commit eb44c8f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 19 deletions.
diff --git a/...ava/com/enofex/taikai/JavaPredicates.java → .../com/enofex/taikai/GeneralPredicates.java b/...ava/com/enofex/taikai/JavaPredicates.java → .../com/enofex/taikai/GeneralPredicates.java
@@ -10,9 +10,9 @@
 import com.tngtech.archunit.lang.ConditionEvents;
 import com.tngtech.archunit.lang.SimpleConditionEvent;
 
-public final class JavaPredicates {
+public final class GeneralPredicates {
 
-  private JavaPredicates() {
+  private GeneralPredicates() {
   }
 
   public static DescribedPredicate<CanBeAnnotated> annotatedWith(String annotation,
@@ -26,6 +26,15 @@ public boolean test(CanBeAnnotated canBeAnnotated) {
     };
   }
 
+  public static DescribedPredicate<JavaClass> areFinal() {
+    return new DescribedPredicate<>("are final") {
+      @Override
+      public boolean test(JavaClass javaClass) {
+        return javaClass.getModifiers().contains(JavaModifier.FINAL);
+      }
+    };
+  }
+
   public static ArchCondition<JavaMethod> notDeclareThrownExceptions() {
     return new ArchCondition<>("not declare thrown exceptions") {
       @Override
@@ -54,15 +63,6 @@ public void check(JavaField field, ConditionEvents events) {
     };
   }
 
-  public static DescribedPredicate<JavaClass> areFinal() {
-    return new DescribedPredicate<>("are final") {
-      @Override
-      public boolean test(JavaClass javaClass) {
-        return javaClass.getModifiers().contains(JavaModifier.FINAL);
-      }
-    };
-  }
-
   public static ArchCondition<JavaClass> beFinal() {
     return new ArchCondition<>("be final") {
       @Override

diff --git a/src/main/java/com/enofex/taikai/java/JavaConfigurer.java b/src/main/java/com/enofex/taikai/java/JavaConfigurer.java
@@ -1,8 +1,8 @@
 package com.enofex.taikai.java;
 
-import static com.enofex.taikai.JavaPredicates.areFinal;
-import static com.enofex.taikai.JavaPredicates.beFinal;
-import static com.enofex.taikai.JavaPredicates.notBePublic;
+import static com.enofex.taikai.GeneralPredicates.areFinal;
+import static com.enofex.taikai.GeneralPredicates.beFinal;
+import static com.enofex.taikai.GeneralPredicates.notBePublic;
 import static com.enofex.taikai.java.Deprecations.notUseDeprecatedAPIs;
 import static com.enofex.taikai.java.HashCodeAndEquals.implementHashCodeAndEquals;
 import static com.enofex.taikai.java.NoSystemOutOrErr.notUseSystemOutOrErr;

diff --git a/src/main/java/com/enofex/taikai/java/UtilityClasses.java b/src/main/java/com/enofex/taikai/java/UtilityClasses.java
@@ -19,7 +19,7 @@ static GivenClassesConjunction utilityClasses() {
     return classes().that(haveOnlyStaticMethods());
   }
 
-  static DescribedPredicate<JavaClass> haveOnlyStaticMethods() {
+  private static DescribedPredicate<JavaClass> haveOnlyStaticMethods() {
     return new DescribedPredicate<>("have only static methods") {
       @Override
       public boolean test(JavaClass javaClass) {

diff --git a/src/main/java/com/enofex/taikai/spring/SpringPredicates.java b/src/main/java/com/enofex/taikai/spring/SpringPredicates.java
@@ -1,6 +1,6 @@
 package com.enofex.taikai.spring;
 
-import static com.enofex.taikai.JavaPredicates.annotatedWith;
+import static com.enofex.taikai.GeneralPredicates.annotatedWith;
 
 import com.tngtech.archunit.base.DescribedPredicate;
 import com.tngtech.archunit.core.domain.properties.CanBeAnnotated;

diff --git a/src/main/java/com/enofex/taikai/test/JUnit5Configurer.java b/src/main/java/com/enofex/taikai/test/JUnit5Configurer.java
@@ -1,6 +1,6 @@
 package com.enofex.taikai.test;
 
-import static com.enofex.taikai.JavaPredicates.notDeclareThrownExceptions;
+import static com.enofex.taikai.GeneralPredicates.notDeclareThrownExceptions;
 import static com.enofex.taikai.test.JUnit5Predicates.ANNOTATION_DISABLED;
 import static com.enofex.taikai.test.JUnit5Predicates.ANNOTATION_DISPLAY_NAME;
 import static com.enofex.taikai.test.JUnit5Predicates.ANNOTATION_PARAMETRIZED_TEST;

diff --git a/src/main/java/com/enofex/taikai/test/JUnit5Predicates.java b/src/main/java/com/enofex/taikai/test/JUnit5Predicates.java
@@ -1,6 +1,6 @@
 package com.enofex.taikai.test;
 
-import static com.enofex.taikai.JavaPredicates.annotatedWith;
+import static com.enofex.taikai.GeneralPredicates.annotatedWith;
 
 import com.tngtech.archunit.base.DescribedPredicate;
 import com.tngtech.archunit.core.domain.properties.CanBeAnnotated;
@@ -12,7 +12,6 @@ final class JUnit5Predicates {
   static final String ANNOTATION_DISABLED = "org.junit.jupiter.api.Disabled";
   static final String ANNOTATION_DISPLAY_NAME = "org.junit.jupiter.api.DisplayName";
 
-
   private JUnit5Predicates() {
   }