Skip to content

[BS-157] Remove superfluous print statement and fix misnamed method #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[BS-157] Remove superfluous print statement and fix misnamed method #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a13ec81
[BS-157] Remove superfluous print statement and fix misnamed method
gregturn Jun 17, 2013
f97f554
[BS-157] Fix tests that used the name as well
gregturn Jun 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public class MultipartAutoConfiguration {
@ConditionalOnBean(MultipartConfigElement.class)
@Bean
public StandardServletMultipartResolver multipartResolver() {
System.out.println("Loading up a MultipartResolver!!!");
return new StandardServletMultipartResolver();
}

Expand Down
6 changes: 3 additions & 3 deletions ...g/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public InetAddress getAddress() {

/**
* Sets {@link ServletContextInitializer} that should be applied in addition to
* {@link #getEmbdeddedServletContainer(ServletContextInitializer...)} parameters.
* {@link #getEmbeddedServletContainer(ServletContextInitializer...)} parameters.
* This method will replace any previously set or added initializers.
* @param initializers the initializers to set
* @see #addInitializers
Expand All @@ -172,7 +172,7 @@ public void setInitializers(List<? extends ServletContextInitializer> initialize

/**
* Add {@link ServletContextInitializer}s to those that should be applied in addition
* to {@link #getEmbdeddedServletContainer(ServletContextInitializer...)} parameters.
* to {@link #getEmbeddedServletContainer(ServletContextInitializer...)} parameters.
* @param initializers the initializers to add
* @see #setInitializers
* @see #getInitializers
Expand All @@ -185,7 +185,7 @@ public void addInitializers(ServletContextInitializer... initializers) {

/**
* Returns a mutable list of {@link ServletContextInitializer} that should be applied
* in addition to {@link #getEmbdeddedServletContainer(ServletContextInitializer...)}
* in addition to {@link #getEmbeddedServletContainer(ServletContextInitializer...)}
* parameters.
* @return the initializers
*/
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public interface EmbeddedServletContainerFactory {
* @return a fully configured and started {@link EmbeddedServletContainer}
* @see EmbeddedServletContainer#stop()
*/
EmbeddedServletContainer getEmbdeddedServletContainer(
EmbeddedServletContainer getEmbeddedServletContainer(
ServletContextInitializer... initializers);

}
6 changes: 3 additions & 3 deletions ...in/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ private synchronized void createAndStartEmbeddedServletContainer() {
if (this.embeddedServletContainer == null && getServletContext() == null) {
EmbeddedServletContainerFactory containerFactory = getEmbeddedServletContainerFactory();
this.embeddedServletContainer = containerFactory
.getEmbdeddedServletContainer(getSelfInitializer());
.getEmbeddedServletContainer(getSelfInitializer());
} else if (getServletContext() != null) {
try {
getSelfInitializer().onStartup(getServletContext());
Expand Down Expand Up @@ -211,9 +211,9 @@ protected Collection<ServletContextInitializer> getServletContextInitializerBean
initializers.add(initializer);
}

Map<String, MultipartConfigElement> multipartConfigBeans;
MultipartConfigElement multipartConfigElement = null;
multipartConfigBeans = getBeanFactory().getBeansOfType(MultipartConfigElement.class);
Map<String, MultipartConfigElement> multipartConfigBeans =
getBeanFactory().getBeansOfType(MultipartConfigElement.class);
for (MultipartConfigElement bean : multipartConfigBeans.values()) {
multipartConfigElement = bean;
}
Expand Down
2 changes: 1 addition & 1 deletion ...pringframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public JettyEmbeddedServletContainerFactory(String contextPath, int port) {
}

@Override
public EmbeddedServletContainer getEmbdeddedServletContainer(
public EmbeddedServletContainer getEmbeddedServletContainer(
ServletContextInitializer... initializers) {
if (getPort() == 0) {
return EmbeddedServletContainer.NONE;
Expand Down
4 changes: 2 additions & 2 deletions ...ingframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public TomcatEmbeddedServletContainerFactory(String contextPath, int port) {
}

@Override
public EmbeddedServletContainer getEmbdeddedServletContainer(
public EmbeddedServletContainer getEmbeddedServletContainer(
ServletContextInitializer... initializers) {
if (getPort() == 0) {
return EmbeddedServletContainer.NONE;
Expand Down Expand Up @@ -339,7 +339,7 @@ public TomcatEmbeddedServletContainerFactory getChildContextFactory(final String
return new TomcatEmbeddedServletContainerFactory() {

@Override
public EmbeddedServletContainer getEmbdeddedServletContainer(
public EmbeddedServletContainer getEmbeddedServletContainer(
ServletContextInitializer... initializers) {

if (getPort() == 0) {
Expand Down
24 changes: 12 additions & 12 deletions ...ingframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void teardown() {
public void startServlet() throws Exception {
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
this.container = factory
.getEmbdeddedServletContainer(exampleServletRegistration());
.getEmbeddedServletContainer(exampleServletRegistration());
assertThat(getResponse("http://localhost:8080/hello"), equalTo("Hello World"));
}

Expand All @@ -90,7 +90,7 @@ public void emptyServer() throws Exception {
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
factory.setPort(0);
this.container = factory
.getEmbdeddedServletContainer(exampleServletRegistration());
.getEmbeddedServletContainer(exampleServletRegistration());
this.thrown.expect(ConnectException.class);
this.thrown.expectMessage("Connection refused");
getResponse("http://localhost:8080/hello");
Expand All @@ -100,7 +100,7 @@ public void emptyServer() throws Exception {
public void stopServlet() throws Exception {
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
this.container = factory
.getEmbdeddedServletContainer(exampleServletRegistration());
.getEmbeddedServletContainer(exampleServletRegistration());
this.container.stop();
this.thrown.expect(ConnectException.class);
getResponse("http://localhost:8080/hello");
Expand All @@ -111,7 +111,7 @@ public void stopServlet() throws Exception {
public void restartWithKeepAlive() throws Exception {
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
this.container = factory
.getEmbdeddedServletContainer(exampleServletRegistration());
.getEmbeddedServletContainer(exampleServletRegistration());

MultiThreadedHttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
HttpClient client = new HttpClient(connectionManager);
Expand All @@ -121,7 +121,7 @@ public void restartWithKeepAlive() throws Exception {

this.container.stop();
this.container = factory
.getEmbdeddedServletContainer(exampleServletRegistration());
.getEmbeddedServletContainer(exampleServletRegistration());

GetMethod get2 = new GetMethod("http://localhost:8080/hello");
assertThat(client.executeMethod(get2), equalTo(200));
Expand All @@ -131,7 +131,7 @@ public void restartWithKeepAlive() throws Exception {
@Test
public void startServletAndFilter() throws Exception {
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
this.container = factory.getEmbdeddedServletContainer(
this.container = factory.getEmbeddedServletContainer(
exampleServletRegistration(), new FilterRegistrationBean(
new ExampleFilter()));
assertThat(getResponse("http://localhost:8080/hello"), equalTo("[Hello World]"));
Expand All @@ -143,7 +143,7 @@ public void startBlocksUntilReadyToServe() throws Exception {
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
final Date[] date = new Date[1];
this.container = factory
.getEmbdeddedServletContainer(new ServletContextInitializer() {
.getEmbeddedServletContainer(new ServletContextInitializer() {
@Override
public void onStartup(ServletContext servletContext)
throws ServletException {
Expand All @@ -163,7 +163,7 @@ public void specificPort() throws Exception {
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
factory.setPort(8081);
this.container = factory
.getEmbdeddedServletContainer(exampleServletRegistration());
.getEmbeddedServletContainer(exampleServletRegistration());
assertThat(getResponse("http://localhost:8081/hello"), equalTo("Hello World"));
}

Expand All @@ -172,7 +172,7 @@ public void specificContextRoot() throws Exception {
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
factory.setContextPath("/say");
this.container = factory
.getEmbdeddedServletContainer(exampleServletRegistration());
.getEmbeddedServletContainer(exampleServletRegistration());
assertThat(getResponse("http://localhost:8080/say/hello"), equalTo("Hello World"));
}

Expand Down Expand Up @@ -202,7 +202,7 @@ public void contextRootPathMustNotBeSlash() throws Exception {
public void doubleStop() throws Exception {
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
this.container = factory
.getEmbdeddedServletContainer(exampleServletRegistration());
.getEmbeddedServletContainer(exampleServletRegistration());
this.container.stop();
this.container.stop();
}
Expand All @@ -216,7 +216,7 @@ public void multipleConfigurations() throws Exception {
}
factory.setInitializers(Arrays.asList(initializers[2], initializers[3]));
factory.addInitializers(initializers[4], initializers[5]);
this.container = factory.getEmbdeddedServletContainer(initializers[0],
this.container = factory.getEmbeddedServletContainer(initializers[0],
initializers[1]);
InOrder ordered = inOrder((Object[]) initializers);
for (ServletContextInitializer initializer : initializers) {
Expand All @@ -230,7 +230,7 @@ public void documentRoot() throws Exception {
new FileWriter(this.temporaryFolder.newFile("test.txt")));
AbstractEmbeddedServletContainerFactory factory = getFactory();
factory.setDocumentRoot(this.temporaryFolder.getRoot());
this.container = factory.getEmbdeddedServletContainer();
this.container = factory.getEmbeddedServletContainer();
assertThat(getResponse("http://localhost:8080/test.txt"), equalTo("test"));
}

Expand Down
2 changes: 1 addition & 1 deletion ...a/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class MockEmbeddedServletContainerFactory extends
private MockEmbeddedServletContainer container;

@Override
public EmbeddedServletContainer getEmbdeddedServletContainer(
public EmbeddedServletContainer getEmbeddedServletContainer(
ServletContextInitializer... initializers) {
this.container = spy(new MockEmbeddedServletContainer(initializers, getPort()));
return this.container;
Expand Down
2 changes: 1 addition & 1 deletion ...framework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void jettyConfigurations() throws Exception {
}
factory.setConfigurations(Arrays.asList(configurations[0], configurations[1]));
factory.addConfigurations(configurations[2], configurations[3]);
this.container = factory.getEmbdeddedServletContainer();
this.container = factory.getEmbeddedServletContainer();
InOrder ordered = inOrder((Object[]) configurations);
for (Configuration configuration : configurations) {
ordered.verify(configuration).configure((WebAppContext) anyObject());
Expand Down
2 changes: 1 addition & 1 deletion ...amework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void tomcatListeners() throws Exception {
}
factory.setContextLifecycleListeners(Arrays.asList(listeners[0], listeners[1]));
factory.addContextLifecycleListeners(listeners[2], listeners[3]);
this.container = factory.getEmbdeddedServletContainer();
this.container = factory.getEmbeddedServletContainer();
InOrder ordered = inOrder((Object[]) listeners);
for (LifecycleListener listener : listeners) {
ordered.verify(listener).lifecycleEvent((LifecycleEvent) anyObject());
Expand Down