Move away from getUri.toString in more places

micronaut-projects · Dec 10, 2022 · 4a040af · 4a040af
1 parent 686de0f
commit 4a040af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...ain/java/io/micronaut/http/server/netty/websocket/NettyServerWebSocketUpgradeHandler.java b/...ain/java/io/micronaut/http/server/netty/websocket/NettyServerWebSocketUpgradeHandler.java
@@ -125,7 +125,7 @@ private boolean isWebSocketUpgrade(@NonNull NettyHttpRequest<?> request) {
     protected final void channelRead0(ChannelHandlerContext ctx, NettyHttpRequest<?> msg) {
         ServerRequestContext.set(msg);
 
-        Optional<UriRouteMatch<Object, Object>> optionalRoute = router.find(HttpMethod.GET, msg.getUri().toString(), msg)
+        Optional<UriRouteMatch<Object, Object>> optionalRoute = router.find(HttpMethod.GET, msg.getPath(), msg)
             .filter(rm -> rm.isAnnotationPresent(OnMessage.class) || rm.isAnnotationPresent(OnOpen.class))
             .findFirst();
 

diff --git a/http-server/src/main/java/io/micronaut/http/server/RequestLifecycle.java b/http-server/src/main/java/io/micronaut/http/server/RequestLifecycle.java
@@ -332,7 +332,7 @@ final ExecutionFlow<MutableHttpResponse<?>> onRouteMiss(HttpRequest<?> httpReque
 
         // if there is no route present try to locate a route that matches a different HTTP method
         final List<UriRouteMatch<Object, Object>> anyMatchingRoutes = routeExecutor.router
-            .findAny(httpRequest.getUri().toString(), httpRequest).toList();
+            .findAny(httpRequest.getPath(), httpRequest).toList();
         final Collection<MediaType> acceptedTypes = httpRequest.accept();
         final boolean hasAcceptHeader = CollectionUtils.isNotEmpty(acceptedTypes);
 

diff --git a/http-server/src/main/java/io/micronaut/http/server/RouteExecutor.java b/http-server/src/main/java/io/micronaut/http/server/RouteExecutor.java
@@ -168,7 +168,7 @@ UriRouteMatch<Object, Object> findRouteMatch(HttpRequest<?> httpRequest) {
 
         List<UriRouteMatch<Object, Object>> uriRoutes = router.findAllClosest(httpRequest);
         if (uriRoutes.size() > 1) {
-            throw new DuplicateRouteException(httpRequest.getUri().getPath(), uriRoutes);
+            throw new DuplicateRouteException(httpRequest.getPath(), uriRoutes);
         } else if (uriRoutes.size() == 1) {
             routeMatch = uriRoutes.get(0);
         }