Skip to content

Commit e6d4114

Browse files
committed
updated Java Spark to 2.8.0 (core tools 2.1.0) and fixed errors due to upgrade
1 parent c9719cc commit e6d4114

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>net.b07z.sepia.server.core</groupId>
8282
<artifactId>sepia-core-tools</artifactId>
83-
<version>2.0.2</version>
83+
<version>2.1.0</version>
8484
</dependency>
8585
<dependency>
8686
<groupId>com.j2html</groupId>

src/main/java/net/b07z/sepia/websockets/client/SocketClientHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package net.b07z.sepia.websockets.client;
22
import java.net.URI;
33

4+
import org.eclipse.jetty.client.HttpClient;
45
import org.eclipse.jetty.util.ssl.SslContextFactory;
56
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
67
import org.eclipse.jetty.websocket.client.WebSocketClient;
@@ -41,8 +42,9 @@ public SocketClientHandler(SocketClient socket){
4142
if (SocketConfig.isSSL){
4243
SslContextFactory sslContextFactory = new SslContextFactory();
4344
sslContextFactory.setKeyStorePath("Xtensions/SSL/ssl-keystore.jks");
44-
sslContextFactory.setKeyStorePassword(SocketConfig.keystorePwd);
45-
client = new WebSocketClient(sslContextFactory);
45+
sslContextFactory.setKeyStorePassword(SocketConfig.keystorePwd);
46+
client = new WebSocketClient(new HttpClient(sslContextFactory));
47+
//replaced for sparkjava: client = new WebSocketClient(sslContextFactory);
4648
}else{
4749
client = new WebSocketClient();
4850
}

src/main/java/net/b07z/sepia/websockets/server/StartWebSocketServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ public static void main(String[] args) {
135135
SocketServer server = new SepiaSocketHandler();
136136
AbstractSocketHandler.server = server;
137137

138-
webSocket("/messages", AbstractSocketHandler.class);
138+
webSocket("/messages/", AbstractSocketHandler.class); //NOTE: it HAS TO end with "/"
139139
webSocketIdleTimeoutMillis(SocketConfig.IDLE_TIMEOUT);
140-
141140
//init(); //only needed when no REST end-points follow
141+
142142
get("/online", (request, response) -> CoreEndpoints.onlineCheck(request, response));
143143
get("/ping", (request, response) -> CoreEndpoints.ping(request, response, SocketConfig.SERVERNAME));
144144
get("/validate", (request, response) -> CoreEndpoints.validateServer(request, response, SocketConfig.SERVERNAME,

0 commit comments

Comments
 (0)