Skip to content

fix(REST): Remove extra brackets from embedded attachment response #3750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
afsahsyeda wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(REST): Remove extra brackets from embedded attachment response #3750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/HalResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<T> extends EntityModel<T> {
Expand Down Expand Up @@ -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<Object>) embeddedResources).add(embeddedResource);
}
}
((List<Object>) 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 {
Expand Down