SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1214 Fixed ClassUtils check for Servlet API

Browse Source 
Resolves #1214
This commit is contained in:
Oleg Zhurakousky
2018-02-17 07:42:31 -05:00
committed by Soby Chacko
parent bbc43016df
commit cd23e3ada4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/aggregate/AggregateApplicationBuilder.java
View File

@@ -34,7 +34,7 @@ import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics;
import org.springframework.boot.actuate.endpoint.MetricsEndpoint; import org.springframework.boot.actuate.endpoint.MetricsEndpoint;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration;
import org.springframework.boot.bind.PropertySourcesPropertyValues; import org.springframework.boot.bind.PropertySourcesPropertyValues;
import org.springframework.boot.bind.RelaxedDataBinder; import org.springframework.boot.bind.RelaxedDataBinder;
import org.springframework.boot.bind.RelaxedNames; import org.springframework.boot.bind.RelaxedNames;
@@ -49,6 +49,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.core.env.PropertySources; import org.springframework.core.env.PropertySources;
import org.springframework.integration.monitor.IntegrationMBeanExporter; import org.springframework.integration.monitor.IntegrationMBeanExporter;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
@@ -202,7 +203,10 @@ public class AggregateApplicationBuilder implements AggregateApplication, Applic
} }
if (this.parentContext == null) { if (this.parentContext == null) {
if (Boolean.TRUE.equals(this.webEnvironment)) { if (Boolean.TRUE.equals(this.webEnvironment)) {
this.addParentSources(new Object[] { EmbeddedServletContainerAutoConfiguration.class }); Assert.isTrue(ClassUtils.isPresent("javax.servlet.ServletRequest", ClassUtils.getDefaultClassLoader()),
"'webEnvironment' is set to 'true' but 'javax.servlet.*' does not appear to be available in "
+ "the classpath. Consider adding `org.springframework.boot:spring-boot-starter-web");
this.addParentSources(new Object[] { ServletWebServerFactoryAutoConfiguration.class });
} }
this.parentContext = AggregateApplicationUtils.createParentContext( this.parentContext = AggregateApplicationUtils.createParentContext(
this.parentSources.toArray(new Object[0]), this.parentSources.toArray(new Object[0]),