diff --git a/src/main/java/de/uksh/medic/etl/jobs/mdr/centraxx/CxxMdrAttributes.java b/src/main/java/de/uksh/medic/etl/jobs/mdr/centraxx/CxxMdrAttributes.java index 41fe092..f43f800 100644 --- a/src/main/java/de/uksh/medic/etl/jobs/mdr/centraxx/CxxMdrAttributes.java +++ b/src/main/java/de/uksh/medic/etl/jobs/mdr/centraxx/CxxMdrAttributes.java @@ -70,7 +70,6 @@ public static MappingAttributes getAttributes(CxxMdrSettings mdr, String mdrProf case CONCEPTMAP -> ch.setConceptMap(new URI(av.getValue())); case CODE -> ch.setCode(av.getValue()); case VERSION -> ch.setVersion(av.getValue()); - case PATH -> ch.setPath(av.getValue()); default -> { } } diff --git a/src/main/java/de/uksh/medic/etl/model/MappingAttributes.java b/src/main/java/de/uksh/medic/etl/model/MappingAttributes.java index d95f63d..b547bc1 100644 --- a/src/main/java/de/uksh/medic/etl/model/MappingAttributes.java +++ b/src/main/java/de/uksh/medic/etl/model/MappingAttributes.java @@ -72,12 +72,4 @@ public void setVersion(String version) { this.version = version; } - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - } diff --git a/src/main/java/de/uksh/medic/etl/model/mdr/MdrAttributes.java b/src/main/java/de/uksh/medic/etl/model/mdr/FhirAttributes.java similarity index 86% rename from src/main/java/de/uksh/medic/etl/model/mdr/MdrAttributes.java rename to src/main/java/de/uksh/medic/etl/model/mdr/FhirAttributes.java index 0d24b1b..bb18711 100644 --- a/src/main/java/de/uksh/medic/etl/model/mdr/MdrAttributes.java +++ b/src/main/java/de/uksh/medic/etl/model/mdr/FhirAttributes.java @@ -6,7 +6,7 @@ /** * Enum for Attributes queried from MDR. */ -public enum MdrAttributes { +public enum FhirAttributes { /** * system attribute in MDR. */ @@ -42,7 +42,7 @@ public enum MdrAttributes { private final String label; - MdrAttributes(String label) { + FhirAttributes(String label) { this.label = label; } @@ -58,8 +58,8 @@ public String toString() { * @return corresponding Enum */ @JsonCreator - public static MdrAttributes fromString(String s) { - for (MdrAttributes a : MdrAttributes.values()) { + public static FhirAttributes fromString(String s) { + for (FhirAttributes a : FhirAttributes.values()) { if (a.label.equalsIgnoreCase(s)) { return a; } diff --git a/src/main/java/de/uksh/medic/etl/model/mdr/centraxx/CxxAttributeValue.java b/src/main/java/de/uksh/medic/etl/model/mdr/centraxx/CxxAttributeValue.java index bee2344..661f1b3 100644 --- a/src/main/java/de/uksh/medic/etl/model/mdr/centraxx/CxxAttributeValue.java +++ b/src/main/java/de/uksh/medic/etl/model/mdr/centraxx/CxxAttributeValue.java @@ -1,6 +1,6 @@ package de.uksh.medic.etl.model.mdr.centraxx; -import de.uksh.medic.etl.model.mdr.MdrAttributes; +import de.uksh.medic.etl.model.mdr.FhirAttributes; import java.util.List; /** @@ -9,7 +9,7 @@ public class CxxAttributeValue { private String domain; - private MdrAttributes attribute; + private FhirAttributes attribute; private String value; private List links; @@ -17,7 +17,7 @@ public String getDomain() { return domain; } - public MdrAttributes getAttribute() { + public FhirAttributes getAttribute() { return attribute; }