From c83ef06785aedf4c21f244570784a3796506383f Mon Sep 17 00:00:00 2001 From: Kai Kreuzer Date: Fri, 14 Aug 2020 11:02:00 +0200 Subject: [PATCH] fixed item links in rest api Signed-off-by: Kai Kreuzer --- .../openhab/core/io/rest/core/internal/item/ItemResource.java | 2 +- .../openhab/core/io/rest/sitemap/internal/SitemapResource.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java index 07a40e5ed5d..b58e90054ad 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java +++ b/bundles/org.openhab.core.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 namespaces = splitAndFilterNamespaces(namespaceSelector, locale); final UriBuilder uriBuilder = uriBuilder(uriInfo, httpHeaders); + uriBuilder.path("{itemName}"); Stream itemStream = getItems(type, tags).stream() // .map(item -> EnrichedItemDTOMapper.map(item, recursive, null, uriBuilder, locale)) // diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java index 11e4903b196..d47ddae6bb0 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java +++ b/bundles/org.openhab.core.io.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 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)) {