Skip to content

Commit 19c2a07

Browse files
philwebbphilwebb
committed
Merge pull request #4 from gregturn/BS-157
# By Greg Turnquist * BS-157: [BS-157] Fix misnamed method
2 parents 018231d + f8c2091 commit 19c2a07

9 files changed

+23
-23
lines changed

‎spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public InetAddress getAddress() {
159159

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

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

186186
/**
187187
* Returns a mutable list of {@link ServletContextInitializer} that should be applied
188-
* in addition to {@link #getEmbdeddedServletContainer(ServletContextInitializer...)}
188+
* in addition to {@link #getEmbeddedServletContainer(ServletContextInitializer...)}
189189
* parameters.
190190
* @return the initializers
191191
*/

‎spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public interface EmbeddedServletContainerFactory {
4040
* @return a fully configured and started {@link EmbeddedServletContainer}
4141
* @see EmbeddedServletContainer#stop()
4242
*/
43-
EmbeddedServletContainer getEmbdeddedServletContainer(
43+
EmbeddedServletContainer getEmbeddedServletContainer(
4444
ServletContextInitializer... initializers);
4545

4646
}

‎spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private synchronized void createAndStartEmbeddedServletContainer() {
130130
if (this.embeddedServletContainer == null && getServletContext() == null) {
131131
EmbeddedServletContainerFactory containerFactory = getEmbeddedServletContainerFactory();
132132
this.embeddedServletContainer = containerFactory
133-
.getEmbdeddedServletContainer(getSelfInitializer());
133+
.getEmbeddedServletContainer(getSelfInitializer());
134134
} else if (getServletContext() != null) {
135135
try {
136136
getSelfInitializer().onStartup(getServletContext());

‎spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public JettyEmbeddedServletContainerFactory(String contextPath, int port) {
9494
}
9595

9696
@Override
97-
public EmbeddedServletContainer getEmbdeddedServletContainer(
97+
public EmbeddedServletContainer getEmbeddedServletContainer(
9898
ServletContextInitializer... initializers) {
9999
if (getPort() == 0) {
100100
return EmbeddedServletContainer.NONE;

‎spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public TomcatEmbeddedServletContainerFactory(String contextPath, int port) {
105105
}
106106

107107
@Override
108-
public EmbeddedServletContainer getEmbdeddedServletContainer(
108+
public EmbeddedServletContainer getEmbeddedServletContainer(
109109
ServletContextInitializer... initializers) {
110110
if (getPort() == 0) {
111111
return EmbeddedServletContainer.NONE;
@@ -339,7 +339,7 @@ public TomcatEmbeddedServletContainerFactory getChildContextFactory(final String
339339
return new TomcatEmbeddedServletContainerFactory() {
340340

341341
@Override
342-
public EmbeddedServletContainer getEmbdeddedServletContainer(
342+
public EmbeddedServletContainer getEmbeddedServletContainer(
343343
ServletContextInitializer... initializers) {
344344

345345
if (getPort() == 0) {

‎spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void teardown() {
8181
public void startServlet() throws Exception {
8282
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
8383
this.container = factory
84-
.getEmbdeddedServletContainer(exampleServletRegistration());
84+
.getEmbeddedServletContainer(exampleServletRegistration());
8585
assertThat(getResponse("http://localhost:8080/hello"), equalTo("Hello World"));
8686
}
8787

@@ -90,7 +90,7 @@ public void emptyServer() throws Exception {
9090
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
9191
factory.setPort(0);
9292
this.container = factory
93-
.getEmbdeddedServletContainer(exampleServletRegistration());
93+
.getEmbeddedServletContainer(exampleServletRegistration());
9494
this.thrown.expect(ConnectException.class);
9595
this.thrown.expectMessage("Connection refused");
9696
getResponse("http://localhost:8080/hello");
@@ -100,7 +100,7 @@ public void emptyServer() throws Exception {
100100
public void stopServlet() throws Exception {
101101
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
102102
this.container = factory
103-
.getEmbdeddedServletContainer(exampleServletRegistration());
103+
.getEmbeddedServletContainer(exampleServletRegistration());
104104
this.container.stop();
105105
this.thrown.expect(ConnectException.class);
106106
getResponse("http://localhost:8080/hello");
@@ -111,7 +111,7 @@ public void stopServlet() throws Exception {
111111
public void restartWithKeepAlive() throws Exception {
112112
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
113113
this.container = factory
114-
.getEmbdeddedServletContainer(exampleServletRegistration());
114+
.getEmbeddedServletContainer(exampleServletRegistration());
115115

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

122122
this.container.stop();
123123
this.container = factory
124-
.getEmbdeddedServletContainer(exampleServletRegistration());
124+
.getEmbeddedServletContainer(exampleServletRegistration());
125125

126126
GetMethod get2 = new GetMethod("http://localhost:8080/hello");
127127
assertThat(client.executeMethod(get2), equalTo(200));
@@ -131,7 +131,7 @@ public void restartWithKeepAlive() throws Exception {
131131
@Test
132132
public void startServletAndFilter() throws Exception {
133133
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
134-
this.container = factory.getEmbdeddedServletContainer(
134+
this.container = factory.getEmbeddedServletContainer(
135135
exampleServletRegistration(), new FilterRegistrationBean(
136136
new ExampleFilter()));
137137
assertThat(getResponse("http://localhost:8080/hello"), equalTo("[Hello World]"));
@@ -143,7 +143,7 @@ public void startBlocksUntilReadyToServe() throws Exception {
143143
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
144144
final Date[] date = new Date[1];
145145
this.container = factory
146-
.getEmbdeddedServletContainer(new ServletContextInitializer() {
146+
.getEmbeddedServletContainer(new ServletContextInitializer() {
147147
@Override
148148
public void onStartup(ServletContext servletContext)
149149
throws ServletException {
@@ -163,7 +163,7 @@ public void specificPort() throws Exception {
163163
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
164164
factory.setPort(8081);
165165
this.container = factory
166-
.getEmbdeddedServletContainer(exampleServletRegistration());
166+
.getEmbeddedServletContainer(exampleServletRegistration());
167167
assertThat(getResponse("http://localhost:8081/hello"), equalTo("Hello World"));
168168
}
169169

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

@@ -202,7 +202,7 @@ public void contextRootPathMustNotBeSlash() throws Exception {
202202
public void doubleStop() throws Exception {
203203
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
204204
this.container = factory
205-
.getEmbdeddedServletContainer(exampleServletRegistration());
205+
.getEmbeddedServletContainer(exampleServletRegistration());
206206
this.container.stop();
207207
this.container.stop();
208208
}
@@ -216,7 +216,7 @@ public void multipleConfigurations() throws Exception {
216216
}
217217
factory.setInitializers(Arrays.asList(initializers[2], initializers[3]));
218218
factory.addInitializers(initializers[4], initializers[5]);
219-
this.container = factory.getEmbdeddedServletContainer(initializers[0],
219+
this.container = factory.getEmbeddedServletContainer(initializers[0],
220220
initializers[1]);
221221
InOrder ordered = inOrder((Object[]) initializers);
222222
for (ServletContextInitializer initializer : initializers) {
@@ -230,7 +230,7 @@ public void documentRoot() throws Exception {
230230
new FileWriter(this.temporaryFolder.newFile("test.txt")));
231231
AbstractEmbeddedServletContainerFactory factory = getFactory();
232232
factory.setDocumentRoot(this.temporaryFolder.getRoot());
233-
this.container = factory.getEmbdeddedServletContainer();
233+
this.container = factory.getEmbeddedServletContainer();
234234
assertThat(getResponse("http://localhost:8080/test.txt"), equalTo("test"));
235235
}
236236

‎spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class MockEmbeddedServletContainerFactory extends
4949
private MockEmbeddedServletContainer container;
5050

5151
@Override
52-
public EmbeddedServletContainer getEmbdeddedServletContainer(
52+
public EmbeddedServletContainer getEmbeddedServletContainer(
5353
ServletContextInitializer... initializers) {
5454
this.container = spy(new MockEmbeddedServletContainer(initializers, getPort()));
5555
return this.container;

‎spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void jettyConfigurations() throws Exception {
4747
}
4848
factory.setConfigurations(Arrays.asList(configurations[0], configurations[1]));
4949
factory.addConfigurations(configurations[2], configurations[3]);
50-
this.container = factory.getEmbdeddedServletContainer();
50+
this.container = factory.getEmbeddedServletContainer();
5151
InOrder ordered = inOrder((Object[]) configurations);
5252
for (Configuration configuration : configurations) {
5353
ordered.verify(configuration).configure((WebAppContext) anyObject());

‎spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void tomcatListeners() throws Exception {
4848
}
4949
factory.setContextLifecycleListeners(Arrays.asList(listeners[0], listeners[1]));
5050
factory.addContextLifecycleListeners(listeners[2], listeners[3]);
51-
this.container = factory.getEmbdeddedServletContainer();
51+
this.container = factory.getEmbeddedServletContainer();
5252
InOrder ordered = inOrder((Object[]) listeners);
5353
for (LifecycleListener listener : listeners) {
5454
ordered.verify(listener).lifecycleEvent((LifecycleEvent) anyObject());

0 commit comments

Comments
 (0)