Skip to content
Snippets Groups Projects
Commit c6bcc836 authored by Nicola Fulvio Calabria's avatar Nicola Fulvio Calabria
Browse files

node collections controller

parent 7dcb4740
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,6 @@ import it.inaf.ia2.vospace.ui.exception.VOSpaceStatusException; ...@@ -13,7 +13,6 @@ import it.inaf.ia2.vospace.ui.exception.VOSpaceStatusException;
import it.inaf.ia2.vospace.ui.exception.VOSpaceException; import it.inaf.ia2.vospace.ui.exception.VOSpaceException;
import it.inaf.oats.vospace.datamodel.NodeUtils; import it.inaf.oats.vospace.datamodel.NodeUtils;
import static it.inaf.oats.vospace.datamodel.NodeUtils.urlEncodePath; 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 it.inaf.oats.vospace.datamodel.collections.NodeCollectionsWrapper;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
......
...@@ -8,12 +8,13 @@ package it.inaf.ia2.vospace.ui.controller; ...@@ -8,12 +8,13 @@ package it.inaf.ia2.vospace.ui.controller;
import it.inaf.ia2.aa.data.User; import it.inaf.ia2.aa.data.User;
import it.inaf.ia2.vospace.ui.TokenProvider; import it.inaf.ia2.vospace.ui.TokenProvider;
import it.inaf.ia2.vospace.ui.client.VOSpaceClient; 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 it.inaf.oats.vospace.datamodel.collections.NodeCollectionsWrapper;
import java.util.List;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -29,7 +30,7 @@ public class NodeCollectionsController extends BaseController { ...@@ -29,7 +30,7 @@ public class NodeCollectionsController extends BaseController {
private TokenProvider tokenProvider; private TokenProvider tokenProvider;
@GetMapping(value = "/collections", produces = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "/collections", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<NodeCollectionsWrapper> listNodeCollections(User principal) public List<NodeCollection> listNodeCollections(User principal)
throws Exception throws Exception
{ {
LOG.debug("listNodeCollections called for user {}", principal.getName()); LOG.debug("listNodeCollections called for user {}", principal.getName());
...@@ -37,7 +38,7 @@ public class NodeCollectionsController extends BaseController { ...@@ -37,7 +38,7 @@ public class NodeCollectionsController extends BaseController {
NodeCollectionsWrapper ncw = NodeCollectionsWrapper ncw =
client.getNodeCollections(tokenProvider.getToken()); client.getNodeCollections(tokenProvider.getToken());
return ResponseEntity.ok(ncw); return ncw.getNodeCollections();
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment