From 8c95b16164b515cad1d484cf9205d43a761cc6e0 Mon Sep 17 00:00:00 2001 From: Aldo Mihasi Date: Thu, 8 Dec 2022 13:06:52 +0200 Subject: [PATCH] add temp storage in zenodo repository --- .../zenodorepository/interfaces/ZenodoDeposit.java | 7 +++++-- .../src/main/resources/application.properties | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dmp-backend/zenodoRepository/src/main/java/eu/eudat/depositinterface/zenodorepository/interfaces/ZenodoDeposit.java b/dmp-backend/zenodoRepository/src/main/java/eu/eudat/depositinterface/zenodorepository/interfaces/ZenodoDeposit.java index 0255d2e21..525cedba0 100644 --- a/dmp-backend/zenodoRepository/src/main/java/eu/eudat/depositinterface/zenodorepository/interfaces/ZenodoDeposit.java +++ b/dmp-backend/zenodoRepository/src/main/java/eu/eudat/depositinterface/zenodorepository/interfaces/ZenodoDeposit.java @@ -10,6 +10,7 @@ import eu.eudat.depositinterface.zenodorepository.mapper.DMPToZenodoMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.core.io.FileSystemResource; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -34,10 +35,12 @@ public class ZenodoDeposit implements RepositoryDeposit { private static final ObjectMapper objectMapper = new ObjectMapper(); private ConfigLoader configLoader; + private Environment environment; @Autowired - public ZenodoDeposit(ConfigLoader configLoader){ + public ZenodoDeposit(ConfigLoader configLoader, Environment environment){ this.configLoader = configLoader; + this.environment = environment; } @Override @@ -127,7 +130,7 @@ public class ZenodoDeposit implements RepositoryDeposit { ResponseEntity jsonFile = dmpDepositModel.getRdaJson(); UUID jsonFileUUID = UUID.randomUUID(); - File tempJsonFile = new File(jsonFileUUID + ".json"); // temp storage?? + File tempJsonFile = new File(this.environment.getProperty("storage.temp") + jsonFileUUID + ".json"); try (FileOutputStream jsonFos = new FileOutputStream(tempJsonFile)) { jsonFos.write(jsonFile.getBody()); jsonFos.flush(); diff --git a/dmp-backend/zenodoRepository/src/main/resources/application.properties b/dmp-backend/zenodoRepository/src/main/resources/application.properties index b82bb2b93..10cc38d04 100644 --- a/dmp-backend/zenodoRepository/src/main/resources/application.properties +++ b/dmp-backend/zenodoRepository/src/main/resources/application.properties @@ -1,2 +1,3 @@ configuration.doi_funder=DOI_Funder.json +storage.temp=${ZENODO_TMP} configuration.zenodo=${ZENODO_CONF}