Clean up websocket's prepareUriByStreamName()

Use a switch expression to streamline UriBuilder use.

JIRA: NETCONF-1102
Change-Id: Ia0f1261fffd33faef48b14ff21a6446b7d236b8f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java
index d8b68b5fd1cd7bb91f12fad2a9c28ca13ffbeae9..7bdb6b9e239308e03434bf2ecef6c81fa41afd35 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java
@@ -15,7 +15,6 @@ import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
-import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -69,19 +68,17 @@ public abstract class SubscribeToStreamUtil {
 
         @Override
         public URI prepareUriByStreamName(final UriInfo uriInfo, final String streamName) {
-            final String scheme = uriInfo.getAbsolutePath().getScheme();
-            final UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
-            switch (scheme) {
-                case "https":
-                    // Secured HTTP goes to Secured WebSockets
-                    uriBuilder.scheme("wss");
-                    break;
-                case "http":
-                default:
-                    // Unsecured HTTP and others go to unsecured WebSockets
-                    uriBuilder.scheme("ws");
-            }
-            return uriBuilder.replacePath(URLConstants.BASE_PATH + '/' + streamName).build();
+            final var scheme = switch (uriInfo.getAbsolutePath().getScheme()) {
+                // Secured HTTP goes to Secured WebSockets
+                case "https" -> "wss";
+                // Unsecured HTTP and others go to unsecured WebSockets
+                default -> "ws";
+            };
+
+            return uriInfo.getBaseUriBuilder()
+                .scheme(scheme)
+                .replacePath(URLConstants.BASE_PATH + '/' + streamName)
+                .build();
         }
     }