fix integration tests

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>

Author: mherwege

bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java

@@ -277,11 +277,7 @@ public Response getItems(final @Context UriInfo uriInfo, final @Context HttpHead
             Stream<EnrichedItemDTO> itemStream = getItems(type, tags).stream() //
                     .map(item -> EnrichedItemDTOMapper.map(item, false, null, uriBuilder, locale, zoneId)) //
                     .peek(dto -> addMetadata(dto, namespaces, null)) //
-<<<<<<< HEAD
                     .peek(dto -> dto.editable = isEditable(dto));
-=======
-                    .peek(dto -> dto.editable = isEditable(dto.name));
->>>>>>> 0cbd2e12b (include all parents)
             itemStream = dtoMapper.limitToFields(itemStream,
                     "name,label,type,groupType,function,category,editable,groupNames,link,tags,metadata,commandDescription,stateDescription");
 
@@ -305,7 +301,7 @@ public Response getItems(final @Context UriInfo uriInfo, final @Context HttpHead
                     }
                     if (dto.parents != null) {
                         for (EnrichedItemDTO parent : dto.parents) {
-                            parent.editable = isEditable(parent.name);
+                            parent.editable = isEditable(parent);
                         }
                     }
                 });
@@ -374,7 +370,7 @@ public Response getItemByName(final @Context UriInfo uriInfo, final @Context Htt
             }
             if (dto.parents != null) {
                 for (EnrichedItemDTO parent : dto.parents) {
-                    parent.editable = isEditable(parent.name);
+                    parent.editable = isEditable(parent);
                 }
             }
             return JSONResponse.createResponse(Status.OK, dto, null);

itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java

@@ -132,15 +132,16 @@ public void shouldReturnUnicodeItems() throws IOException, TransformationExcepti
         item4.setLabel(ITEM_LABEL4);
 
         Response response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, null, null, null, false,
-                null, false);
+                false, null, false);
         assertThat(readItemLabelsFromResponse(response), hasItems(ITEM_LABEL4));
     }
 
     @Test
     public void shouldReturnUnicodeItem() throws IOException, TransformationException {
         item4.setLabel(ITEM_LABEL4);
 
-        Response response = itemResource.getItemByName(uriInfoMock, httpHeadersMock, null, null, true, ITEM_NAME4);
+        Response response = itemResource.getItemByName(uriInfoMock, httpHeadersMock, null, null, true, false,
+                ITEM_NAME4);
         assertThat(readItemLabelsFromResponse(response), hasItems(ITEM_LABEL4));
     }
 
@@ -153,30 +154,30 @@ public void shouldFilterItemsByTag() throws Exception {
         item4.addTag("Tag4");
 
         Response response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, null, "Tag1", null,
-                false, null, false);
+                false, false, null, false);
         assertThat(readItemNamesFromResponse(response), hasItems(ITEM_NAME1, ITEM_NAME2));
 
-        response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, null, "Tag2", null, false, null,
-                false);
+        response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, null, "Tag2", null, false, false,
+                null, false);
         assertThat(readItemNamesFromResponse(response), hasItems(ITEM_NAME2, ITEM_NAME3));
 
         response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, null, "NotExistingTag", null,
-                false, null, false);
+                false, false, null, false);
         assertThat(readItemNamesFromResponse(response), hasSize(0));
     }
 
     @Test
     public void shouldFilterItemsByType() throws Exception {
         Response response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, CoreItemFactory.SWITCH,
-                null, null, false, null, false);
+                null, null, false, false, null, false);
         assertThat(readItemNamesFromResponse(response), hasItems(ITEM_NAME1, ITEM_NAME2));
 
         response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, CoreItemFactory.DIMMER, null,
-                null, false, null, false);
+                null, false, false, null, false);
         assertThat(readItemNamesFromResponse(response), hasItems(ITEM_NAME3));
 
         response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, CoreItemFactory.COLOR, null, null,
-                false, null, false);
+                false, false, null, false);
         assertThat(readItemNamesFromResponse(response), hasSize(0));
     }
 
@@ -185,17 +186,17 @@ public void shouldAddAndRemoveTags() throws Exception {
         managedItemProvider.add(new SwitchItem("Switch"));
 
         Response response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, null, "MyTag", null,
-                false, null, false);
+                false, false, null, false);
         assertThat(readItemNamesFromResponse(response), hasSize(0));
 
         itemResource.addTag("Switch", "MyTag");
-        response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, null, "MyTag", null, false, null,
-                false);
+        response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, null, "MyTag", null, false, false,
+                null, false);
         assertThat(readItemNamesFromResponse(response), hasSize(1));
 
         itemResource.removeTag("Switch", "MyTag");
-        response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, null, "MyTag", null, false, null,
-                false);
+        response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, null, "MyTag", null, false, false,
+                null, false);
         assertThat(readItemNamesFromResponse(response), hasSize(0));
     }
 
@@ -204,7 +205,7 @@ public void shouldIncludeRequestedFieldsOnly() throws Exception {
         managedItemProvider.add(new SwitchItem("Switch"));
         itemResource.addTag("Switch", "MyTag");
         Response response = itemResource.getItems(uriInfoMock, httpHeadersMock, request, null, null, "MyTag", null,
-                false, "type,name", false);
+                false, false, "type,name", false);
 
         JsonElement result = JsonParser.parseString(toString(response.getEntity()));
         JsonElement expected = JsonParser.parseString("[{type: \"Switch\", name: \"Switch\"}]");