Skip to content

Make application class name stable #5060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2019
Merged

Make application class name stable #5060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import java.lang.reflect.Modifier;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

import org.graalvm.nativeimage.ImageInfo;
Expand Down Expand Up @@ -54,8 +53,6 @@ class MainClassBuildStep {
private static final String JAVA_LIBRARY_PATH = "java.library.path";
private static final String JAVAX_NET_SSL_TRUST_STORE = "javax.net.ssl.trustStore";

private static final AtomicInteger COUNT = new AtomicInteger();

@BuildStep
MainClassBuildItem build(List<StaticBytecodeRecorderBuildItem> staticInitTasks,
List<ObjectSubstitutionBuildItem> substitutions,
Expand All @@ -70,12 +67,11 @@ MainClassBuildItem build(List<StaticBytecodeRecorderBuildItem> staticInitTasks,
LaunchModeBuildItem launchMode,
ApplicationInfoBuildItem applicationInfo) {

String appClassName = APP_CLASS + COUNT.incrementAndGet();
appClassNameProducer.produce(new ApplicationClassNameBuildItem(appClassName));
appClassNameProducer.produce(new ApplicationClassNameBuildItem(APP_CLASS));

// Application class
GizmoAdaptor gizmoOutput = new GizmoAdaptor(generatedClass, true);
ClassCreator file = new ClassCreator(gizmoOutput, appClassName, null,
ClassCreator file = new ClassCreator(gizmoOutput, APP_CLASS, null,
Application.class.getName());

// Application class: static init
Expand Down Expand Up @@ -234,7 +230,7 @@ MainClassBuildItem build(List<StaticBytecodeRecorderBuildItem> staticInitTasks,
mv = file.getMethodCreator("main", void.class, String[].class);
mv.setModifiers(Modifier.PUBLIC | Modifier.STATIC);

final ResultHandle appClassInstance = mv.newInstance(ofConstructor(appClassName));
final ResultHandle appClassInstance = mv.newInstance(ofConstructor(APP_CLASS));

// Set the application name
mv.invokeVirtualMethod(ofMethod(Application.class, "setName", void.class, String.class), appClassInstance,
Expand Down
2 changes: 1 addition & 1 deletion ...n-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/QuarkusStreamHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class QuarkusStreamHandler implements RequestStreamHandler {
PrintWriter errorWriter = new PrintWriter(error, true);
if (Application.currentApplication() == null) { // were we already bootstrapped? Needed for mock azure unit testing.
try {
Class appClass = Class.forName("io.quarkus.runner.ApplicationImpl1");
Class appClass = Class.forName("io.quarkus.runner.ApplicationImpl");
String[] args = {};
Application app = (Application) appClass.newInstance();
app.start(args);
Expand Down
2 changes: 1 addition & 1 deletion ...-http/runtime/src/main/java/io/quarkus/azure/functions/resteasy/runtime/BaseFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class BaseFunction {
PrintWriter errorWriter = new PrintWriter(error, true);
if (Application.currentApplication() == null) { // were we already bootstrapped? Needed for mock azure unit testing.
try {
Class appClass = Class.forName("io.quarkus.runner.ApplicationImpl1");
Class appClass = Class.forName("io.quarkus.runner.ApplicationImpl");
String[] args = {};
Application app = (Application) appClass.newInstance();
app.start(args);
Expand Down