Merge pull request #16 from gdi-be/generate-service-metadata

Initial setup to write service metadata
gdi-be · Jan 22, 2025 · c1c483a · c1c483a
2 parents 881413c + f774aba
commit c1c483a
Show file tree

Hide file tree

Showing 18 changed files with 334 additions and 177 deletions.
diff --git a/mde-importer/src/main/java/de/terrestris/mde/mde_importer/importer/ImportService.java b/mde-importer/src/main/java/de/terrestris/mde/mde_importer/importer/ImportService.java
@@ -11,6 +11,7 @@
 import de.terrestris.mde.mde_backend.model.json.ColumnInfo.ColumnType;
 import de.terrestris.mde.mde_backend.model.json.ColumnInfo.FilterType;
 import de.terrestris.mde.mde_backend.model.json.Service.ServiceType;
+import de.terrestris.mde.mde_backend.model.json.codelists.*;
 import lombok.extern.log4j.Log4j2;
 import org.apache.http.client.utils.URIBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -224,6 +225,7 @@ private static void extractFromIso(XMLStreamReader reader, IsoMetadata metadata,
     metadata.setMetadataId(reader.getAttributeValue(null, "uuid"));
     client.setMetadataId(metadata.getMetadataId());
     technical.setMetadataId(metadata.getMetadataId());
+    json.setPointsOfContact(new ArrayList<>());
     while (reader.hasNext() && !(reader.isEndElement() && reader.getLocalName().equals("MD_Metadata"))) {
       reader.next();
       if (!reader.isStartElement()) {
@@ -239,7 +241,7 @@ private static void extractFromIso(XMLStreamReader reader, IsoMetadata metadata,
       }
       if (reader.isStartElement() && reader.getLocalName().equals("pointOfContact")) {
         var contact = parseContact(reader, "pointOfContact");
-        json.setPointOfContact(contact);
+        json.getPointsOfContact().add(contact);
       }
       if (reader.isStartElement() && reader.getLocalName().equals("topicCategory")) {
         skipToElement(reader, "MD_TopicCategoryCode");

diff --git a/mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/Constraint.java b/mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/Constraint.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import de.terrestris.mde.mde_backend.model.json.codelists.MD_RestrictionCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/Contact.java b/mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/Contact.java
@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import de.terrestris.mde.mde_backend.model.json.codelists.CI_OnLineFunctionCode;
+import de.terrestris.mde.mde_backend.model.json.codelists.CI_RoleCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/ContentDescription.java b/mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/ContentDescription.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import de.terrestris.mde.mde_backend.model.json.codelists.CI_OnLineFunctionCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/JsonIsoMetadata.java b/mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/JsonIsoMetadata.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import de.terrestris.mde.mde_backend.enumeration.MetadataProfile;
+import de.terrestris.mde.mde_backend.model.json.codelists.MD_MaintenanceFrequencyCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -90,7 +91,7 @@ public enum InspireTheme {
 
   private List<Contact> contacts;
 
-  private Contact pointOfContact;
+  private List<Contact> pointsOfContact;
 
   private Integer scale;
 

diff --git a/mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/Thesaurus.java b/mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/Thesaurus.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import de.terrestris.mde.mde_backend.model.json.codelists.CI_DateTypeCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/...e_backend/model/json/CI_DateTypeCode.java → ...model/json/codelists/CI_DateTypeCode.java b/...e_backend/model/json/CI_DateTypeCode.java → ...model/json/codelists/CI_DateTypeCode.java
@@ -1,4 +1,4 @@
-package de.terrestris.mde.mde_backend.model.json;
+package de.terrestris.mde.mde_backend.model.json.codelists;
 
 public enum CI_DateTypeCode {
   creation,

diff --git a/...end/model/json/CI_OnLineFunctionCode.java → ...json/codelists/CI_OnLineFunctionCode.java b/...end/model/json/CI_OnLineFunctionCode.java → ...json/codelists/CI_OnLineFunctionCode.java
@@ -1,4 +1,4 @@
-package de.terrestris.mde.mde_backend.model.json;
+package de.terrestris.mde.mde_backend.model.json.codelists;
 
 public enum CI_OnLineFunctionCode {
   download,

diff --git a/...main/java/de/terrestris/mde/mde_backend/model/json/codelists/CI_PresentationFormCode.java b/...main/java/de/terrestris/mde/mde_backend/model/json/codelists/CI_PresentationFormCode.java
@@ -0,0 +1,18 @@
+package de.terrestris.mde.mde_backend.model.json.codelists;
+
+public enum CI_PresentationFormCode {
+  documentDigital,
+  imageDigital,
+  documentHardcopy,
+  imageHardcopy,
+  mapDigital,
+  mapHardcopy,
+  modelDigital,
+  modelHardcopy,
+  profileDigital,
+  profileHardcopy,
+  tableDigital,
+  tableHardcopy,
+  videoDigital,
+  videoHardcopy
+}
diff --git a/...e/mde_backend/model/json/CI_RoleCode.java → ...end/model/json/codelists/CI_RoleCode.java b/...e/mde_backend/model/json/CI_RoleCode.java → ...end/model/json/codelists/CI_RoleCode.java
@@ -1,4 +1,4 @@
-package de.terrestris.mde.mde_backend.model.json;
+package de.terrestris.mde.mde_backend.model.json.codelists;
 
 public enum CI_RoleCode {
   resourceProvider,

diff --git a/...src/main/java/de/terrestris/mde/mde_backend/model/json/codelists/MD_CharacterSetCode.java b/...src/main/java/de/terrestris/mde/mde_backend/model/json/codelists/MD_CharacterSetCode.java
@@ -0,0 +1,21 @@
+package de.terrestris.mde.mde_backend.model.json.codelists;
+
+public enum MD_CharacterSetCode {
+  ucs2,
+  ucs4,
+  utf7,
+  utf8,
+  utf16
+  // omitted because identifiers are not legal in java (and not used anyway)
+  //8859part1,
+  //8859part2,
+  //8859part3,
+  //8859part4,
+  //8859part5,
+  //8859part6,
+  //8859part7,
+  //8859part8,
+  //8859part9,
+  //8859part10,
+  //8859part11
+}
diff --git a/...del/json/MD_MaintenanceFrequencyCode.java → ...odelists/MD_MaintenanceFrequencyCode.java b/...del/json/MD_MaintenanceFrequencyCode.java → ...odelists/MD_MaintenanceFrequencyCode.java
@@ -1,4 +1,4 @@
-package de.terrestris.mde.mde_backend.model.json;
+package de.terrestris.mde.mde_backend.model.json.codelists;
 
 public enum MD_MaintenanceFrequencyCode {
   continual,

diff --git a/...ackend/model/json/MD_RestrictionCode.java → ...el/json/codelists/MD_RestrictionCode.java b/...ackend/model/json/MD_RestrictionCode.java → ...el/json/codelists/MD_RestrictionCode.java
@@ -1,4 +1,4 @@
-package de.terrestris.mde.mde_backend.model.json;
+package de.terrestris.mde.mde_backend.model.json.codelists;
 
 public enum MD_RestrictionCode {
 

diff --git a/...rvices/src/main/java/de/terrestris/mde/mde_backend/model/json/codelists/MD_ScopeCode.java b/...rvices/src/main/java/de/terrestris/mde/mde_backend/model/json/codelists/MD_ScopeCode.java
@@ -0,0 +1,20 @@
+package de.terrestris.mde.mde_backend.model.json.codelists;
+
+public enum MD_ScopeCode {
+  attribute,
+  attributeType,
+  collectionHardware,
+  collectionSession,
+  dataset,
+  series,
+  nonGeographicDataset,
+  dimensionGroup,
+  feature,
+  featureType,
+  propertyType,
+  fieldSession,
+  software,
+  service,
+  model,
+  tile
+}