From f5aeb56133b7842e2f53b7230c4f4fea41c35c1d Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Mon, 14 Oct 2019 14:14:09 +0300 Subject: [PATCH] Fixes various code missteps, moves mock data and readds eestore on external source. --- .../main/java/eu/eudat/controllers/DMPs.java | 5 +- .../controllers/DatasetProfileController.java | 6 +- .../B2Access/B2AccessCustomProviderImpl.java | 1 - .../web/src/main/resources/ExternalUrls.xml | 804 +++++++++--------- .../DatasetsInternalMockUpData.json | 0 .../FunderInternalMockUpData.json | 0 .../GrantInternalMockUpData.json | 0 .../OrganisationInternalMockUpData.json | 0 .../ProjectInternalMockUpData.json | 0 .../RegistriesInternalMockUpData.json | 0 .../RepositoriesInternalMockUpData.json | 0 .../ResearcherInternalMockUpData.json | 0 .../ServicesInternalMockUpData.json | 0 .../TagsInternalMockUpData.json | 0 .../resources/{ => mockData}/mockupTags.json | 0 15 files changed, 404 insertions(+), 412 deletions(-) rename dmp-backend/web/src/main/resources/{ => mockData}/DatasetsInternalMockUpData.json (100%) rename dmp-backend/web/src/main/resources/{ => mockData}/FunderInternalMockUpData.json (100%) rename dmp-backend/web/src/main/resources/{ => mockData}/GrantInternalMockUpData.json (100%) rename dmp-backend/web/src/main/resources/{ => mockData}/OrganisationInternalMockUpData.json (100%) rename dmp-backend/web/src/main/resources/{ => mockData}/ProjectInternalMockUpData.json (100%) rename dmp-backend/web/src/main/resources/{ => mockData}/RegistriesInternalMockUpData.json (100%) rename dmp-backend/web/src/main/resources/{ => mockData}/RepositoriesInternalMockUpData.json (100%) rename dmp-backend/web/src/main/resources/{ => mockData}/ResearcherInternalMockUpData.json (100%) rename dmp-backend/web/src/main/resources/{ => mockData}/ServicesInternalMockUpData.json (100%) rename dmp-backend/web/src/main/resources/{ => mockData}/TagsInternalMockUpData.json (100%) rename dmp-backend/web/src/main/resources/{ => mockData}/mockupTags.json (100%) diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java index ffd45ed08..ec3e882f3 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java @@ -88,9 +88,8 @@ public class DMPs extends BaseController { @RequestMapping(method = RequestMethod.GET, value = {"{id}"}) public @ResponseBody ResponseEntity getSingle(@PathVariable String id, @RequestHeader("Content-Type") String contentType, Principal principal) throws IllegalAccessException, InstantiationException, IOException { - if (contentType.equals("application/xml") || contentType.equals("application/msword")) { //|| contentType.equals("application/pdf") - ResponseEntity document = this.dataManagementPlanManager.getDocument(id, contentType); - return document; + if (contentType.equals("application/xml") || contentType.equals("application/msword")) { + return this.dataManagementPlanManager.getDocument(id, contentType); } else { eu.eudat.models.data.dmp.DataManagementPlan dataManagementPlan = this.dataManagementPlanManager.getSingle(id, principal, this.dynamicGrantConfiguration); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan)); diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java index 1202c31ac..5f16cb390 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java @@ -39,18 +39,18 @@ public class DatasetProfileController extends BaseController { this.datasetProfileManager = datasetProfileManager; } - @Transactional +/* @Transactional @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofile/save/{id}"}, consumes = "application/json", produces = "application/json") public ResponseEntity updateDataset(@PathVariable String id, @RequestBody PropertiesModel properties) { eu.eudat.data.entities.Dataset dataset = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(id)); - Map values = new HashMap(); + Map values = new HashMap<>(); properties.toMap(values); JSONObject jobject = new JSONObject(values); dataset.setProperties(jobject.toString()); dataset.setStatus((short) properties.getStatus()); this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset); //TODO return ResponseEntity.status(HttpStatus.OK).body(properties); - } + }*/ @Transactional @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofile/clone/{id}"}, consumes = "application/json", produces = "application/json") diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java index 4a4066fb4..9f650688e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java @@ -54,7 +54,6 @@ public class B2AccessCustomProviderImpl implements B2AccessCustomProvider { map.add("redirect_uri", redirectUri); HttpEntity> request = new HttpEntity>(map, headers); - Map values = template.postForObject(this.environment.getProperty("b2access.externallogin.access_token_url"), request, Map.class); B2AccessResponseToken b2AccessResponseToken = new B2AccessResponseToken(); b2AccessResponseToken.setAccessToken((String) values.get("access_token")); diff --git a/dmp-backend/web/src/main/resources/ExternalUrls.xml b/dmp-backend/web/src/main/resources/ExternalUrls.xml index 0a734c1c0..3dc6f73a7 100644 --- a/dmp-backend/web/src/main/resources/ExternalUrls.xml +++ b/dmp-backend/web/src/main/resources/ExternalUrls.xml @@ -25,40 +25,40 @@ $['meta']['pagination']['page','pages','count'] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FIRST @@ -84,40 +84,40 @@ $['meta']['pagination']['page','pages','count'] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FIRST @@ -127,7 +127,7 @@ cristin - 1 + 2 https://eestore.paas2.uninett.no/api/projectrepo/?search={like}&page={page}&size={pageSize} 1 application/vnd.api+json; charset=utf-8 @@ -160,167 +160,161 @@ $['meta']['pagination']['page','pages','count'] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FIRST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + openAire + + 1 + External + https://eestore.paas2.uninett.no/api/projectrepo/ + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + 'source' + + + $['meta']['pagination']['page','pages','count'] + + - - - - - - - - - - - - - - - - + --> + FIRST @@ -430,40 +424,40 @@ $['meta']['pagination']['page','pages','count'] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + FIRST @@ -490,40 +484,40 @@ $['meta']['pagination']['page','pages','count'] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FIRST @@ -550,40 +544,40 @@ $['meta']['pagination']['page','pages','count'] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FIRST @@ -610,40 +604,40 @@ $['meta']['pagination']['page','pages','count'] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FIRST @@ -669,40 +663,40 @@ $['meta']['pagination']['page','pages','count'] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FIRST diff --git a/dmp-backend/web/src/main/resources/DatasetsInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/DatasetsInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/DatasetsInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/DatasetsInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/FunderInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/FunderInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/FunderInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/FunderInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/GrantInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/GrantInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/GrantInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/GrantInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/OrganisationInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/OrganisationInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/OrganisationInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/OrganisationInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/ProjectInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/ProjectInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/ProjectInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/ProjectInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/RegistriesInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/RegistriesInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/RegistriesInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/RegistriesInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/RepositoriesInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/RepositoriesInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/RepositoriesInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/RepositoriesInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/ResearcherInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/ResearcherInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/ResearcherInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/ResearcherInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/ServicesInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/ServicesInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/ServicesInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/ServicesInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/TagsInternalMockUpData.json b/dmp-backend/web/src/main/resources/mockData/TagsInternalMockUpData.json similarity index 100% rename from dmp-backend/web/src/main/resources/TagsInternalMockUpData.json rename to dmp-backend/web/src/main/resources/mockData/TagsInternalMockUpData.json diff --git a/dmp-backend/web/src/main/resources/mockupTags.json b/dmp-backend/web/src/main/resources/mockData/mockupTags.json similarity index 100% rename from dmp-backend/web/src/main/resources/mockupTags.json rename to dmp-backend/web/src/main/resources/mockData/mockupTags.json