Add member syntax

archunit-example/example-junit4/src/test/java/com/tngtech/archunit/exampletest/junit4/DaoRulesTest.java

@@ -1,26 +1,20 @@
 package com.tngtech.archunit.exampletest.junit4;
 
+import java.sql.SQLException;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 
-import com.tngtech.archunit.core.domain.JavaClass;
-import com.tngtech.archunit.core.domain.JavaMethod;
 import com.tngtech.archunit.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchTest;
 import com.tngtech.archunit.junit.ArchUnitRunner;
-import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ArchRule;
-import com.tngtech.archunit.lang.ConditionEvents;
-import com.tngtech.archunit.lang.SimpleConditionEvent;
-import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
-import java.sql.SQLException;
-
-import static com.tngtech.archunit.core.domain.Formatters.formatLocation;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noMethods;
 
 @Category(Example.class)
 @RunWith(ArchUnitRunner.class)
@@ -44,22 +38,6 @@ public class DaoRulesTest {
 
     @ArchTest
     public static final ArchRule DAOs_must_not_throw_SQLException =
-            classes().that().haveNameMatching(".*Dao")
-                    .should(notContainMethodsThrowing(SQLException.class));
-
-    private static ArchCondition<JavaClass> notContainMethodsThrowing(final Class<? extends Exception> exception) {
-        return new ArchCondition<JavaClass>("not contain methods throwing " + exception.getName()) {
-            @Override
-            public void check(JavaClass item, ConditionEvents events) {
-                for (JavaMethod method : item.getMethods()) {
-                    if (method.getThrowsClause().containsType(exception)) {
-                        String message = String.format("%s throws %s in %s",
-                                method.getFullName(), exception.getName(),
-                                formatLocation(method.getOwner(), 0));
-                        events.add(SimpleConditionEvent.violated(method, message));
-                    }
-                }
-            }
-        };
-    }
+            noMethods().that().areDeclaredInClassesThat().haveNameMatching(".*Dao")
+                    .should().declareThrowableOfType(SQLException.class);
 }

archunit-example/example-junit4/src/test/java/com/tngtech/archunit/exampletest/junit4/MethodsTest.java

@@ -0,0 +1,33 @@
+package com.tngtech.archunit.exampletest.junit4;
+
+import com.tngtech.archunit.example.anticorruption.WrappedResult;
+import com.tngtech.archunit.example.security.Secured;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.junit.ArchUnitRunner;
+import com.tngtech.archunit.lang.ArchRule;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.methods;
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noCodeUnits;
+
+@Category(Example.class)
+@RunWith(ArchUnitRunner.class)
+@AnalyzeClasses(packages = "com.tngtech.archunit.example")
+public class MethodsTest {
+
+    @ArchTest
+    public static ArchRule all_public_methods_in_the_controller_layer_should_return_API_response_wrappers =
+            methods()
+                    .that().areDeclaredInClassesThat().resideInAPackage("..anticorruption..")
+                    .and().arePublic()
+                    .should().haveRawReturnType(WrappedResult.class)
+                    .because("we do not want to couple the client code directly to the return types of the encapsulated module");
+
+    @ArchTest
+    public static ArchRule code_units_in_DAO_layer_should_not_be_Secured =
+            noCodeUnits()
+                    .that().areDeclaredInClassesThat().resideInAPackage("..persistence..")
+                    .should().beAnnotatedWith(Secured.class);
+}

archunit-example/example-junit5/src/test/java/com/tngtech/archunit/exampletest/junit5/DaoRulesTest.java

@@ -1,23 +1,18 @@
 package com.tngtech.archunit.exampletest.junit5;
 
+import java.sql.SQLException;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 
-import com.tngtech.archunit.core.domain.JavaClass;
-import com.tngtech.archunit.core.domain.JavaMethod;
 import com.tngtech.archunit.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchTag;
 import com.tngtech.archunit.junit.ArchTest;
-import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ArchRule;
-import com.tngtech.archunit.lang.ConditionEvents;
-import com.tngtech.archunit.lang.SimpleConditionEvent;
-
-import java.sql.SQLException;
 
-import static com.tngtech.archunit.core.domain.Formatters.formatLocation;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noMethods;
 
 @ArchTag("example")
 @AnalyzeClasses(packages = "com.tngtech.archunit.example")
