Merge branch 'biconou_develop_PR_SpringBootMain' into biconou_develop_PR_metrics

master
Rémi Cocula 8 years ago
commit ded37073f2
  1. 11
      libresonic-main/src/main/java/org/libresonic/player/boot/Application.java

@ -150,16 +150,21 @@ public class Application extends SpringBootServletInitializer {
return new ResponseHeaderFilter(); return new ResponseHeaderFilter();
} }
@Override private static SpringApplicationBuilder doConfigure(SpringApplicationBuilder application) {
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
// Customize the application or call application.sources(...) to add sources // Customize the application or call application.sources(...) to add sources
// Since our example is itself a @Configuration class (via @SpringBootApplication) // Since our example is itself a @Configuration class (via @SpringBootApplication)
// we actually don't need to override this method. // we actually don't need to override this method.
return application.sources(Application.class).web(true).initializers(new AdditionalPropertySourceConfigurer()); return application.sources(Application.class).web(true).initializers(new AdditionalPropertySourceConfigurer());
} }
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return doConfigure(application);
}
public static void main(String[] args) { public static void main(String[] args) {
new SpringApplicationBuilder(Application.class).run(args); SpringApplicationBuilder builder = new SpringApplicationBuilder();
doConfigure(builder).run(args);
} }
} }
Loading…
Cancel
Save