Merge branch 'master' into recover-and-try

Author: atakanserin

build.gradle

@@ -43,7 +43,8 @@ plugins {
 ext.ammoniteScalaVersion = '3.5'
 ext.ammoniteVersion = '3.0.0'
 ext.ammoniteVersionQualifier = '2-6342755f'
-ext.assertjVersion = '3.27.0'
+ext.archUnitVersion = '1.3.0'
+ext.assertjVersion = '3.27.1'
 ext.junitVersion = '5.11.4'
 
 // JAVA_VERSION used for CI build matrix, may be provided as env variable
@@ -60,6 +61,7 @@ repositories {
 dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
     testImplementation "org.assertj:assertj-core:$assertjVersion"
+    testImplementation "com.tngtech.archunit:archunit-junit5:$archUnitVersion"
 }
 
 tasks.withType(Test).configureEach {

src/test/java/io/vavr/CheckedRunnableTest.java

@@ -65,11 +65,6 @@ public void shouldApplyAnUncheckedFunctionThatDoesNotThrow() {
     @Test
     public void shouldApplyAnUncheckedFunctionThatThrows() {
         final Runnable runnable = CheckedRunnable.of(() -> { throw new Error(); }).unchecked();
-        try {
-            runnable.run();
-            Assertions.fail("Did expect an exception.");
-        } catch(Error x) {
-            // ok!
-        }
+        Assertions.assertThrows(Error.class, () -> runnable.run());
     }
 }

src/test/java/linter/PackageDepthTest.java

@@ -0,0 +1,39 @@
+package linter;
+
+import com.tngtech.archunit.core.domain.JavaClass;
+import com.tngtech.archunit.core.importer.ClassFileImporter;
+import com.tngtech.archunit.core.importer.ImportOption;
+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.jupiter.api.Test;
+
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
+
+public class PackageDepthTest {
+    @Test
+    void maxTwo() {
+        classes()
+                .should(havePackageDepthLessThanOrEqualTo(1 + 2))
+                .check(new ClassFileImporter()
+                        .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS)
+                        .importPackages("io.vavr"));
+    }
+
+    private static ArchCondition<JavaClass> havePackageDepthLessThanOrEqualTo(int maxDepth) {
+        return new ArchCondition<JavaClass>("have a package depth of " + maxDepth + " or less") {
+            @Override
+            public void check(JavaClass item, ConditionEvents events) {
+                int depth = item.getPackageName().split("\\.").length;
+                if (depth > maxDepth) {
+                    String message = String.format(
+                            "Class %s has a package depth of %d, which exceeds the allowed maximum of %d",
+                            item.getName(), depth, maxDepth
+                    );
+                    events.add(SimpleConditionEvent.violated(item, message));
+                }
+            }
+        };
+    }
+}