Bump version to 12.2.0-SNAPSHOT

Add builders to geo location classes
dbmdz · Aug 28, 2023 · bc31dfd · bc31dfd
1 parent e987fd3
commit bc31dfd
Show file tree

Hide file tree

Showing 7 changed files with 155 additions and 5 deletions.
diff --git a/dc-model-jackson/pom.xml b/dc-model-jackson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>de.digitalcollections.model</groupId>
     <artifactId>dc-model-parent</artifactId>
-    <version>12.1.0</version>
+    <version>12.2.0-SNAPSHOT</version>
   </parent>
 
   <name>DigitalCollections: Model (Jackson)</name>

diff --git a/dc-model-mappings/dc-model-html-mapping/pom.xml b/dc-model-mappings/dc-model-html-mapping/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.digitalcollections.model</groupId>
     <artifactId>dc-model-mappings</artifactId>
-    <version>12.1.0</version>
+    <version>12.2.0-SNAPSHOT</version>
   </parent>
 
   <name>DigitalCollections: Model (Mappings: HTML)</name>

diff --git a/dc-model-mappings/pom.xml b/dc-model-mappings/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.digitalcollections.model</groupId>
     <artifactId>dc-model-parent</artifactId>
-    <version>12.1.0</version>
+    <version>12.2.0-SNAPSHOT</version>
   </parent>
 
   <name>DigitalCollections: Model (Mappings)</name>

diff --git a/dc-model/pom.xml b/dc-model/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>de.digitalcollections.model</groupId>
     <artifactId>dc-model-parent</artifactId>
-    <version>12.1.0</version>
+    <version>12.2.0-SNAPSHOT</version>
   </parent>
 
   <name>DigitalCollections: Model (Model)</name>

diff --git a/...el/src/main/java/de/digitalcollections/model/identifiable/entity/geo/location/Canyon.java b/...el/src/main/java/de/digitalcollections/model/identifiable/entity/geo/location/Canyon.java
@@ -1,19 +1,94 @@
 package de.digitalcollections.model.identifiable.entity.geo.location;
 
+import lombok.experimental.SuperBuilder;
+
 /**
  * A deep ravine between cliffs. see https://www.wikidata.org/wiki/Q150784 "Schlucht; tief
  * eingeschnittenes Tal"
  */
+@SuperBuilder(buildMethodName = "prebuild")
 public class Canyon extends GeoLocation {
 
+  public abstract static class CanyonBuilder<C extends Canyon, B extends CanyonBuilder<C, B>>
+      extends GeoLocationBuilder<C, B> {
+
+    @Override
+    public C build() {
+      C c = prebuild();
+      c.init();
+      setInternalReferences(c);
+      return c;
+    }
+  }
+
   public Canyon() {
     super();
     init();
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) return true;
+    if (!super.equals(obj)) return false;
+    if (getClass() != obj.getClass()) return false;
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return super.hashCode();
+  }
+
   @Override
   protected void init() {
     super.init();
     this.geoLocationType = GeoLocationType.CANYON;
   }
+
+  @Override
+  public String toString() {
+    return "Canyon [coordinateLocation="
+        + coordinateLocation
+        + ", geoLocationType="
+        + geoLocationType
+        + ", name="
+        + name
+        + ", nameLocalesOfOriginalScripts="
+        + nameLocalesOfOriginalScripts
+        + ", customAttributes="
+        + customAttributes
+        + ", navDate="
+        + navDate
+        + ", refId="
+        + refId
+        + ", notes="
+        + notes
+        + ", description="
+        + description
+        + ", identifiableObjectType="
+        + identifiableObjectType
+        + ", identifiers="
+        + identifiers
+        + ", label="
+        + label
+        + ", localizedUrlAliases="
+        + localizedUrlAliases
+        + ", previewImage="
+        + previewImage
+        + ", previewImageRenderingHints="
+        + previewImageRenderingHints
+        + ", subjects="
+        + subjects
+        + ", tags="
+        + tags
+        + ", type="
+        + type
+        + ", created="
+        + created
+        + ", lastModified="
+        + lastModified
+        + ", uuid="
+        + uuid
+        + "]";
+  }
 }
diff --git a/...odel/src/main/java/de/digitalcollections/model/identifiable/entity/geo/location/Cave.java b/...odel/src/main/java/de/digitalcollections/model/identifiable/entity/geo/location/Cave.java
@@ -1,19 +1,94 @@
 package de.digitalcollections.model.identifiable.entity.geo.location;
 
+import lombok.experimental.SuperBuilder;
+
 /**
  * A natural underground space large enough for a human to enter. see
  * https://www.wikidata.org/wiki/Q35509 "Höhle; natürlich entstandener unterirdischer Hohlraum"
  */
+@SuperBuilder(buildMethodName = "prebuild")
 public class Cave extends GeoLocation {
 
+  public abstract static class CaveBuilder<C extends Cave, B extends CaveBuilder<C, B>>
+      extends GeoLocationBuilder<C, B> {
+
+    @Override
+    public C build() {
+      C c = prebuild();
+      c.init();
+      setInternalReferences(c);
+      return c;
+    }
+  }
+
   public Cave() {
     super();
     init();
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) return true;
+    if (!super.equals(obj)) return false;
+    if (getClass() != obj.getClass()) return false;
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return super.hashCode();
+  }
+
   @Override
   protected void init() {
     super.init();
     this.geoLocationType = GeoLocationType.CAVE;
   }
+
+  @Override
+  public String toString() {
+    return "Cave [coordinateLocation="
+        + coordinateLocation
+        + ", geoLocationType="
+        + geoLocationType
+        + ", name="
+        + name
+        + ", nameLocalesOfOriginalScripts="
+        + nameLocalesOfOriginalScripts
+        + ", customAttributes="
+        + customAttributes
+        + ", navDate="
+        + navDate
+        + ", refId="
+        + refId
+        + ", notes="
+        + notes
+        + ", description="
+        + description
+        + ", identifiableObjectType="
+        + identifiableObjectType
+        + ", identifiers="
+        + identifiers
+        + ", label="
+        + label
+        + ", localizedUrlAliases="
+        + localizedUrlAliases
+        + ", previewImage="
+        + previewImage
+        + ", previewImageRenderingHints="
+        + previewImageRenderingHints
+        + ", subjects="
+        + subjects
+        + ", tags="
+        + tags
+        + ", type="
+        + type
+        + ", created="
+        + created
+        + ", lastModified="
+        + lastModified
+        + ", uuid="
+        + uuid
+        + "]";
+  }
 }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>de.digitalcollections.model</groupId>
   <artifactId>dc-model-parent</artifactId>
-  <version>12.1.0</version>
+  <version>12.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>