Spring/spring-modulith
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1041 - Revamp JavaPackage's sub-package traversal to retain empty intermediate packages.

Browse Source
This commit is contained in:
Oliver Drotbohm
2025-01-25 13:54:43 +01:00
parent 003c4280a4
commit 1cc5719234
6 changed files with 189 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-modulith-core/src/test/java/org/springframework/modulith/core/JavaPackageUnitTests.java
View File

@@ -116,4 +116,16 @@ class JavaPackageUnitTests {
assertThat(first.equals(second)).isTrue();
assertThat(second.equals(first)).isTrue();
}
@Test // GH-1039
void detectsIntermediateSubPackages() {
var packages = TestUtils.getPackage("with").getSubPackages();
assertThat(packages)
.extracting(JavaPackage::getName)
.containsExactly("with.many",
"with.many.intermediate",
"with.many.intermediate.packages");
}
}

16
spring-modulith-core/src/test/java/org/springframework/modulith/core/PackageNameUnitTests.java
View File

@@ -31,12 +31,12 @@ class PackageNameUnitTests {
@Test // GH-578
void sortsPackagesByNameAndDepth() {
var comAcme = new PackageName("com.acme");
var comAcmeA = new PackageName("com.acme.a");
var comAcmeAFirst = new PackageName("com.acme.a.first");
var comAcmeAFirstOne = new PackageName("com.acme.a.first.one");
var comAcmeASecond = new PackageName("com.acme.a.second");
var comAcmeB = new PackageName("com.acme.b");
var comAcme = PackageName.of("com.acme");
var comAcmeA = PackageName.of("com.acme.a");
var comAcmeAFirst = PackageName.of("com.acme.a.first");
var comAcmeAFirstOne = PackageName.of("com.acme.a.first.one");
var comAcmeASecond = PackageName.of("com.acme.a.second");
var comAcmeB = PackageName.of("com.acme.b");
assertThat(List.of(comAcmeAFirstOne, comAcmeB, comAcmeASecond, comAcmeAFirst, comAcme, comAcmeA)
.stream()
@@ -48,8 +48,8 @@ class PackageNameUnitTests {
@Test // GH-802
void caculatesNestingCorrectly() {
var comAcme = new PackageName("com.acme");
var comAcmeA = new PackageName("com.acme.a");
var comAcme = PackageName.of("com.acme");
var comAcmeA = PackageName.of("com.acme.a");
assertThat(comAcme.contains(comAcme)).isTrue();
assertThat(comAcme.contains(comAcmeA)).isTrue();

24
spring-modulith-core/src/test/java/org/springframework/modulith/core/TestUtils.java
View File

@@ -85,10 +85,22 @@ public class TestUtils {
.that(resideInAPackage(packageType.getPackage().getName() + "..")));
}
public static Classes getClasses(String packageName) {
Assert.hasText(packageName, "Package name must not be null or empty!");
return Classes.of(new ClassFileImporter()
.importPackages(packageName));
}
public static JavaPackage getPackage(Class<?> packageType) {
return JavaPackage.of(TestUtils.getClasses(packageType), packageType.getPackageName());
}
public static JavaPackage getPackage(String name) {
return JavaPackage.of(getClasses(name), name);
}
public static ApplicationModule getApplicationModule(String packageName) {
var pkg = getPackage(packageName);
@@ -97,18 +109,6 @@ public class TestUtils {
return new ApplicationModule(source);
}
private static JavaPackage getPackage(String name) {
return JavaPackage.of(getClasses(name), name);
}
private static Classes getClasses(String packageName) {
Assert.hasText(packageName, "Package name must not be null or empty!");
return Classes.of(new ClassFileImporter()
.importPackages(packageName));
}
private static ApplicationModules of(ModulithMetadata metadata, DescribedPredicate<JavaClass> ignores) {
return new ApplicationModules(metadata, ignores, new ImportOption.OnlyIncludeTests()) {};
}

21
spring-modulith-core/src/test/java/with/many/intermediate/packages/Marker.java Normal file
View File

@@ -0,0 +1,21 @@
/*
* Copyright 2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package with.many.intermediate.packages;
/**
* @author Oliver Drotbohm
*/
class Marker {}