bug: SslConfiguration::setProtocol (#9118)

* bug: SslConfiguration::setProtocol * test: Deflake the BinaryWebSocketSpec (#8725) --------- Co-authored-by: Tim Yates <tim.yates@gmail.com>
micronaut-projects · Apr 17, 2023 · 1cdac4a · 1cdac4a
1 parent 77d00c7
commit 1cdac4a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 13 deletions.
diff --git a/...y/src/test/groovy/io/micronaut/http/server/netty/websocket/BinaryChatClientWebSocket.java b/...y/src/test/groovy/io/micronaut/http/server/netty/websocket/BinaryChatClientWebSocket.java
@@ -46,7 +46,7 @@ public void onOpen(String topic, String username, WebSocketSession session) {
         this.topic = topic;
         this.username = username;
         this.session = session;
-        System.out.println("Client session opened for username = " + username);
+        System.out.println("Client session " + session.getId() + " opened for username = " + username);
     }
 
     public String getTopic() {
@@ -72,7 +72,7 @@ public WebSocketSession getSession() {
     @OnMessage
     public void onMessage(
             byte[] message) {
-        System.out.println("Client received message = " + new String(message));
+        System.out.println("Client " + username + " received message = " + new String(message));
         replies.add(new String(message));
     }
 

diff --git a/...y/src/test/groovy/io/micronaut/http/server/netty/websocket/BinaryChatServerWebSocket.java b/...y/src/test/groovy/io/micronaut/http/server/netty/websocket/BinaryChatServerWebSocket.java
@@ -36,7 +36,7 @@ public void onOpen(String topic, String username, WebSocketSession session) {
             if(isValid(topic, session, openSession)) {
                 String msg = "[" + username + "] Joined!";
                 System.out.println("Server sending msg = " + msg);
-                openSession.sendSync(msg.getBytes());
+                openSession.sendAsync(msg.getBytes());
             }
         }
     }
@@ -55,7 +55,7 @@ public void onMessage(
             if(isValid(topic, session, openSession)) {
                 String msg = "[" + username + "] " + new String(message);
                 System.out.println("Server sending msg = " + msg);
-                openSession.sendSync(msg.getBytes());
+                openSession.sendAsync(msg.getBytes());
             }
         }
     }
@@ -72,7 +72,7 @@ public void onClose(
             if(isValid(topic, session, openSession)) {
                 String msg = "[" + username + "] Disconnected!";
                 System.out.println("Server sending msg = " + msg);
-                openSession.sendSync(msg.getBytes());
+                openSession.sendAsync(msg.getBytes());
             }
         }
     }

diff --git a/...netty/src/test/groovy/io/micronaut/http/server/netty/websocket/BinaryWebSocketSpec.groovy b/...netty/src/test/groovy/io/micronaut/http/server/netty/websocket/BinaryWebSocketSpec.groovy
@@ -32,17 +32,14 @@ import jakarta.inject.Singleton
 import reactor.core.publisher.Flux
 import reactor.core.publisher.Mono
 import spock.lang.Issue
-import spock.lang.Retry
 import spock.lang.Specification
 import spock.util.concurrent.PollingConditions
 
 import java.nio.ByteBuffer
 import java.nio.charset.StandardCharsets
 
-@Retry
 class BinaryWebSocketSpec extends Specification {
 
-    @Retry
     void "test binary websocket exchange"() {
         given:
         EmbeddedServer embeddedServer = ApplicationContext.builder('micronaut.server.netty.log-level':'TRACE').run(EmbeddedServer)
@@ -69,7 +66,6 @@ class BinaryWebSocketSpec extends Specification {
             fred.replies.size() == 1
         }
 
-
         when:"A message is sent"
         fred.send("Hello bob!".bytes)
 
@@ -86,7 +82,6 @@ class BinaryWebSocketSpec extends Specification {
 
         then:
         conditions.eventually {
-
             fred.replies.contains("[bob] Hi fred. How are things?")
             fred.replies.size() == 2
             bob.replies.contains("[fred] Hello bob!")
@@ -99,8 +94,6 @@ class BinaryWebSocketSpec extends Specification {
 
         when:
         bob.close()
-        sleep(1000)
-
 
         then:
         conditions.eventually {

diff --git a/http/src/main/java/io/micronaut/http/ssl/SslConfiguration.java b/http/src/main/java/io/micronaut/http/ssl/SslConfiguration.java
@@ -252,7 +252,7 @@ public void setProtocols(String[] protocols) {
      * @param protocol The protocol
      */
     public void setProtocol(String protocol) {
-        if (!StringUtils.isNotEmpty(protocol)) {
+        if (StringUtils.isNotEmpty(protocol)) {
             this.protocol = protocol;
         }
     }

diff --git a/http/src/test/groovy/io/micronaut/http/ssl/SslConfigurationSpec.groovy b/http/src/test/groovy/io/micronaut/http/ssl/SslConfigurationSpec.groovy
@@ -0,0 +1,23 @@
+package io.micronaut.http.ssl
+
+import spock.lang.Specification
+
+class SslConfigurationSpec extends Specification {
+
+    void "setProtocol should override protocol"() {
+        given:
+        SslConfiguration configuration = new SslConfiguration()
+
+        expect:
+        configuration.protocol.isPresent()
+        "TLS" == configuration.protocol.get()
+
+        when:
+        configuration.protocol = "foo"
+
+        then:
+        configuration.protocol.isPresent()
+        "foo" == configuration.protocol.get()
+    }
+
+}