root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Refactor code to work around Eclipse compiler bug 

Refactor code to work around the Eclipse compiler bug reported at
https://github.com/eclipse-jdt/eclipse.jdt.core/issues/378

Closes gh-32264
This commit is contained in:
Phillip Webb 2022-09-08 18:24:21 -07:00
parent 0555dda63d
commit 127d320636
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@ -456,11 +456,14 @@ public class SpringApplication {
if (this.environment != null) {
return this.environment;
}
return switch (this.webApplicationType) {
case SERVLET -> new ApplicationServletEnvironment();
case REACTIVE -> new ApplicationReactiveWebEnvironment();
default -> new ApplicationEnvironment();
};
switch (this.webApplicationType) {
case SERVLET:
return new ApplicationServletEnvironment();
case REACTIVE:
return new ApplicationReactiveWebEnvironment();
default:
return new ApplicationEnvironment();
}
}
/**

11
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContextFactory.java
View File

@ -33,11 +33,14 @@ class ReactiveWebServerApplicationContextFactory implements ApplicationContextFa
@Override
public ConfigurableApplicationContext create(WebApplicationType webApplicationType) {
if (webApplicationType != WebApplicationType.REACTIVE) {
return null;
return (webApplicationType != WebApplicationType.REACTIVE) ? null : createContext();
}
private ConfigurableApplicationContext createContext() {
if (!AotDetector.useGeneratedArtifacts()) {
return new AnnotationConfigReactiveWebServerApplicationContext();
}
return AotDetector.useGeneratedArtifacts() ? new ReactiveWebServerApplicationContext()
: new AnnotationConfigReactiveWebServerApplicationContext();
return new ReactiveWebServerApplicationContext();
}
}

11
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextFactory.java
View File

@ -33,11 +33,14 @@ class ServletWebServerApplicationContextFactory implements ApplicationContextFac
@Override
public ConfigurableApplicationContext create(WebApplicationType webApplicationType) {
if (webApplicationType != WebApplicationType.SERVLET) {
return null;
return (webApplicationType != WebApplicationType.SERVLET) ? null : createContext();
}
private ConfigurableApplicationContext createContext() {
if (!AotDetector.useGeneratedArtifacts()) {
return new AnnotationConfigServletWebServerApplicationContext();
}
return AotDetector.useGeneratedArtifacts() ? new ServletWebServerApplicationContext()
: new AnnotationConfigServletWebServerApplicationContext();
return new ServletWebServerApplicationContext();
}
}