Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Johnny Lim
2016-05-10 21:34:46 +09:00
committed by Andy Wilkinson
parent c71f562001
commit 38dc9ec441
12 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View File

@@ -148,7 +148,7 @@ public class JettyEmbeddedServletContainerFactory
/**
* Create a new {@link JettyEmbeddedServletContainerFactory} with the specified
* context path and port.
* @param contextPath root the context path
* @param contextPath the root context path
* @param port the port to listen on
*/
public JettyEmbeddedServletContainerFactory(String contextPath, int port) {

2
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View File

@@ -143,7 +143,7 @@ public class TomcatEmbeddedServletContainerFactory
/**
* Create a new {@link TomcatEmbeddedServletContainerFactory} with the specified
* context path and port.
* @param contextPath root the context path
* @param contextPath the root context path
* @param port the port to listen on
*/
public TomcatEmbeddedServletContainerFactory(String contextPath, int port) {

16
spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java
View File

@@ -92,7 +92,7 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine
* Create a new {@link UndertowEmbeddedServletContainer} instance.
* @param builder the builder
* @param manager the deployment manager
* @param contextPath root the context path
* @param contextPath the root context path
* @param port the port to listen on (not used)
* @param autoStart if the server should be started
* @param compression compression configuration
@@ -109,7 +109,7 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine
* Create a new {@link UndertowEmbeddedServletContainer} instance.
* @param builder the builder
* @param manager the deployment manager
* @param contextPath root the context path
* @param contextPath the root context path
* @param port the port to listen on (not used)
* @param useForwardHeaders if x-forward headers should be used
* @param autoStart if the server should be started
@@ -128,12 +128,12 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine
* Create a new {@link UndertowEmbeddedServletContainer} instance.
* @param builder the builder
* @param manager the deployment manager
* @param contextPath root the context path
* @param contextPath the root context path
* @param port the port to listen on (not used)
* @param useForwardHeaders if x-forward headers should be used
* @param autoStart if the server should be started
* @param compression compression configuration
* @param serverHeader string to be used in http header
* @param serverHeader string to be used in HTTP header
* @deprecated as of 1.4 in favor of
* {@link #UndertowEmbeddedServletContainer(Builder, DeploymentManager, String, boolean, boolean, Compression, String)}
*/
@@ -149,7 +149,7 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine
* Create a new {@link UndertowEmbeddedServletContainer} instance.
* @param builder the builder
* @param manager the deployment manager
* @param contextPath root the context path
* @param contextPath the root context path
* @param autoStart if the server should be started
* @param compression compression configuration
*/
@@ -162,7 +162,7 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine
* Create a new {@link UndertowEmbeddedServletContainer} instance.
* @param builder the builder
* @param manager the deployment manager
* @param contextPath root the context path
* @param contextPath the root context path
* @param useForwardHeaders if x-forward headers should be used
* @param autoStart if the server should be started
* @param compression compression configuration
@@ -178,11 +178,11 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine
* Create a new {@link UndertowEmbeddedServletContainer} instance.
* @param builder the builder
* @param manager the deployment manager
* @param contextPath root the context path
* @param contextPath the root context path
* @param useForwardHeaders if x-forward headers should be used
* @param autoStart if the server should be started
* @param compression compression configuration
* @param serverHeader string to be used in http header
* @param serverHeader string to be used in HTTP header
*/
public UndertowEmbeddedServletContainer(Builder builder, DeploymentManager manager,
String contextPath, boolean useForwardHeaders, boolean autoStart,

2
spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java
View File

@@ -144,7 +144,7 @@ public class UndertowEmbeddedServletContainerFactory
/**
* Create a new {@link UndertowEmbeddedServletContainerFactory} with the specified
* context path and port.
* @param contextPath root the context path
* @param contextPath the root context path
* @param port the port to listen on
*/
public UndertowEmbeddedServletContainerFactory(String contextPath, int port) {

2
spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
View File

@@ -376,8 +376,6 @@ public class ConfigFileApplicationListenerTests {
@Test
public void loadPropertiesThenProfilePropertiesWithOverride() throws Exception {
this.environment.setActiveProfiles("other");
// TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment,
// "spring.profiles.active:other");
this.initializer.setSearchNames("enableprofile");
this.initializer.postProcessEnvironment(this.environment, this.application);
String property = this.environment.getProperty("other.property");