Skip to content

Commit 4237599

Browse files
committed
ClassPathBuilder recursive(Class)->scan(Class)
This better aligns with Spring's naming of `@ComponentScan`. In this case, the classpath builder is scanning for resources to add to itself rather than components to add to the `ApplicationContext`. Closes gh-48
1 parent 4bc0c1d commit 4237599

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

samples/oauth2-login-custom-config/src/test/java/example/oauth2/login/TestOauth2LoginMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static CommonsExecWebServerFactoryBean authorizationServer() {
3636
.mainClass(Main.class.getName())
3737
.classpath((classpath) -> classpath
3838
.entries(springBootStarter("oauth2-authorization-server"))
39-
.recursive(Main.class)
39+
.scan(Main.class)
4040
);
4141
// @formatter:on
4242
}

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/ClasspathBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ public ClasspathBuilder files(String... classpathEntries) {
3838

3939
/**
4040
* Recursively adds the package of the provided class.
41-
* @param clazz the class to add to the classpath
41+
* @param clazz the class used to determine the basePackage for scanning
4242
* @return the {@link ClasspathBuilder} for additional modifications.
4343
*/
44-
public ClasspathBuilder recursive(Class<?> clazz) {
45-
this.classpath.add(new RecursiveResourceClasspathEntry(clazz));
44+
public ClasspathBuilder scan(Class<?> clazz) {
45+
this.classpath.add(new ScanningClasspathEntry(clazz));
4646
return this;
4747
}
4848

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/CommonsExecWebServerFactoryBean.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class CommonsExecWebServerFactoryBean
6060
Class<?> jarDetector = ClassUtils.resolveClassName(this.mainClass, null);
6161
this.classpath.entries(new ResourceClasspathEntry(
6262
"org/springframework/experimental/boot/testjars/classpath-entries/META-INF/spring.factories",
63-
"META-INF/spring.factories"), new RecursiveResourceClasspathEntry(jarDetector));
63+
"META-INF/spring.factories"), new ScanningClasspathEntry(jarDetector));
6464
}
6565

6666
public static CommonsExecWebServerFactoryBean builder() {
@@ -80,7 +80,7 @@ private static File createApplicationPortFile() {
8080
public CommonsExecWebServerFactoryBean defaultSpringBootApplicationMain() {
8181
mainClass(DEFAULT_SPRING_BOOT_MAIN_CLASSNAME);
8282
Class<?> mainClass = ClassUtils.resolveClassName(DEFAULT_SPRING_BOOT_MAIN_CLASSNAME, null);
83-
return classpath((classpath) -> classpath.recursive(mainClass));
83+
return classpath((classpath) -> classpath.scan(mainClass));
8484
}
8585

8686
public CommonsExecWebServerFactoryBean mainClass(String mainClass) {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
*
3535
* @author Rob Winch
3636
*/
37-
class RecursiveResourceClasspathEntry implements ClasspathEntry {
37+
class ScanningClasspathEntry implements ClasspathEntry {
3838

3939
private final Class<?> clazz;
4040

4141
private Path classpath;
4242

43-
RecursiveResourceClasspathEntry(Class<?> clazz) {
43+
ScanningClasspathEntry(Class<?> clazz) {
4444
this.clazz = clazz;
4545
}
4646

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
2929

30-
class RecursiveResourceClasspathEntryTests {
30+
class ScanningClasspathEntryTests {
3131

32-
private RecursiveResourceClasspathEntry classpathEntry;
32+
private ScanningClasspathEntry classpathEntry;
3333

3434
@AfterEach
3535
void cleanupEach() {
@@ -40,7 +40,7 @@ void cleanupEach() {
4040

4141
@Test
4242
void resolve() {
43-
this.classpathEntry = new RecursiveResourceClasspathEntry(AuthServerMain.class);
43+
this.classpathEntry = new ScanningClasspathEntry(AuthServerMain.class);
4444
List<String> classpath = this.classpathEntry.resolve();
4545
assertThat(classpath).hasSize(1);
4646
File authServerMain = new File(classpath.get(0));
@@ -50,7 +50,7 @@ void resolve() {
5050

5151
@Test
5252
void resolveWhenJar() {
53-
this.classpathEntry = new RecursiveResourceClasspathEntry(OsInfo.class);
53+
this.classpathEntry = new ScanningClasspathEntry(OsInfo.class);
5454
List<String> classpath = this.classpathEntry.resolve();
5555
assertThat(classpath).hasSize(1);
5656
File authServerMain = new File(classpath.get(0));

0 commit comments

Comments
 (0)