diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/HalResource.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/HalResource.java index 7b21cbf866..7853bf91b1 100644 --- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/HalResource.java +++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/HalResource.java @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Collection; @JsonInclude(JsonInclude.Include.NON_NULL) public class HalResource extends EntityModel { @@ -75,10 +76,13 @@ public void addEmbeddedResource(String relation, Object embeddedResource) { // if a relation is plural, the content will always be rendered as an array if (isPluralRelation) { if (embeddedResources == null) { - embeddedResources = new ArrayList<>(); + if (embeddedResource instanceof Collection) { + embeddedResources = new ArrayList<>((Collection) embeddedResource); + } else { + embeddedResources = new ArrayList<>(); + ((List) embeddedResources).add(embeddedResource); + } } - ((List) embeddedResources).add(embeddedResource); - // if a relation is singular, it would be a single object if there is only one object available // Otherwise it would be rendered as array } else {