fixed item links in rest api (openhab#1591)

Signed-off-by: Kai Kreuzer <kai@openhab.org>
ConnectorIO · Aug 14, 2020 · 8c83b60 · 8c83b60
1 parent b7193a0
commit 8c83b60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/....io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java b/....io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java
@@ -188,7 +188,6 @@ public ItemResource(//
     private UriBuilder uriBuilder(final UriInfo uriInfo, final HttpHeaders httpHeaders) {
         final UriBuilder uriBuilder = uriInfo.getAbsolutePathBuilder();
         respectForwarded(uriBuilder, httpHeaders);
-        uriBuilder.path("{itemName}");
         return uriBuilder;
     }
 
@@ -208,6 +207,7 @@ public Response getItems(final @Context UriInfo uriInfo, final @Context HttpHead
         final Set<String> namespaces = splitAndFilterNamespaces(namespaceSelector, locale);
 
         final UriBuilder uriBuilder = uriBuilder(uriInfo, httpHeaders);
+        uriBuilder.path("{itemName}");
 
         Stream<EnrichedItemDTO> itemStream = getItems(type, tags).stream() //
                 .map(item -> EnrichedItemDTOMapper.map(item, recursive, null, uriBuilder, locale)) //

diff --git a/...rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java b/...rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java
@@ -497,7 +497,7 @@ private PageDTO createPageBean(String sitemapName, @Nullable String title, @Null
                 boolean isMapview = "mapview".equalsIgnoreCase(widgetTypeName);
                 Predicate<Item> itemFilter = (i -> CoreItemFactory.LOCATION.equals(i.getType()));
                 bean.item = EnrichedItemDTOMapper.map(item, isMapview, itemFilter,
-                        UriBuilder.fromUri(uri).path("{itemName}"), locale);
+                        UriBuilder.fromUri(uri).path("items/{itemName}"), locale);
                 bean.state = itemUIRegistry.getState(widget).toFullString();
                 // In case the widget state is identical to the item state, its value is set to null.
                 if (bean.state != null && bean.state.equals(bean.item.state)) {