From 03619a65fc2a325bf009fbec77e210eb8e030dde Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Wed, 26 Feb 2020 10:51:47 +0200 Subject: [PATCH] Minor refactoring --- .../logic/managers/DataManagementPlanManager.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java index b76a50ee3..254e43710 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java @@ -1309,18 +1309,20 @@ public class DataManagementPlanManager { String latestDraftUrl = links.get("latest_draft") + "?access_token=" + this.environment.getProperty("zenodo.access_token"); createResponse = restTemplate.getForObject(latestDraftUrl, Map.class); links = (LinkedHashMap) createResponse.get("links"); - String updateUrl = links.get("self") + "?access_token=" + this.environment.getProperty("zenodo.access_token"); + //At this point it might fail to perform the next requests so enclose them with try catch try { + //Forth, update the new deposit's metadata + String updateUrl = links.get("self") + "?access_token=" + this.environment.getProperty("zenodo.access_token"); restTemplate.put(updateUrl, request); - String fileListUrl = links.get("latest_draft") + "/files" + "?access_token=" + this.environment.getProperty("zenodo.access_token"); //And finally remove pre-existing files from it + String fileListUrl = links.get("self") + "/files" + "?access_token=" + this.environment.getProperty("zenodo.access_token"); ResponseEntity fileListResponse = restTemplate.getForEntity(fileListUrl, Map[].class); for (Map file : fileListResponse.getBody()) { - String fileDeleteUrl = links.get("latest_draft") + "/files/" + file.get("id") + "?access_token=" + this.environment.getProperty("zenodo.access_token"); + String fileDeleteUrl = links.get("self") + "/files/" + file.get("id") + "?access_token=" + this.environment.getProperty("zenodo.access_token"); restTemplate.delete(fileDeleteUrl); } }catch (Exception e) { - //In case the last step fail delete the latest Deposit it in order to create a new one (only one at a time is allowed) + //In case the last two steps fail delete the latest Deposit it in order to create a new one (only one at a time is allowed) restTemplate.delete(latestDraftUrl); throw e; }