Skip to content

Commit 12b6a2d

Browse files
committed
GH-1040 - NamedInterfaces.Builder now does not exclude all packages by default.
Polished NamedInterfaces.toString() for easier debugability.
1 parent 5d8cbca commit 12b6a2d

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterfaces.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,18 @@ boolean containsInExplicitInterface(Class<?> type) {
267267
.anyMatch(NamedInterface::isNamed);
268268
}
269269

270+
/*
271+
* (non-Javadoc)
272+
* @see java.lang.Object#toString()
273+
*/
274+
@Override
275+
public String toString() {
276+
277+
return namedInterfaces.stream()
278+
.map(NamedInterface::toString)
279+
.collect(Collectors.joining(System.lineSeparator()));
280+
}
281+
270282
private static NamedInterfaces of(NamedInterface interfaces) {
271283
return new NamedInterfaces(List.of(interfaces));
272284
}
@@ -315,7 +327,7 @@ public static class Builder {
315327
* @param basePackage must not be {@literal null}.
316328
*/
317329
private Builder(JavaPackage basePackage) {
318-
this(basePackage, false, __ -> false, __ -> false);
330+
this(basePackage, false, __ -> false, __ -> true);
319331
}
320332

321333
private Builder(JavaPackage basePackage, boolean recursive,

spring-modulith-core/src/test/java/org/springframework/modulith/core/NamedInterfacesUnitTests.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,18 @@ void createsNamedInterfacesFromRecursiveBuilder() {
130130
"nested.b.second");
131131
}
132132

133+
@Test // GH-1040
134+
void doesNotExcludeAnyPackagesByDefault() {
135+
136+
var pkg = TestUtils.getPackage(RootType.class);
137+
138+
var interfaces = NamedInterfaces.builder(pkg)
139+
.including(__ -> true)
140+
.build();
141+
142+
assertThat(interfaces).hasSizeGreaterThan(1);
143+
}
144+
133145
private static void assertInterfaceContains(NamedInterfaces interfaces, String name, Class<?>... types) {
134146

135147
var classNames = Arrays.stream(types).map(Class::getName).toArray(String[]::new);

0 commit comments

Comments
 (0)