Merge pull request #9609 from murdos/simplify-hexagonali-arch-test

Simplify HexagonalArchTest: compute rootPackagePath on the fly from root package name constant
jhipster · Apr 23, 2024 · 9eec961 · 9eec961
2 parents 6ab9918 + 7154ed1
commit 9eec961
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/...a/tech/jhipster/lite/generator/server/javatool/archunit/domain/ArchUnitModuleFactory.java b/...a/tech/jhipster/lite/generator/server/javatool/archunit/domain/ArchUnitModuleFactory.java
@@ -2,8 +2,6 @@
 
 import static tech.jhipster.lite.module.domain.JHipsterModule.*;
 
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import tech.jhipster.lite.module.domain.JHipsterModule;
 import tech.jhipster.lite.module.domain.LogLevel;
 import tech.jhipster.lite.module.domain.file.JHipsterDestination;
@@ -15,7 +13,6 @@
 
 public class ArchUnitModuleFactory {
 
-  private static final String QUOTE = "\"";
   private static final JHipsterSource SOURCE = from("server/javatool/archunit/test");
 
   public JHipsterModule buildModule(JHipsterModuleProperties properties) {
@@ -26,9 +23,6 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
 
     //@formatter:off
     return moduleBuilder(properties)
-      .context()
-        .put("packageWalkPath", packageWalkPath(packagePath))
-        .and()
       .files()
         .add(SOURCE.template("archunit.properties"), to("src/test/resources/archunit.properties"))
         .add(SOURCE.template("AnnotationArchTest.java"), testDestination.append("AnnotationArchTest.java"))
@@ -42,10 +36,6 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
     //@formatter:on
   }
 
-  private String packageWalkPath(String packagePath) {
-    return Stream.of(packagePath.split("/")).map(folder -> QUOTE + folder + QUOTE).collect(Collectors.joining(", "));
-  }
-
   private JavaDependency archUnitDependency() {
     return javaDependency()
       .groupId("com.tngtech.archunit")

diff --git a/src/main/resources/generator/server/javatool/archunit/test/HexagonalArchTest.java.mustache b/src/main/resources/generator/server/javatool/archunit/test/HexagonalArchTest.java.mustache
@@ -48,8 +48,7 @@ class HexagonalArchTest {
 
   private static Collection<String> packagesWithAnnotation(Class<? extends Annotation> annotationClass) throws AssertionError {
     try {
-      return Files
-        .walk(Paths.get("src", "main", "java", {{packageWalkPath}}))
+      return Files.walk(rootPackagePath())
         .filter(path -> path.toString().endsWith("package-info.java"))
         .map(toPackageName())
         .map(path -> path.replaceAll("[\\/]", "."))
@@ -64,6 +63,10 @@ class HexagonalArchTest {
     }
   }
 
+  private static Path rootPackagePath() {
+    return Stream.of(ROOT_PACKAGE.split("\\.")).map(Paths::get).reduce(Paths.get("src", "main", "java"), Path::resolve);
+  }
+
   private static Function<Path, String> toPackageName() {
     return path -> {
       String stringPath = path.toString();

diff --git a/src/test/java/tech/jhipster/lite/HexagonalArchTest.java b/src/test/java/tech/jhipster/lite/HexagonalArchTest.java
@@ -1,7 +1,6 @@
 package tech.jhipster.lite;
 
-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.*;
 
 import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.core.importer.ClassFileImporter;
@@ -49,7 +48,7 @@ private static Collection<String> buildPackagesPatterns(Collection<String> packa
 
   private static Collection<String> packagesWithAnnotation(Class<? extends Annotation> annotationClass) throws AssertionError {
     try {
-      return Files.walk(Paths.get("src", "main", "java", "tech", "jhipster", "lite"))
+      return Files.walk(rootPackagePath())
         .filter(path -> path.toString().endsWith("package-info.java"))
         .map(toPackageName())
         .map(path -> path.replaceAll("[\\/]", "."))
@@ -64,6 +63,10 @@ private static Collection<String> packagesWithAnnotation(Class<? extends Annotat
     }
   }
 
+  private static Path rootPackagePath() {
+    return Stream.of(ROOT_PACKAGE.split("\\.")).map(Paths::get).reduce(Paths.get("src", "main", "java"), Path::resolve);
+  }
+
   private static Function<Path, String> toPackageName() {
     return path -> {
       String stringPath = path.toString();

diff --git a/...ch/jhipster/lite/generator/server/javatool/archunit/domain/ArchUnitModuleFactoryTest.java b/...ch/jhipster/lite/generator/server/javatool/archunit/domain/ArchUnitModuleFactoryTest.java
@@ -24,9 +24,6 @@ void shouldBuildModule() {
 
     assertThatModuleWithFiles(module, pomFile(), testLogbackFile())
       .hasFiles("src/test/resources/archunit.properties", "src/test/java/com/jhipster/test/AnnotationArchTest.java")
-      .hasFile("src/test/java/com/jhipster/test/HexagonalArchTest.java")
-      .containing("\"src\", \"main\", \"java\", \"com\", \"jhipster\", \"test\"")
-      .and()
       .hasFile("pom.xml")
       .containing("<artifactId>archunit-junit5-api</artifactId>")
       .and()