Skip to content

Commit d336efc

Browse files
committed
Remove unnecessary reflection
see #29681
1 parent 9c8d8a7 commit d336efc

File tree

1 file changed

+3
-31
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin

1 file changed

+3
-31
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.io.IOException;
2121
import java.io.InputStreamReader;
2222
import java.io.StringWriter;
23-
import java.lang.reflect.Method;
2423
import java.util.concurrent.Callable;
2524

2625
import org.gradle.api.GradleException;
@@ -30,11 +29,8 @@
3029
import org.gradle.api.distribution.DistributionContainer;
3130
import org.gradle.api.file.CopySpec;
3231
import org.gradle.api.file.FileCollection;
33-
import org.gradle.api.internal.IConventionAware;
3432
import org.gradle.api.plugins.ApplicationPlugin;
3533
import org.gradle.api.plugins.ApplicationPluginConvention;
36-
import org.gradle.api.provider.Property;
37-
import org.gradle.api.provider.Provider;
3834
import org.gradle.api.tasks.TaskProvider;
3935
import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator;
4036
import org.gradle.jvm.application.tasks.CreateStartScripts;
@@ -81,35 +77,11 @@ public void execute(Project project) {
8177
distribution.getContents().with(binCopySpec);
8278
}
8379

84-
@SuppressWarnings("unchecked")
80+
@SuppressWarnings("UnstableApiUsage")
8581
private void configureBaseNameConvention(Project project, ApplicationPluginConvention applicationConvention,
8682
Distribution distribution) {
87-
Method getDistributionBaseName = findMethod(distribution.getClass(), "getDistributionBaseName");
88-
if (getDistributionBaseName != null) {
89-
try {
90-
Property<String> distributionBaseName = (Property<String>) distribution.getClass()
91-
.getMethod("getDistributionBaseName").invoke(distribution);
92-
distributionBaseName.getClass().getMethod("convention", Provider.class).invoke(distributionBaseName,
93-
project.provider(() -> applicationConvention.getApplicationName() + "-boot"));
94-
return;
95-
}
96-
catch (Exception ex) {
97-
// Continue
98-
}
99-
}
100-
if (distribution instanceof IConventionAware) {
101-
((IConventionAware) distribution).getConventionMapping().map("baseName",
102-
() -> applicationConvention.getApplicationName() + "-boot");
103-
}
104-
}
105-
106-
private static Method findMethod(Class<?> type, String name) {
107-
for (Method candidate : type.getMethods()) {
108-
if (candidate.getName().equals(name)) {
109-
return candidate;
110-
}
111-
}
112-
return null;
83+
distribution.getDistributionBaseName()
84+
.convention(project.provider(() -> applicationConvention.getApplicationName() + "-boot"));
11385
}
11486

11587
@Override

0 commit comments

Comments
 (0)