From ac2a8edba9d637a07308c66d33f39cca6fdd1ae5 Mon Sep 17 00:00:00 2001 From: OleksandrZharov Date: Tue, 4 Oct 2022 11:56:19 +0200 Subject: [PATCH] Fix netconf WebInitializer url patterns Fixed url patterns in WebInitializer so they all correspond to specification. JIRA: AAA-233 Change-Id: I2cfdabc7243e2c2d94debc3e02f6875d8ad13293 Signed-off-by: OleksandrZharov Signed-off-by: Ivan Hrasko Signed-off-by: Robert Varga --- .../nb/rfc8040/web/WebInitializer.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/web/WebInitializer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/web/WebInitializer.java index 3d8016c266..e375515646 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/web/WebInitializer.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/web/WebInitializer.java @@ -7,6 +7,10 @@ */ package org.opendaylight.restconf.nb.rfc8040.web; +import static org.opendaylight.restconf.nb.rfc8040.rests.utils.RestconfStreamsConstants.DATA_SUBSCRIPTION; +import static org.opendaylight.restconf.nb.rfc8040.rests.utils.RestconfStreamsConstants.NOTIFICATION_STREAM; +import static org.opendaylight.restconf.nb.rfc8040.utils.RestconfConstants.BASE_URI_PATTERN; + import java.util.List; import javax.annotation.PreDestroy; import javax.inject.Inject; @@ -24,9 +28,7 @@ import org.opendaylight.aaa.web.servlet.ServletSupport; import org.opendaylight.restconf.nb.rfc8040.DataStreamApplication; import org.opendaylight.restconf.nb.rfc8040.RestconfApplication; import org.opendaylight.restconf.nb.rfc8040.RootFoundApplication; -import org.opendaylight.restconf.nb.rfc8040.rests.utils.RestconfStreamsConstants; import org.opendaylight.restconf.nb.rfc8040.streams.WebSocketInitializer; -import org.opendaylight.restconf.nb.rfc8040.utils.RestconfConstants; import org.opendaylight.yangtools.concepts.Registration; /** @@ -48,27 +50,25 @@ public class WebInitializer { .contextPath("/") .supportsSessions(false) .addServlet(ServletDetails.builder() - .addUrlPattern(RestconfConstants.BASE_URI_PATTERN + "/*") + .addUrlPattern("/" + BASE_URI_PATTERN + "/*") .servlet(servletSupport.createHttpServletBuilder(webApp).build()) .asyncSupported(true) .build()) .addServlet(ServletDetails.builder() - .addUrlPattern(RestconfConstants.BASE_URI_PATTERN + "/notif/*") + .addUrlPattern("/" + BASE_URI_PATTERN + "/notif/*") .servlet(servletSupport.createHttpServletBuilder(webAppNotif).build()) .name("notificationServlet") .asyncSupported(true) .build()) .addServlet(ServletDetails.builder() .addAllUrlPatterns(List.of( - RestconfConstants.BASE_URI_PATTERN + "/" + RestconfStreamsConstants.DATA_SUBSCRIPTION + "/*", - RestconfConstants.BASE_URI_PATTERN + "/" + RestconfStreamsConstants.NOTIFICATION_STREAM + "/*")) + "/" + BASE_URI_PATTERN + "/" + DATA_SUBSCRIPTION + "/*", + "/" + BASE_URI_PATTERN + "/" + NOTIFICATION_STREAM + "/*")) .servlet(webSocketServlet) .build()) .addServlet(ServletDetails.builder() - .addUrlPattern(".well-known/*") - .servlet(servletSupport.createHttpServletBuilder( - new RootFoundApplication(RestconfConstants.BASE_URI_PATTERN)) - .build()) + .addUrlPattern("/.well-known/*") + .servlet(servletSupport.createHttpServletBuilder(new RootFoundApplication(BASE_URI_PATTERN)).build()) .name("Rootfound") .build()) @@ -79,7 +79,7 @@ public class WebInitializer { .asyncSupported(true) .build()); - webContextSecurer.requireAuthentication(webContextBuilder, true, RestconfConstants.BASE_URI_PATTERN + "/*"); + webContextSecurer.requireAuthentication(webContextBuilder, true, "/" + BASE_URI_PATTERN + "/*"); registration = webServer.registerWebContext(webContextBuilder.build()); } -- 2.36.6