@@ -41,22 +36,6 @@ public class DaoRulesTest {
 
     @ArchTest
     static final ArchRule DAOs_must_not_throw_SQLException =
-            classes().that().haveNameMatching(".*Dao")
-                    .should(notContainMethodsThrowing(SQLException.class));
-
-    private static ArchCondition<JavaClass> notContainMethodsThrowing(final Class<? extends Exception> exception) {
-        return new ArchCondition<JavaClass>("not contain methods throwing " + exception.getName()) {
-            @Override
-            public void check(JavaClass item, ConditionEvents events) {
-                for (JavaMethod method : item.getMethods()) {
-                    if (method.getThrowsClause().containsType(exception)) {
-                        String message = String.format("%s throws %s in %s",
-                                method.getFullName(), exception.getName(),
-                                formatLocation(method.getOwner(), 0));
-                        events.add(SimpleConditionEvent.violated(method, message));
-                    }
-                }
-            }
-        };
-    }
+            noMethods().that().areDeclaredInClassesThat().haveNameMatching(".*Dao")
+                    .should().declareThrowableOfType(SQLException.class);
 }

archunit-example/example-junit5/src/test/java/com/tngtech/archunit/exampletest/junit5/MethodsTest.java

@@ -0,0 +1,30 @@
+package com.tngtech.archunit.exampletest.junit5;
+
+import com.tngtech.archunit.example.anticorruption.WrappedResult;
+import com.tngtech.archunit.example.security.Secured;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTag;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.lang.ArchRule;
+
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.methods;
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noCodeUnits;
+
+@ArchTag("example")
+@AnalyzeClasses(packages = "com.tngtech.archunit.example")
+public class MethodsTest {
+
+    @ArchTest
+    static ArchRule all_public_methods_in_the_controller_layer_should_return_API_response_wrappers =
+            methods()
+                    .that().areDeclaredInClassesThat().resideInAPackage("..anticorruption..")
+                    .and().arePublic()
+                    .should().haveRawReturnType(WrappedResult.class)
+                    .because("we do not want to couple the client code directly to the return types of the encapsulated module");
+
+    @ArchTest
+    static ArchRule code_units_in_DAO_layer_should_not_be_Secured =
+            noCodeUnits()
+                    .that().areDeclaredInClassesThat().resideInAPackage("..persistence..")
+                    .should().beAnnotatedWith(Secured.class);
+}

archunit-example/example-plain/src/main/java/com/tngtech/archunit/example/persistence/WrongSecurityCheck.java

@@ -18,7 +18,7 @@ private void doCustomNonsense() {
         try (FileInputStream fileInput = new FileInputStream(new File("/some/magic/resource.cert"))) {
             certificate = CertificateFactory.getInstance("X509").generateCertificate(fileInput);
         } catch (CertificateException | IOException e) {
-            // we don't handle exceptions, because we're lazy ;-)
+            // we do not handle exceptions, because we're lazy ;-)
         }
     }
 }

archunit-example/example-plain/src/main/java/com/tngtech/archunit/example/persistence/first/dao/jpa/SomeJpa.java

@@ -5,11 +5,16 @@
 
 import com.tngtech.archunit.example.persistence.first.dao.SomeDao;
 import com.tngtech.archunit.example.persistence.first.dao.domain.PersistentObject;
+import com.tngtech.archunit.example.security.Secured;
 
 public class SomeJpa implements SomeDao {
     @PersistenceContext
     private EntityManager entityManager;
 
+    @Secured
+    public SomeJpa() {
+    }
+
     @Override
     public PersistentObject findById(long id) {
         return entityManager.find(PersistentObject.class, id);

archunit-example/example-plain/src/main/java/com/tngtech/archunit/example/persistence/second/dao/jpa/OtherJpa.java

@@ -5,6 +5,7 @@
 
 import com.tngtech.archunit.example.persistence.second.dao.OtherDao;
 import com.tngtech.archunit.example.persistence.second.dao.domain.OtherPersistentObject;
+import com.tngtech.archunit.example.security.Secured;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -20,11 +21,12 @@ public OtherPersistentObject findById(long id) {
 
     @Override
     public void testConnection() throws SQLException {
-        Connection conn = (Connection) entityManager.unwrap(java.sql.Connection.class);
+        Connection conn = entityManager.unwrap(Connection.class);
         conn.prepareStatement("SELECT 1 FROM DUAL");
     }
 
     @Override
+    @Secured
     public EntityManager getEntityManager() {
         return entityManager;
     }