Use ResourceDetails.alias() from URL patterns

We have impedance on resource registration. We need to make sure we
interpret alias as the URL pattern.

JIRA: AAA-231
Change-Id: Ib3db3ce9e42665476e5ea2a91862363f3893af42
Signed-off-by: Ivan Martiniak <ivan.martiniak@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/web/impl-osgi/src/main/java/org/opendaylight/aaa/web/osgi/WhiteboardWebServer.java b/web/impl-osgi/src/main/java/org/opendaylight/aaa/web/osgi/WhiteboardWebServer.java
index 6c29ae6e64abe653e7c985304b39d89c608f8cb8..c353c453e6abfa7af84852e919523e4a14840c15 100644 (file)
--- a/web/impl-osgi/src/main/java/org/opendaylight/aaa/web/osgi/WhiteboardWebServer.java
+++ b/web/impl-osgi/src/main/java/org/opendaylight/aaa/web/osgi/WhiteboardWebServer.java
@@ -190,11 +190,12 @@ public final class WhiteboardWebServer implements WebServer {
     }
 
     private static Map<String, Object> resourceProperties(final String contextSelect, final ResourceDetails resource) {
-        final var path = absolutePath(resource.name());
+        final var alias = absolutePath(resource.alias());
+
         return Map.of(
             HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, contextSelect,
-            HttpWhiteboardConstants.HTTP_WHITEBOARD_RESOURCE_PATTERN, path,
-            HttpWhiteboardConstants.HTTP_WHITEBOARD_RESOURCE_PREFIX, path);
+            HttpWhiteboardConstants.HTTP_WHITEBOARD_RESOURCE_PATTERN, alias.endsWith("/") ? alias + '*' : alias + "/*",
+            HttpWhiteboardConstants.HTTP_WHITEBOARD_RESOURCE_PREFIX, absolutePath(resource.name()));
     }
 
     private static Map<String, Object> servletProperties(final String contextSelect, final ServletDetails servlet) {