Skip to content

Commit

Permalink
Merge pull request #14 from agorapulse/fix/getting-the-application-cl…
Browse files Browse the repository at this point in the history
…ass-when-deployed

getting the application object when deployed
  • Loading branch information
musketyr committed Dec 14, 2020
2 parents c5d06f0 + f6b1cc8 commit 82ecfe5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
3 changes: 0 additions & 3 deletions examples/micronaut-grails-example/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,3 @@ RUN rm -rf /usr/local/tomcat/webapps/*
ADD ./build/libs/micronaut-grails-example-3.0.0-SNAPSHOT.war /usr/local/tomcat/webapps/ROOT.war

EXPOSE 8080/tcp
EXPOSE 8000/tcp

ENV CATALINA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000"
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,6 @@ protected void configureEnvironment(ConfigurableEnvironment environment, String[
environment.addActiveProfile(app.getCompatibilityMode().getEnvironment());
}

@Override
public ConfigurableApplicationContext run(String... args) {
System.out.println("Running " + getClass() + " using MicronautGrailsApp");
return super.run(args);
}

@Override
protected ConfigurableApplicationContext createApplicationContext() {
setAllowBeanDefinitionOverriding(true);
Expand Down Expand Up @@ -229,7 +223,12 @@ protected ConfigurableApplicationContext createApplicationContext() {
@Nonnull
private MicronautGrailsAutoConfiguration getApplication() {
try {
return BeanUtils.instantiateClass(getMainApplicationClass(), MicronautGrailsAutoConfiguration.class);
return getAllSources()
.stream()
.filter(s -> s instanceof Class<?> && MicronautGrailsAutoConfiguration.class.isAssignableFrom((Class<?>)s))
.findFirst()
.map(s -> BeanUtils.instantiateClass((Class<?>) s, MicronautGrailsAutoConfiguration.class))
.orElseGet(MicronautGrailsAutoConfiguration::new);
} catch (BeanInstantiationException e) {
LOGGER.error("Failed to instantiate class" + getMainApplicationClass(), e);
return new MicronautGrailsAutoConfiguration();
Expand Down

0 comments on commit 82ecfe5

Please sign in to comment.