#3304 added real values to DDI export

dzhw · Sep 18, 2024 · f3eff2e · f3eff2e
1 parent 428e589
commit f3eff2e
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 91 deletions.
diff --git a/.../java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/ddiCodebook/Catgry.java b/.../java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/ddiCodebook/Catgry.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import lombok.AllArgsConstructor;
 
@@ -12,6 +13,7 @@ public class Catgry {
   String catValu;
 
   @JacksonXmlProperty(localName = "labl")
+  @JacksonXmlElementWrapper(useWrapping = false)
   List<TextElement> labl;
 
 }
diff --git a/...ava/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/ddiCodebook/CodeBook.java b/...ava/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/ddiCodebook/CodeBook.java
@@ -2,21 +2,43 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
- * Record defining the mapping of the DDI Codebook standard.
+ * Defines the mapping of the DDI Codebook standard.
  */
-@AllArgsConstructor
-@JacksonXmlRootElement(namespace = "ddi:codebook:2_5", localName = "codeBook")
+@Getter
+@Setter
+@JacksonXmlRootElement(localName = "codeBook", namespace = "ddi:codebook:2_5")
 public class CodeBook {
 
+  public CodeBook(StdyDscr stdyDscr, List<FileDscr> fileDscr, DataDscr dataDscr) {
+    this.stdyDscr = stdyDscr;
+    this.fileDscr = fileDscr;
+    this.dataDscr = dataDscr;
+  }
+
+//  @JacksonXmlProperty(localName = "xmlns", isAttribute = true)
+//  private String nameSpace = "ddi:codebook:2_5";
+
+//  @JacksonXmlProperty(localName = "xmlns:xsi", isAttribute = true)
+//  private String xsi = "http://www.w3.org/2001/XMLSchema-instance";
+//
+//  @JacksonXmlProperty(localName = "xmlns:xs", isAttribute = true)
+//  private String xs = "http://www.w3.org/2001/XMLSchema";
+//
+//  @JacksonXmlProperty(localName = "xsi:schemaLocation", isAttribute = true)
+//  private String schemaLocation = "http://www.ddialliance.org/Specification/DDI-Codebook/2.5/XMLSchema/codebook.xsd";
+
   @JacksonXmlProperty(localName = "stdyDscr")
   private StdyDscr stdyDscr;
 
   @JacksonXmlProperty(localName = "fileDscr")
+  @JacksonXmlElementWrapper(useWrapping = false)
   private List<FileDscr> fileDscr;
 
   @JacksonXmlProperty(localName = "dataDscr")

diff --git a/...ava/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/ddiCodebook/DataDscr.java b/...ava/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/ddiCodebook/DataDscr.java
@@ -2,13 +2,15 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import lombok.AllArgsConstructor;
 
 @AllArgsConstructor
 public class DataDscr {
 
   @JacksonXmlProperty(localName = "var")
+  @JacksonXmlElementWrapper(useWrapping = false)
   List<Var> var;
 
 }
diff --git a/...ain/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/ddiCodebook/Var.java b/...ain/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/ddiCodebook/Var.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import lombok.AllArgsConstructor;
 
@@ -15,12 +16,15 @@ public class Var {
   String files;
 
   @JacksonXmlProperty(localName = "labl")
+  @JacksonXmlElementWrapper(useWrapping = false)
   List<TextElement> labl;
 
   @JacksonXmlProperty(localName = "qstn")
+  @JacksonXmlElementWrapper(useWrapping = false)
   List<TextElement> qstn;
 
   @JacksonXmlProperty(localName = "catgry")
+  @JacksonXmlElementWrapper(useWrapping = false)
   List<Catgry> catgry;
 
 }