diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml index 0d24aa6b8..d22dcbe14 100644 --- a/dmp-backend/core/pom.xml +++ b/dmp-backend/core/pom.xml @@ -55,7 +55,7 @@ gr.cite.opendmp file-transformer-base - 0.0.5 + 0.0.6 gr.cite diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileProperties.java b/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileProperties.java index b19f3a728..9af760b13 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileProperties.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileProperties.java @@ -199,9 +199,6 @@ public class StorageFileProperties { public static class StaticFilesConfig{ private String externalUrls; private String semantics; - private String h2020Template; - private String h2020DescriptionTemplate; - private String pidLinks; public String getExternalUrls() { return externalUrls; @@ -219,29 +216,6 @@ public class StorageFileProperties { this.semantics = semantics; } - public String getH2020Template() { - return h2020Template; - } - - public void setH2020Template(String h2020Template) { - this.h2020Template = h2020Template; - } - - public String getH2020DescriptionTemplate() { - return h2020DescriptionTemplate; - } - - public void setH2020DescriptionTemplate(String h2020DescriptionTemplate) { - this.h2020DescriptionTemplate = h2020DescriptionTemplate; - } - - public String getPidLinks() { - return pidLinks; - } - - public void setPidLinks(String pidLinks) { - this.pidLinks = pidLinks; - } } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileService.java b/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileService.java index ad088853e..4ccb15e88 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileService.java @@ -33,12 +33,6 @@ public interface StorageFileService extends ApplicationListener gr.cite.opendmp file-transformer-base - 0.0.5 + 0.0.6 diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java index 060be60f9..864889d54 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java @@ -1,6 +1,5 @@ package eu.eudat.logic.managers; -import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -18,12 +17,11 @@ public class DatasetProfileManager { private static final Logger logger = LoggerFactory.getLogger(DatasetProfileManager.class); private static final List cache = new ArrayList<>(); - private final ConfigLoader configLoader; // private final RemoteFetcherService remoteFetcherService; @Autowired - public DatasetProfileManager(ConfigLoader configLoader) { - this.configLoader = configLoader; + public DatasetProfileManager() { + } private static String parseItem(Object item) { if (item instanceof String) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java deleted file mode 100644 index 8f98669bd..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java +++ /dev/null @@ -1,8 +0,0 @@ -package eu.eudat.logic.proxy.config.configloaders; - -import org.apache.poi.xwpf.usermodel.XWPFDocument; - - -public interface ConfigLoader { - XWPFDocument getDocument(); -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DefaultConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DefaultConfigLoader.java deleted file mode 100644 index ffe6006f2..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DefaultConfigLoader.java +++ /dev/null @@ -1,67 +0,0 @@ -package eu.eudat.logic.proxy.config.configloaders; - -import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.service.storage.StorageFileService; -import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; -import java.io.ByteArrayInputStream; -import java.util.LinkedList; -import java.util.List; - -@Service("configLoader") -public class DefaultConfigLoader implements ConfigLoader { - private static final Logger logger = LoggerFactory.getLogger(DefaultConfigLoader.class); - private static final ObjectMapper mapper = new ObjectMapper(); - - private XWPFDocument document; - - @Autowired - private StorageFileService storageFileService; - - - private void setDocument() { - byte[] bytes = this.storageFileService.getH2020TemplateFile(); - try { - this.document = new XWPFDocument(new ByteArrayInputStream(bytes)); - } catch (Exception ex) { - logger.error("Cannot find resource", ex); - } - } - - public XWPFDocument getDocument() { - this.setDocument(); - return document; - } - - - private List getXmlValuesFromXPath(Document doc, String expression) { - XPath xPath = XPathFactory.newInstance().newXPath(); - NodeList nodeList = null; - List values = new LinkedList<>(); - try { - nodeList = (NodeList) xPath.compile(expression).evaluate(doc, XPathConstants.NODESET); - } catch (XPathExpressionException e) { - logger.error(e.getMessage(), e); - } - if (nodeList != null) { - for (int i = 0; i < nodeList.getLength(); i++) { - Node node = nodeList.item(i); - if (node.hasChildNodes()) { - values.add(nodeList.item(i).getChildNodes().item(0).getNodeValue()); - } - } - } - return values; - } -} diff --git a/dmp-backend/web/src/main/resources/config/storage-devel.yml b/dmp-backend/web/src/main/resources/config/storage-devel.yml index 3731cc12c..30f1f7b9f 100644 --- a/dmp-backend/web/src/main/resources/config/storage-devel.yml +++ b/dmp-backend/web/src/main/resources/config/storage-devel.yml @@ -13,9 +13,6 @@ storage: static-files: externalUrls: dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml semantics: dmp-backend/web/src/main/resources/Semantics.json - h2020Template: documents/h2020.docx - h2020DescriptionTemplate: documents/h2020_dataset.docx - pidLinks: pidLinks.json material-files: userGuide: dmp-backend/web/src/main/resources/material/user-guide/ about: dmp-backend/web/src/main/resources/material/about/ diff --git a/dmp-backend/web/src/main/resources/pidLinks.json b/dmp-backend/web/src/main/resources/pidLinks.json deleted file mode 100644 index d2a011677..000000000 --- a/dmp-backend/web/src/main/resources/pidLinks.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "pidLinks": [ - { - "pid": "doi", - "link": "https://doi.org/{pid}" - }, - { - "pid": "uniprot", - "link": "https://uniprot.org/uniprotkb/{pid}" - }, - { - "pid": "handle", - "link": "https://hdl.handle.net/{pid}" - }, - { - "pid": "arxiv", - "link": "https://arxiv.org/abs/{pid}" - }, - { - "pid": "ascl", - "link": "https://ascl.net/{pid}" - }, - { - "pid": "orcid", - "link": "https://orcid.org/{pid}" - }, - { - "pid": "pmid", - "link": "https://pubmed.ncbi.nlm.nih.gov/{pid}" - }, - { - "pid": "ads", - "link": "https://ui.adsabs.harvard.edu/#abs/{pid}" - }, - { - "pid": "pmcid", - "link": "https://ncbi.nlm.nih.gov/pmc/{pid}" - }, - { - "pid": "gnd", - "link": "https://d-nb.info/gnd/{pid}" - }, - { - "pid": "urn", - "link": "https://nbn-resolving.org/{pid}" - }, - { - "pid": "sra", - "link": "https://ebi.ac.uk/ena/data/view/{pid}" - }, - { - "pid": "bioproject", - "link": "https://ebi.ac.uk/ena/data/view/{pid}" - }, - { - "pid": "biosample", - "link": "https://ebi.ac.uk/ena/data/view/{pid}" - }, - { - "pid": "ensembl", - "link": "https://ensembl.org/id/{pid}" - }, - { - "pid": "refseq", - "link": "https://ncbi.nlm.nih.gov/entrez/viewer.fcgi?val={pid}" - }, - { - "pid": "genome", - "link": "https://ncbi.nlm.nih.gov/assembly/{pid}" - }, - { - "pid": "geo", - "link": "https://ncbi.nlm.nih.gov/geo/query/acc.cgi?acc={pid}" - }, - { - "pid": "arrayexpress_array", - "link": "https://ebi.ac.uk/arrayexpress/arrays/{pid}" - }, - { - "pid": "arrayexpress_experiment", - "link": "https://ebi.ac.uk/arrayexpress/experiments/{pid}" - }, - { - "pid": "hal", - "link": "https://hal.archives-ouvertes.fr/{pid}" - }, - { - "pid": "swh", - "link": "https://archive.softwareheritage.org/{pid}" - }, - { - "pid": "ror", - "link": "https://ror.org/{pid}" - }, - { - "pid": "viaf", - "link": "https://viaf.org/viaf/{pid}" - } - ] -} \ No newline at end of file