diff --git a/rest/resource-server/src/docs/asciidoc/projects.adoc b/rest/resource-server/src/docs/asciidoc/projects.adoc index ec364022eb..a3efb045e8 100644 --- a/rest/resource-server/src/docs/asciidoc/projects.adoc +++ b/rest/resource-server/src/docs/asciidoc/projects.adoc @@ -738,3 +738,4 @@ include::{snippets}/should_document_get_project_report/curl-request.adoc[] ===== Example response include::{snippets}/should_document_get_project_report/http-response.adoc[] + diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java index 71a11988f8..4ab9fd72c8 100644 --- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java +++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java @@ -593,6 +593,7 @@ public Project convertToEmbeddedProject(Project project) { embeddedProject.setClearingState(project.getClearingState()); embeddedProject.setVersion(project.getVersion()); embeddedProject.setVisbility(project.getVisbility()); + embeddedProject.setBusinessUnit(project.getBusinessUnit()); embeddedProject.setType(null); return embeddedProject; } diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java index 483375e0a3..c5463cdd30 100644 --- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java +++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java @@ -114,6 +114,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.ListIterator; import java.util.Map; import java.util.Map.Entry; import java.util.Objects; diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java index 32527de37e..45f4e3d25a 100644 --- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java +++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java @@ -613,6 +613,7 @@ public void should_document_get_usedbyresource_for_project() throws Exception { responseFields( subsectionWithPath("_embedded.sw360:projects.[]name").description("The name of the project"), subsectionWithPath("_embedded.sw360:projects.[]version").description("The project version"), + subsectionWithPath("_embedded.sw360:projects.[]businessUnit").description("The business unit this project belongs to"), subsectionWithPath("_embedded.sw360:projects.[]projectType").description("The project type, possible values are: " + Arrays.asList(ProjectType.values())), subsectionWithPath("_embedded.sw360:projects").description("An array of <>"), subsectionWithPath("_links").description("<> to other resources") @@ -1835,4 +1836,5 @@ public void should_document_import_cyclonedx_on_project() throws Exception { .header("Authorization", "Bearer " + accessToken); this.mockMvc.perform(builder).andExpect(status().isOk()).andDo(this.documentationHandler.document()); } + }