Skip to content

Commit 31e4503

Browse files
author
Dave Syer
committed
Switch usage of deprecated class to its replacement
1 parent 3ca1696 commit 31e4503

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

spring-boot-tools/spring-boot-antlib/src/main/java/org/springframework/boot/ant/FindMainClass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.tools.ant.Project;
2525
import org.apache.tools.ant.Task;
2626

27-
import org.springframework.boot.loader.tools.MainClassFinder;
27+
import org.springframework.boot.loader.util.MainClassFinder;
2828
import org.springframework.util.StringUtils;
2929

3030
/**

spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/FindMainClassTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.gradle.api.tasks.TaskAction;
3030

3131
import org.springframework.boot.gradle.SpringBootPluginExtension;
32-
import org.springframework.boot.loader.tools.MainClassFinder;
32+
import org.springframework.boot.loader.util.MainClassFinder;
3333

3434
/**
3535
* Task to find and set the 'mainClassName' convention when it's missing by searching the

spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
import org.junit.rules.ExpectedException;
2727
import org.junit.rules.TemporaryFolder;
2828

29-
import org.springframework.boot.loader.tools.MainClassFinder.ClassNameCallback;
3029
import org.springframework.boot.loader.tools.sample.ClassWithMainMethod;
3130
import org.springframework.boot.loader.tools.sample.ClassWithoutMainMethod;
31+
import org.springframework.boot.loader.util.MainClassFinder;
32+
import org.springframework.boot.loader.util.MainClassFinder.ClassNameCallback;
3233

3334
import static org.assertj.core.api.Assertions.assertThat;
3435

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/MainClassFinder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public static String findSingleMainClass(File rootFolder) throws IOException {
108108
* @return the first callback result or {@code null}
109109
* @throws IOException in case of I/O errors
110110
*/
111-
static <T> T doWithMainClasses(File rootFolder, ClassNameCallback<T> callback)
111+
public static <T> T doWithMainClasses(File rootFolder, ClassNameCallback<T> callback)
112112
throws IOException {
113113
if (!rootFolder.exists()) {
114114
return null; // nothing to do
@@ -199,7 +199,7 @@ public static String findSingleMainClass(JarFile jarFile, String classesLocation
199199
* @return the first callback result or {@code null}
200200
* @throws IOException in case of I/O errors
201201
*/
202-
static <T> T doWithMainClasses(JarFile jarFile, String classesLocation,
202+
public static <T> T doWithMainClasses(JarFile jarFile, String classesLocation,
203203
ClassNameCallback<T> callback) throws IOException {
204204
List<JarEntry> classEntries = getClassEntries(jarFile, classesLocation);
205205
Collections.sort(classEntries, new ClassEntryComparator());

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts;
3939

4040
import org.springframework.boot.loader.tools.FileUtils;
41-
import org.springframework.boot.loader.tools.MainClassFinder;
41+
import org.springframework.boot.loader.util.MainClassFinder;
4242

4343
/**
4444
* Base class to run a spring application.

0 commit comments

Comments
 (0)