feat: update importer

.editorconfig

@@ -1,14 +1,10 @@
 root = true
 
-[*.java]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
+[*]
 indent_style = space
-indent_size = 4
+indent_size = 2
+end_of_line = lf
 charset = utf-8
-
-# XML config files
-[*.xml]
-indent_style = space
-indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+tab_width = 2

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/ClientMetadata.java

@@ -2,14 +2,14 @@
 
 import de.terrestris.mde.mde_backend.model.json.JsonClientMetadata;
 import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.hibernate.annotations.Type;
 
-import java.util.List;
-
 @EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "client_metadata")
@@ -19,6 +19,6 @@ public class ClientMetadata extends BaseMetadata {
   @Column
   @Type(JsonBinaryType.class)
   @ToString.Exclude
-  private List<JsonClientMetadata> data;
+  private JsonClientMetadata data;
 
 }

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/IsoMetadata.java

@@ -2,15 +2,16 @@
 
 import de.terrestris.mde.mde_backend.model.json.JsonIsoMetadata;
 import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
-import jakarta.persistence.*;
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.*;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.Type;
 
-import java.util.List;
-
 @EqualsAndHashCode(callSuper = true)
 @DynamicUpdate
 @Entity
@@ -27,6 +28,6 @@ public class IsoMetadata extends BaseMetadata {
   @Column
   @Type(JsonBinaryType.class)
   @ToString.Exclude
-  private List<JsonIsoMetadata> data;
+  private JsonIsoMetadata data;
 
 }

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/TechnicalMetadata.java

@@ -10,8 +10,6 @@
 import lombok.ToString;
 import org.hibernate.annotations.Type;
 
-import java.util.List;
-
 @EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "technical_metadata")
@@ -21,6 +19,6 @@ public class TechnicalMetadata extends BaseMetadata {
   @Column
   @Type(JsonBinaryType.class)
   @ToString.Exclude
-  private List<JsonTechnicalMetadata> data;
+  private JsonTechnicalMetadata data;
 
 }

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/Citation.java

@@ -0,0 +1,28 @@
+package de.terrestris.mde.mde_backend.model.json;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.Instant;
+
+import static com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING;
+
+@Data
+@JsonDeserialize(as = Citation.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@NoArgsConstructor(force = true)
+@AllArgsConstructor
+public class Citation {
+
+  private String title;
+
+  @JsonFormat(shape = STRING)
+  private Instant date;
+
+  private String url;
+
+}

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/ColumnInfo.java

@@ -21,13 +21,27 @@ public enum FilterType {
     EditOrderField
   }
 
+  public enum ColumnType {
+    BigDecimal,
+    Date,
+    Double,
+    Float,
+    Geometry,
+    Integer,
+    Link,
+    Long,
+    Text,
+    Short,
+    Timestamp
+  }
+
   private String name;
 
   private String title;
 
   private String description;
 
-  private String impressum;
+  private ColumnType type;
 
   private boolean listView;
 

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/DistributionVersion.java

@@ -0,0 +1,22 @@
+package de.terrestris.mde.mde_backend.model.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@JsonDeserialize(as = DistributionVersion.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@NoArgsConstructor(force = true)
+@AllArgsConstructor
+public class DistributionVersion {
+
+  private String name;
+
+  private String version;
+
+  private String specification;
+
+}

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/JsonClientMetadata.java

@@ -23,6 +23,6 @@ public class JsonClientMetadata {
 
   private Extent initialExtent;
 
-  private List<ColumnInfo> columns;
+  private List<Layer> layers;
 
 }

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/JsonIsoMetadata.java

@@ -48,6 +48,8 @@ public enum InspireTheme {
 
   private InspireTheme inspireTheme;
 
+  private List<DistributionVersion> distributionVersions;
+
   private String fileIdentifier;
 
   private DataIdentificator dataIdentificator;
@@ -102,4 +104,12 @@ public enum InspireTheme {
 
   private List<ContentDescription> contentDescriptions;
 
+  private List<ResourceConstraints> resourceConstraints;
+
+  private String lineage;
+
+  private Citation citation;
+
+  private boolean valid;
+
 }

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/JsonTechnicalMetadata.java

@@ -23,4 +23,6 @@ public class JsonTechnicalMetadata {
 
   private String deliveredCrs;
 
+  private List<String> descriptions;
+
 }

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/Layer.java

@@ -13,16 +13,24 @@
 @AllArgsConstructor
 public class Layer {
 
+  private String relatedTopic;
+
+  private String name;
+
   private String title;
 
-  private String shortDescription;
+  private String styleName;
 
-  private String description;
+  private String styleTitle;
+
+  private String shortDescription;
 
   private LegendImage legendImage;
 
   private double minScale;
 
   private double maxScale;
 
+  private String datasource;
+
 }

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/LayerInfo.java

@@ -15,4 +15,6 @@ public class LayerInfo {
 
   private String accessInfo;
 
+  private String workspace;
+
 }

mde-services/src/main/java/de/terrestris/mde/mde_backend/model/json/Service.java

@@ -61,4 +61,6 @@ public enum ServiceType {
 
   private List<Source> previews;
 
+  private List<ColumnInfo> columns;
+
 }