From f26b3200e3a4bbf8797175897576f2f5870b2d4c Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Thu, 16 May 2019 14:16:24 +0300 Subject: [PATCH] Polishes the Tag functionality by adding the mockup data into a json file (Ticket #76) --- .../eu/eudat/controllers/TagController.java | 28 ++++++------------- .../web/src/main/resources/mockupTags.json | 22 +++++++++++++++ 2 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 dmp-backend/web/src/main/resources/mockupTags.json diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java index 152b9c2d6..89ed51b39 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java @@ -1,5 +1,7 @@ package eu.eudat.controllers; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.elastic.criteria.TagCriteria; import eu.eudat.elastic.entities.Dataset; import eu.eudat.elastic.repository.Repository; @@ -15,6 +17,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -40,27 +43,14 @@ public class TagController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = {"/external/tags"}, produces = "application/json") public @ResponseBody ResponseEntity> listExternalTagModel( - @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type) throws HugeResultSet, NoURLFound { - /*List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getTags(query, type); + @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type) throws HugeResultSet, NoURLFound, IOException { + /* List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getTags(query, type); TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(remoteRepos);*/ - List> myListOfMaps = new ArrayList<>(); - Map map1 = new HashMap<>(); - map1.put("pid", "1"); - map1.put("name", "Tag1"); - map1.put("label", ""); - myListOfMaps.add(map1); - Map map2 = new HashMap<>(); - map2.put("pid", "2"); - map2.put("name", "Tag2"); - map2.put("label", ""); - myListOfMaps.add(map2); - Map map3 = new HashMap<>(); - map3.put("pid", "3"); - map3.put("name", "Tag3"); - map3.put("label", ""); - myListOfMaps.add(map3); - TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(myListOfMaps); + String path = "C:\\Users\\gkolokythas\\Documents\\openDmp\\dmp-backend\\web\\src\\main\\resources\\mockupTags.json"; + ObjectMapper mapper = new ObjectMapper(); + List> data = mapper.readValue(new File(path), new TypeReference>>(){}); + TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(data); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(researchersExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); } diff --git a/dmp-backend/web/src/main/resources/mockupTags.json b/dmp-backend/web/src/main/resources/mockupTags.json new file mode 100644 index 000000000..d38544fd3 --- /dev/null +++ b/dmp-backend/web/src/main/resources/mockupTags.json @@ -0,0 +1,22 @@ +[ + { + "pid": "1", + "name": "Tag1", + "label": "" + }, + { + "pid": "2", + "name": "Tag2", + "label": "" + }, + { + "pid": "3", + "name": "Tag3", + "label": "" + }, + { + "pid": "4", + "name": "Tag4", + "label": "" + } +] \ No newline at end of file