Skip to content

Upgraded Spark to 2.8.0 #194

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

Upgraded Spark to 2.8.0 #194

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
903c118
Upgraded Spark to 2.8.0
jschwartz73 Oct 3, 2018
5cab2a9
Updated the spark archetype for spark 2.8.0
jschwartz73 Oct 4, 2018
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
2 changes: 1 addition & 1 deletion archetypes/spark/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<jackson.version>2.9.5</jackson.version>
<spark.version>2.7.2</spark.version>
<spark.version>2.8.0</spark.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aws-serverless-java-container-spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</parent>

<properties>
<spark.version>2.7.2</spark.version>
<spark.version>2.8.0</spark.version>
</properties>

<dependencies>
Expand Down
13 changes: 8 additions & 5 deletions ...c/main/java/com/amazonaws/serverless/proxy/spark/embeddedserver/LambdaEmbeddedServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import spark.ExceptionMapper;
import spark.embeddedserver.EmbeddedServer;
import spark.embeddedserver.jetty.websocket.WebSocketHandlerWrapper;
import spark.http.matching.MatcherFilter;
Expand All @@ -24,6 +25,7 @@ public class LambdaEmbeddedServer
//-------------------------------------------------------------

private Routes applicationRoutes;
private ExceptionMapper exceptionMapper;
private MatcherFilter sparkFilter;
private StaticFilesConfiguration staticFilesConfiguration;
private boolean hasMultipleHandler;
Expand All @@ -34,14 +36,15 @@ public class LambdaEmbeddedServer
// Constructors
//-------------------------------------------------------------

LambdaEmbeddedServer(Routes routes, StaticFilesConfiguration filesConfig, boolean multipleHandlers) {
LambdaEmbeddedServer(Routes routes, StaticFilesConfiguration filesConfig, ExceptionMapper exceptionMapper, boolean multipleHandlers) {
Timer.start("SPARK_EMBEDDED_SERVER_CONSTRUCTOR");
applicationRoutes = routes;
staticFilesConfiguration = filesConfig;
hasMultipleHandler = multipleHandlers;
this.exceptionMapper = exceptionMapper;

// try to initialize the filter here.
sparkFilter = new MatcherFilter(applicationRoutes, staticFilesConfiguration, true, hasMultipleHandler);
sparkFilter = new MatcherFilter(applicationRoutes, staticFilesConfiguration, exceptionMapper, true, hasMultipleHandler);
Timer.stop("SPARK_EMBEDDED_SERVER_CONSTRUCTOR");
}

Expand All @@ -50,17 +53,17 @@ public class LambdaEmbeddedServer
// Implementation - EmbeddedServer
//-------------------------------------------------------------
@Override
public int ignite(String s, int i, SslStores sslStores, int i1, int i2, int i3)
public int ignite(String host, int port, SslStores sslStores, int maxThreads, int minThreads, int threadIdleTimeoutMillis)
throws ContainerInitializationException {
Timer.start("SPARK_EMBEDDED_IGNITE");
log.info("Starting Spark server, ignoring port and host");
// if not initialized yet
if (sparkFilter == null) {
sparkFilter = new MatcherFilter(applicationRoutes, staticFilesConfiguration, true, hasMultipleHandler);
sparkFilter = new MatcherFilter(applicationRoutes, staticFilesConfiguration, exceptionMapper, true, hasMultipleHandler);
}
sparkFilter.init(null);
Timer.stop("SPARK_EMBEDDED_IGNITE");
return i;
return port;
}


Expand Down
5 changes: 3 additions & 2 deletions ...java/com/amazonaws/serverless/proxy/spark/embeddedserver/LambdaEmbeddedServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.amazonaws.serverless.proxy.internal.testutils.Timer;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import spark.ExceptionMapper;
import spark.embeddedserver.EmbeddedServer;
import spark.embeddedserver.EmbeddedServerFactory;
import spark.route.Routes;
Expand Down Expand Up @@ -39,10 +40,10 @@ public LambdaEmbeddedServerFactory(LambdaEmbeddedServer server) {


@Override
public EmbeddedServer create(Routes routes, StaticFilesConfiguration staticFilesConfiguration, boolean multipleHandlers) {
public EmbeddedServer create(Routes routes, StaticFilesConfiguration staticFilesConfiguration, ExceptionMapper exceptionMapper, boolean multipleHandlers) {
Timer.start("SPARK_SERVER_FACTORY_CREATE");
if (embeddedServer == null) {
LambdaEmbeddedServerFactory.embeddedServer = new LambdaEmbeddedServer(routes, staticFilesConfiguration, multipleHandlers);
LambdaEmbeddedServerFactory.embeddedServer = new LambdaEmbeddedServer(routes, staticFilesConfiguration, exceptionMapper, multipleHandlers);
}
Timer.stop("SPARK_SERVER_FACTORY_CREATE");
return embeddedServer;
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/com/amazonaws/serverless/proxy/spark/embeddedserver/LambdaEmbeddedServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


public class LambdaEmbeddedServerTest {
private static LambdaEmbeddedServer server = new LambdaEmbeddedServer(null, null, false);
private static LambdaEmbeddedServer server = new LambdaEmbeddedServer(null, null, null, false);

@Test
public void webSocket_configureWebSocket_noException() {
Expand Down
4 changes: 2 additions & 2 deletions samples/spark/pet-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<jackson.version>2.9.4</jackson.version>
<spark.version>2.7.2</spark.version>
<spark.version>2.8.0</spark.version>
</properties>

<dependencies>
<dependency>
<groupId>com.amazonaws.serverless</groupId>
<artifactId>aws-serverless-java-container-spark</artifactId>
<version>[0.1,)</version>
<version>[0.2,)</version>
</dependency>

<!-- https://mvnrepository.com/artifact/com.sparkjava/spark-core -->
Expand Down