diff --git a/pom.xml b/pom.xml index 83cbe73..3867993 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ ch.rasc wamp2spring-parent - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT pom wamp2spring-parent @@ -45,11 +45,11 @@ UTF-8 - 5.3.26 - 2.7.5 + 6.1.4 + 3.2.3 2.16.1 2.16.1 - 5.7.4 + 6.2.2 ${project.basedir} @@ -68,16 +68,16 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.5 + 3.5.0 org.apache.maven.plugins maven-javadoc-plugin - 3.6.0 + 3.6.3 - https://docs.spring.io/spring-framework/docs/5.3.26/javadoc-api/ - http://docs.oracle.com/javase/8/docs/api/ + https://docs.spring.io/spring-framework/docs/6.1.4/javadoc-api/ + https://docs.oracle.com/en/java/javase/17/docs/api/index.html -Xdoclint:none @@ -85,20 +85,20 @@ org.apache.maven.plugins maven-jxr-plugin - 3.3.0 + 3.3.2 org.apache.maven.plugins maven-pmd-plugin - 3.21.0 + 3.21.2 - 1.8 + 17 org.apache.maven.plugins maven-surefire-report-plugin - 3.1.2 + 3.2.5 @@ -111,10 +111,10 @@ maven-compiler-plugin 3.12.1 - 1.8 - 1.8 - 1.8 - 1.8 + 17 + 17 + 17 + 17 UTF-8 true @@ -138,7 +138,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.5 @@ -184,15 +184,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - 3.6.0 - - -Xdoclint:none - - - com.mycila license-maven-plugin diff --git a/wamp2spring-core/pom.xml b/wamp2spring-core/pom.xml index d058780..9292251 100644 --- a/wamp2spring-core/pom.xml +++ b/wamp2spring-core/pom.xml @@ -4,7 +4,7 @@ ch.rasc wamp2spring-parent - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT @@ -72,14 +72,14 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.mockito mockito-core - 3.12.4 + 5.10.0 test diff --git a/wamp2spring-reactive/pom.xml b/wamp2spring-reactive/pom.xml index 8f5bd70..07a9df9 100644 --- a/wamp2spring-reactive/pom.xml +++ b/wamp2spring-reactive/pom.xml @@ -4,7 +4,7 @@ ch.rasc wamp2spring-parent - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT @@ -41,7 +41,7 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test @@ -76,7 +76,7 @@ org.mockito mockito-core - 3.12.4 + 5.10.0 test diff --git a/wamp2spring-reactive/src/main/java/ch/rasc/wamp2spring/reactive/MessageChannelReactiveUtils.java b/wamp2spring-reactive/src/main/java/ch/rasc/wamp2spring/reactive/MessageChannelReactiveUtils.java index d3f1797..6bae16f 100644 --- a/wamp2spring-reactive/src/main/java/ch/rasc/wamp2spring/reactive/MessageChannelReactiveUtils.java +++ b/wamp2spring-reactive/src/main/java/ch/rasc/wamp2spring/reactive/MessageChannelReactiveUtils.java @@ -51,12 +51,10 @@ public static Publisher> toPublisher(MessageChannel messageChanne if (messageChannel instanceof PollableChannel) { return adaptPollableChannelToPublisher((PollableChannel) messageChannel); } - else { - throw new IllegalArgumentException( - "The 'messageChannel' must be an instance of Publisher, " - + "SubscribableChannel or PollableChannel, not: " - + messageChannel); - } + throw new IllegalArgumentException( + "The 'messageChannel' must be an instance of Publisher, " + + "SubscribableChannel or PollableChannel, not: " + + messageChannel); } private static Publisher> adaptSubscribableChannelToPublisher( @@ -109,7 +107,7 @@ public void subscribe(Subscriber> subscriber) { && (m = this.channel.receive()) != null) { sink.next((Message) m); } - }), FluxSink.OverflowStrategy.IGNORE).subscribeOn(Schedulers.elastic()) + }), FluxSink.OverflowStrategy.IGNORE).subscribeOn(Schedulers.boundedElastic()) .subscribe(subscriber); } diff --git a/wamp2spring-reactive/src/test/java/ch/rasc/wamp2spring/testsupport/BaseWampTest.java b/wamp2spring-reactive/src/test/java/ch/rasc/wamp2spring/testsupport/BaseWampTest.java index 3a1250f..d36c4f8 100644 --- a/wamp2spring-reactive/src/test/java/ch/rasc/wamp2spring/testsupport/BaseWampTest.java +++ b/wamp2spring-reactive/src/test/java/ch/rasc/wamp2spring/testsupport/BaseWampTest.java @@ -27,7 +27,7 @@ import org.msgpack.jackson.dataformat.MessagePackFactory; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.context.TestPropertySource; import org.springframework.web.socket.BinaryMessage; import org.springframework.web.socket.TextMessage; @@ -85,7 +85,7 @@ protected WampMessage sendWampMessage(WampMessage msg, DataFormat dataFormat) WebSocketClient webSocketClient = new StandardWebSocketClient(); try (WebSocketSession webSocketSession = webSocketClient - .doHandshake(result, getHeaders(dataFormat), wampEndpointUrl()).get()) { + .execute(result, getHeaders(dataFormat), wampEndpointUrl()).get()) { List roles = new ArrayList<>(); roles.add(new WampRole("publisher")); @@ -138,7 +138,7 @@ protected WebSocketSession startWebSocketSession(AbstractWebSocketHandler result DataFormat dataFormat) throws InterruptedException, ExecutionException { WebSocketClient webSocketClient = new StandardWebSocketClient(); return webSocketClient - .doHandshake(result, getHeaders(dataFormat), wampEndpointUrl()).get(); + .execute(result, getHeaders(dataFormat), wampEndpointUrl()).get(); } protected WebSocketHttpHeaders getHeaders(DataFormat dataFormat) { diff --git a/wamp2spring-reactive/src/test/java/ch/rasc/wamp2spring/testsupport/WampClient.java b/wamp2spring-reactive/src/test/java/ch/rasc/wamp2spring/testsupport/WampClient.java index 1cb57d8..cc15607 100644 --- a/wamp2spring-reactive/src/test/java/ch/rasc/wamp2spring/testsupport/WampClient.java +++ b/wamp2spring-reactive/src/test/java/ch/rasc/wamp2spring/testsupport/WampClient.java @@ -99,7 +99,7 @@ public void connect(URI wampEndpointUrl) throws InterruptedException, WebSocketClient webSocketClient = new StandardWebSocketClient(); this.webSocketSession = webSocketClient - .doHandshake(this.result, this.headers, wampEndpointUrl).get(); + .execute(this.result, this.headers, wampEndpointUrl).get(); sendMessage(helloMessage); WelcomeMessage welcomeMessage = this.result.getWelcomeMessage(); diff --git a/wamp2spring-security-core/pom.xml b/wamp2spring-security-core/pom.xml index 08c6c84..cef041a 100644 --- a/wamp2spring-security-core/pom.xml +++ b/wamp2spring-security-core/pom.xml @@ -4,7 +4,7 @@ ch.rasc wamp2spring-parent - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT diff --git a/wamp2spring-security-reactive/pom.xml b/wamp2spring-security-reactive/pom.xml index 41309b2..b0c3cf7 100644 --- a/wamp2spring-security-reactive/pom.xml +++ b/wamp2spring-security-reactive/pom.xml @@ -4,7 +4,7 @@ ch.rasc wamp2spring-parent - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT diff --git a/wamp2spring-security-servlet/pom.xml b/wamp2spring-security-servlet/pom.xml index 28d3400..0c57cbb 100644 --- a/wamp2spring-security-servlet/pom.xml +++ b/wamp2spring-security-servlet/pom.xml @@ -4,7 +4,7 @@ ch.rasc wamp2spring-parent - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT diff --git a/wamp2spring-servlet/pom.xml b/wamp2spring-servlet/pom.xml index 0c18eba..f36a704 100644 --- a/wamp2spring-servlet/pom.xml +++ b/wamp2spring-servlet/pom.xml @@ -4,7 +4,7 @@ ch.rasc wamp2spring-parent - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT @@ -36,10 +36,10 @@ - javax.servlet - javax.servlet-api - 4.0.1 - provided + jakarta.servlet + jakarta.servlet-api + 6.0.0 + provided @@ -54,7 +54,7 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test @@ -75,7 +75,7 @@ org.mockito mockito-core - 3.12.4 + 5.10.0 test diff --git a/wamp2spring-servlet/src/test/java/ch/rasc/wamp2spring/testsupport/BaseWampTest.java b/wamp2spring-servlet/src/test/java/ch/rasc/wamp2spring/testsupport/BaseWampTest.java index 35fc7aa..5ef1b82 100644 --- a/wamp2spring-servlet/src/test/java/ch/rasc/wamp2spring/testsupport/BaseWampTest.java +++ b/wamp2spring-servlet/src/test/java/ch/rasc/wamp2spring/testsupport/BaseWampTest.java @@ -27,7 +27,7 @@ import org.msgpack.jackson.dataformat.MessagePackFactory; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.web.socket.BinaryMessage; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketHttpHeaders; @@ -83,7 +83,7 @@ protected WampMessage sendWampMessage(WampMessage msg, DataFormat dataFormat) WebSocketClient webSocketClient = new StandardWebSocketClient(); try (WebSocketSession webSocketSession = webSocketClient - .doHandshake(result, getHeaders(dataFormat), wampEndpointUrl()).get()) { + .execute(result, getHeaders(dataFormat), wampEndpointUrl()).get()) { List roles = new ArrayList<>(); roles.add(new WampRole("publisher")); @@ -136,7 +136,7 @@ protected WebSocketSession startWebSocketSession(AbstractWebSocketHandler result DataFormat dataFormat) throws InterruptedException, ExecutionException { WebSocketClient webSocketClient = new StandardWebSocketClient(); return webSocketClient - .doHandshake(result, getHeaders(dataFormat), wampEndpointUrl()).get(); + .execute(result, getHeaders(dataFormat), wampEndpointUrl()).get(); } protected WebSocketHttpHeaders getHeaders(DataFormat dataFormat) { diff --git a/wamp2spring-servlet/src/test/java/ch/rasc/wamp2spring/testsupport/WampClient.java b/wamp2spring-servlet/src/test/java/ch/rasc/wamp2spring/testsupport/WampClient.java index 563d7a6..17dcd63 100644 --- a/wamp2spring-servlet/src/test/java/ch/rasc/wamp2spring/testsupport/WampClient.java +++ b/wamp2spring-servlet/src/test/java/ch/rasc/wamp2spring/testsupport/WampClient.java @@ -99,7 +99,7 @@ public void connect(URI wampEndpointUrl) throws InterruptedException, WebSocketClient webSocketClient = new StandardWebSocketClient(); this.webSocketSession = webSocketClient - .doHandshake(this.result, this.headers, wampEndpointUrl).get(); + .execute(this.result, this.headers, wampEndpointUrl).get(); sendMessage(helloMessage); WelcomeMessage welcomeMessage = this.result.getWelcomeMessage(); diff --git a/wamp2spring-session-servlet/pom.xml b/wamp2spring-session-servlet/pom.xml index d9ee6f4..d9d2ac2 100644 --- a/wamp2spring-session-servlet/pom.xml +++ b/wamp2spring-session-servlet/pom.xml @@ -4,7 +4,7 @@ ch.rasc wamp2spring-parent - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT @@ -20,7 +20,7 @@ org.springframework.session spring-session-core - 2.7.0 + 3.2.1 @@ -30,12 +30,12 @@ - javax.servlet - javax.servlet-api - 4.0.1 - provided - - + jakarta.servlet + jakarta.servlet-api + 6.0.0 + provided + + com.google.code.findbugs jsr305 diff --git a/wamp2spring-session-servlet/src/main/java/ch/rasc/wamp2spring/session/servlet/SessionRepositoryMessageInterceptor.java b/wamp2spring-session-servlet/src/main/java/ch/rasc/wamp2spring/session/servlet/SessionRepositoryMessageInterceptor.java index d536b2a..01aa753 100644 --- a/wamp2spring-session-servlet/src/main/java/ch/rasc/wamp2spring/session/servlet/SessionRepositoryMessageInterceptor.java +++ b/wamp2spring-session-servlet/src/main/java/ch/rasc/wamp2spring/session/servlet/SessionRepositoryMessageInterceptor.java @@ -18,8 +18,6 @@ import java.time.Instant; import java.util.Map; -import javax.servlet.http.HttpSession; - import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.http.server.ServletServerHttpRequest; @@ -36,6 +34,7 @@ import ch.rasc.wamp2spring.message.GoodbyeMessage; import ch.rasc.wamp2spring.message.HelloMessage; import ch.rasc.wamp2spring.message.WelcomeMessage; +import jakarta.servlet.http.HttpSession; public final class SessionRepositoryMessageInterceptor implements ChannelInterceptor, HandshakeInterceptor {