From c6bcc83652047d24a9d172169edbd24137268c31 Mon Sep 17 00:00:00 2001
From: Nicola Fulvio Calabria <nicola.calabria@inaf.it>
Date: Wed, 8 Feb 2023 20:12:34 +0100
Subject: [PATCH] node collections controller
---
.../java/it/inaf/ia2/vospace/ui/client/VOSpaceClient.java | 1 -
.../vospace/ui/controller/NodeCollectionsController.java | 7 ++++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/client/VOSpaceClient.java b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/client/VOSpaceClient.java
index 744dc43..e481d82 100644
--- a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/client/VOSpaceClient.java
+++ b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/client/VOSpaceClient.java
@@ -13,7 +13,6 @@ import it.inaf.ia2.vospace.ui.exception.VOSpaceStatusException;
import it.inaf.ia2.vospace.ui.exception.VOSpaceException;
import it.inaf.oats.vospace.datamodel.NodeUtils;
import static it.inaf.oats.vospace.datamodel.NodeUtils.urlEncodePath;
-import it.inaf.oats.vospace.datamodel.collections.NodeCollection;
import it.inaf.oats.vospace.datamodel.collections.NodeCollectionsWrapper;
import java.io.IOException;
import java.io.InputStream;
diff --git a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/controller/NodeCollectionsController.java b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/controller/NodeCollectionsController.java
index e8ac1d8..548bc6d 100644
--- a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/controller/NodeCollectionsController.java
+++ b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/controller/NodeCollectionsController.java
@@ -8,12 +8,13 @@ package it.inaf.ia2.vospace.ui.controller;
import it.inaf.ia2.aa.data.User;
import it.inaf.ia2.vospace.ui.TokenProvider;
import it.inaf.ia2.vospace.ui.client.VOSpaceClient;
+import it.inaf.oats.vospace.datamodel.collections.NodeCollection;
import it.inaf.oats.vospace.datamodel.collections.NodeCollectionsWrapper;
+import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -29,7 +30,7 @@ public class NodeCollectionsController extends BaseController {
private TokenProvider tokenProvider;
@GetMapping(value = "/collections", produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<NodeCollectionsWrapper> listNodeCollections(User principal)
+ public List<NodeCollection> listNodeCollections(User principal)
throws Exception
{
LOG.debug("listNodeCollections called for user {}", principal.getName());
@@ -37,7 +38,7 @@ public class NodeCollectionsController extends BaseController {
NodeCollectionsWrapper ncw =
client.getNodeCollections(tokenProvider.getToken());
- return ResponseEntity.ok(ncw);
+ return ncw.getNodeCollections();
}
}
--
GitLab