Browse Source

Drop getPort from ConfEmbServletContainerFactory

Remove getPort() from ConfigurableEmbeddedServletContainerFactory to
keep the interface primarily setters.
pull/415/merge
Phillip Webb 12 years ago
parent
commit
9c4dc0c68f
  1. 4
      spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
  2. 4
      spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
  3. 6
      spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainerFactory.java

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

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

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

@ -131,9 +131,9 @@ public abstract class AbstractEmbeddedServletContainerFactory implements @@ -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() {
return this.port;
}

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

@ -48,12 +48,6 @@ public interface ConfigurableEmbeddedServletContainerFactory extends @@ -48,12 +48,6 @@ public interface ConfigurableEmbeddedServletContainerFactory extends
*/
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
* expire.

Loading…
Cancel
Save