From cb972c394cf6d72d5277c67c81f0d707f7abf703 Mon Sep 17 00:00:00 2001 From: Aldo Mihasi Date: Thu, 22 Jun 2023 13:47:01 +0300 Subject: [PATCH] change maDmpTarget type in prefilling to semanticTarget --- .../mapper/prefilling/PrefillingMapper.java | 6 +- .../entities/DefaultPrefillingMapping.java | 12 ++-- .../entities/PrefillingFixedMapping.java | 12 ++-- .../config/entities/PrefillingMapping.java | 4 +- .../resources/externalUrls/ExternalUrls.xml | 56 +++++++++---------- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java index 9efc1e713..2ec8e9fd4 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java @@ -112,11 +112,11 @@ public class PrefillingMapper { throw e; } } else { - List nodes = JsonSearcher.findNodes(parentNode, "schematics", "rda." + prefillingMapping.getMaDmpTarget()); + List nodes = JsonSearcher.findNodes(parentNode, "schematics", prefillingMapping.getSemanticTarget()); // zenodo prefilling customizations if(type.equals("zenodo")){ - if(prefillingMapping.getMaDmpTarget().equals("dataset.distribution.data_access")){ + if(prefillingMapping.getSemanticTarget().equals("rda.dataset.distribution.data_access")){ if(parsedValue != null && parsedValue.equals("open")){ List issuedNodes = JsonSearcher.findNodes(parentNode, "schematics", "rda.dataset.issued"); if(!issuedNodes.isEmpty()){ @@ -131,7 +131,7 @@ public class PrefillingMapper { } } - if (prefillingMapping.getMaDmpTarget().equals("dataset.distribution.available_until") && parsedValue != null && !parsedValue.equals("null")) { + if (prefillingMapping.getSemanticTarget().equals("rda.dataset.distribution.available_until") && parsedValue != null && !parsedValue.equals("null")) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("uuuu-MM-dd"); LocalDate date = LocalDate.parse(parsedValue, formatter); date = date.plusYears(20); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/DefaultPrefillingMapping.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/DefaultPrefillingMapping.java index 5fee3d153..4346796af 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/DefaultPrefillingMapping.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/DefaultPrefillingMapping.java @@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlRootElement; public class DefaultPrefillingMapping implements PrefillingMapping{ private String source; private String target; - private String maDmpTarget; + private String semanticTarget; private String subSource; private String trimRegex; @@ -29,13 +29,13 @@ public class DefaultPrefillingMapping implements PrefillingMapping{ this.target = target; } - public String getMaDmpTarget() { - return maDmpTarget; + public String getSemanticTarget() { + return semanticTarget; } - @XmlAttribute(name = "maDmpTarget") - public void setMaDmpTarget(String maDmpTarget) { - this.maDmpTarget = maDmpTarget; + @XmlAttribute(name = "semanticTarget") + public void setSemanticTarget(String semanticTarget) { + this.semanticTarget = semanticTarget; } public String getSubSource() { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/PrefillingFixedMapping.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/PrefillingFixedMapping.java index 4514308f1..aa59f8386 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/PrefillingFixedMapping.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/PrefillingFixedMapping.java @@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "fixedMapping") public class PrefillingFixedMapping implements PrefillingMapping{ private String target; - private String maDmpTarget; + private String semanticTarget; private String value; public String getTarget() { @@ -18,13 +18,13 @@ public class PrefillingFixedMapping implements PrefillingMapping{ this.target = target; } - public String getMaDmpTarget() { - return maDmpTarget; + public String getSemanticTarget() { + return semanticTarget; } - @XmlAttribute(name = "maDmpTarget") - public void setMaDmpTarget(String maDmpTarget) { - this.maDmpTarget = maDmpTarget; + @XmlAttribute(name = "semanticTarget") + public void setSemanticTarget(String semanticTarget) { + this.semanticTarget = semanticTarget; } @Override diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/PrefillingMapping.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/PrefillingMapping.java index 34f1ca95f..ae81f6176 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/PrefillingMapping.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entities/PrefillingMapping.java @@ -7,9 +7,9 @@ public interface PrefillingMapping { void setTarget(String target); - String getMaDmpTarget(); + String getSemanticTarget(); - void setMaDmpTarget(String maDmpTarget); + void setSemanticTarget(String semanticTarget); String getSubSource(); diff --git a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml index 5107fdb99..bdedc03a5 100644 --- a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml +++ b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml @@ -1224,38 +1224,38 @@ but not https://zenodo.org/api/records/{id} - + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + +