Skip to content

Commit 810532b

Browse files
afsahsyedaGMishx
authored andcommitted
fix(REST): Remove extra brackets from embedded attachment response
Signed-off-by: afsahsyeda <afsah.syeda@siemens-healthineers.com>
1 parent 788bcb4 commit 810532b

File tree

1 file changed

+9
-3
lines changed
  • rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core

1 file changed

+9
-3
lines changed

rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/HalResource.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.HashMap;
3131
import java.util.List;
3232
import java.util.Map;
33+
import java.util.Collection;
3334

3435
@JsonInclude(JsonInclude.Include.NON_NULL)
3536
public class HalResource<T> extends EntityModel<T> {
@@ -75,10 +76,15 @@ public void addEmbeddedResource(String relation, Object embeddedResource) {
7576
// if a relation is plural, the content will always be rendered as an array
7677
if (isPluralRelation) {
7778
if (embeddedResources == null) {
78-
embeddedResources = new ArrayList<>();
79+
if (embeddedResource instanceof Collection) {
80+
embeddedResources = new ArrayList<>((Collection<?>) embeddedResource);
81+
} else {
82+
embeddedResources = new ArrayList<>();
83+
((List<Object>) embeddedResources).add(embeddedResource);
84+
}
85+
} else {
86+
((List<Object>) embeddedResources).add(embeddedResource);
7987
}
80-
((List<Object>) embeddedResources).add(embeddedResource);
81-
8288
// if a relation is singular, it would be a single object if there is only one object available
8389
// Otherwise it would be rendered as array
8490
} else {

0 commit comments

Comments
 (0)