Skip to content

Commit a007be9

Browse files
committed
Renamed Reactive embedded server class to clarify that it still relies on the Servlet specs
1 parent a4b9ab0 commit a007be9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

aws-serverless-java-container-springboot2/src/main/java/com/amazonaws/serverless/proxy/spring/SpringBootLambdaContainerHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.amazonaws.serverless.proxy.internal.testutils.Timer;
1919
import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
2020
import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
21-
import com.amazonaws.serverless.proxy.spring.embedded.ServerlessReactiveEmbeddedServerFactory;
21+
import com.amazonaws.serverless.proxy.spring.embedded.ServerlessReactiveServletEmbeddedServerFactory;
2222
import com.amazonaws.serverless.proxy.spring.embedded.ServerlessServletEmbeddedServerFactory;
2323
import com.amazonaws.services.lambda.runtime.Context;
2424
import org.slf4j.Logger;
@@ -54,7 +54,7 @@ public class SpringBootLambdaContainerHandler<RequestType, ResponseType> extends
5454
* We need to rely on the static instance of this for SpringBoot because we need it to access the ServletContext.
5555
* Normally, SpringBoot would initialize its own embedded container through the <code>SpringApplication.run()</code>
5656
* method. However, in our case we need to rely on the pre-initialized handler and need to fetch information from it
57-
* for our mock {@link com.amazonaws.serverless.proxy.spring.embedded.ServerlessReactiveEmbeddedServerFactory}.
57+
* for our mock {@link ServerlessReactiveServletEmbeddedServerFactory}.
5858
*
5959
* @return The initialized instance
6060
*/
@@ -167,7 +167,7 @@ private Class<?>[] getEmbeddedContainerClasses() {
167167
// if HandlerAdapter is available we assume they are using WebFlux. Otherwise plain servlet.
168168
this.getClass().getClassLoader().loadClass("org.springframework.web.reactive.HandlerAdapter");
169169
log.debug("Found WebFlux HandlerAdapter on classpath, using reactive server factory");
170-
classes[0] = ServerlessReactiveEmbeddedServerFactory.class;
170+
classes[0] = ServerlessReactiveServletEmbeddedServerFactory.class;
171171
} catch (ClassNotFoundException e) {
172172
classes[0] = ServerlessServletEmbeddedServerFactory.class;
173173
}

aws-serverless-java-container-springboot2/src/main/java/com/amazonaws/serverless/proxy/spring/embedded/ServerlessReactiveEmbeddedServerFactory.java renamed to aws-serverless-java-container-springboot2/src/main/java/com/amazonaws/serverless/proxy/spring/embedded/ServerlessReactiveServletEmbeddedServerFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.util.Enumeration;
1616

1717
@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)
18-
public class ServerlessReactiveEmbeddedServerFactory extends AbstractReactiveWebServerFactory implements WebServer, Servlet {
18+
public class ServerlessReactiveServletEmbeddedServerFactory extends AbstractReactiveWebServerFactory implements WebServer, Servlet {
1919
private ServletHttpHandlerAdapter handler;
2020
private ServletConfig config;
2121
static final String SERVLET_NAME = "com.amazonaws.serverless.proxy.spring.embedded.ServerlessReactiveEmbeddedServerFactory";

0 commit comments

Comments
 (0)