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

Drop getPort from ConfEmbServletContainerFactory 

Remove getPort() from ConfigurableEmbeddedServletContainerFactory to
keep the interface primarily setters.
This commit is contained in:
Phillip Webb 2014-03-03 18:10:08 -08:00
parent 468728a2c0
commit 9c4dc0c68f
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
View File

@ -25,6 +25,7 @@ import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.context.embedded.AbstractEmbeddedServletContainerFactory;
import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory; import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer; import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
@ -108,7 +109,8 @@ public class ServerPropertiesAutoConfigurationTests {
assertNotNull(server); assertNotNull(server);
// The server.port environment property was not explicitly set so the container // The server.port environment property was not explicitly set so the container
// factory should take precedence... // factory should take precedence...
assertEquals(3000, containerFactory.getPort()); assertEquals(3000,
((AbstractEmbeddedServletContainerFactory) containerFactory).getPort());
} }
@Test @Test

4
spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
View File

@ -131,9 +131,9 @@ public abstract class AbstractEmbeddedServletContainerFactory implements
} }
/** /**
* Returns the port that the embedded servlet container should listen on. * The port that the embedded server listens on.
* @return the port
*/ */
@Override
public int getPort() { public int getPort() {
return this.port; return this.port;
} }

6
spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
View File

@ -48,12 +48,6 @@ public interface ConfigurableEmbeddedServletContainerFactory extends
*/ */
void setPort(int port); void setPort(int port);
/**
* The port that the embedded server listens on.
* @return the port
*/
int getPort();
/** /**
* The session timeout in seconds (default 30). If 0 or negative then sessions never * The session timeout in seconds (default 30). If 0 or negative then sessions never
* expire. * expire.