From bb32b4c6f49d2dba94c7b0ad0ae48cafe7253c0c Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Tue, 3 Sep 2019 16:12:38 +0300 Subject: [PATCH] Fixes bug not fetching mockup Tags. --- .../web/src/main/java/eu/eudat/controllers/TagController.java | 3 ++- .../web/src/main/resources/application-devel.properties | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 6ab11d11b..e922bd8f0 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 @@ -51,7 +51,8 @@ public class TagController extends BaseController { TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(remoteRepos);*/ ObjectMapper mapper = new ObjectMapper(); - List> data = mapper.readValue(new File(this.environment.getProperty("dataset.tags.mock")), new TypeReference>>(){}); + String fileUrl = this.environment.getProperty("configuration.resources.path") + this.environment.getProperty("dataset.tags.mock"); + List> data = mapper.readValue(new File(fileUrl), 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/application-devel.properties b/dmp-backend/web/src/main/resources/application-devel.properties index 4ca417e32..d6460eb55 100644 --- a/dmp-backend/web/src/main/resources/application-devel.properties +++ b/dmp-backend/web/src/main/resources/application-devel.properties @@ -20,9 +20,10 @@ configuration.dynamicGrantUrl=/tmp/GrantConfiguration.xml configuration.dynamicProjectUrl=/tmp/ProjectConfiguration.xml configuration.dynamicFunderUrl=/tmp/FunderConfiguration.xml configuration.h2020template=C:\\Users\\gkolokythas\\Documents\\openDmp\\dmp-backend\\web\\src\\main\\resources\\documents\\h2020.docx +configuration.resources.path = ####################MOCK FILES CONFIGURATIONS########## -dataset.tags.mock=/tmp/mockupTags.json +dataset.tags.mock=/mockupTags.json #############TWITTER LOGIN CONFIGURATIONS######### twitter.login.redirect_uri=http://127.0.0.1:4200/login/twitter