Fix Java package build

.github/workflows/generate-java.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Generate Java
         run: |
             pushd generated/java/datadoc-model
-            rm -rf target/generated-sources/jsonschema2pojo
+            rm -rf src/main/java
             ./mvnw jsonschema2pojo:generate
             popd
 

generated/java/datadoc-model/pom.xml

@@ -19,6 +19,7 @@
     <!-- Dependency versions -->
     <commons-lang.version>2.6</commons-lang.version>
     <jackson-databind.version>2.16.0</jackson-databind.version>
+    <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
 
     <!-- Plugin/extension versions -->
     <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
@@ -43,6 +44,11 @@
         <artifactId>jackson-databind</artifactId>
         <version>${jackson-databind.version}</version>
     </dependency>
+    <dependency>
+        <groupId>jakarta.validation</groupId>
+        <artifactId>jakarta.validation-api</artifactId>
+        <version>${jakarta.validation-api.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -62,10 +68,13 @@
                 <version>${jsonschema2pojo-maven-plugin.version}</version>
                 <configuration>
                     <sourceDirectory>${basedir}../../../../src</sourceDirectory>
+                    <outputDirectory>${basedir}/src/main/java</outputDirectory>
                     <targetPackage>no.ssb.dapla.metadata</targetPackage>
                     <serializable>true</serializable>
                     <includeConstructors>true</includeConstructors>
                     <includeJsr303Annotations>true</includeJsr303Annotations>
+                    <useJakartaValidation>true</useJakartaValidation>
+                    <useTitleAsClassname>true</useTitleAsClassname>
                 </configuration>
                 <executions>
                     <execution>

generated/java/datadoc-model/target/generated-sources/jsonschema2pojo/no/ssb/dapla/metadata/EncryptionAlgorithmParameter.java → generated/java/datadoc-model/src/main/java/no/ssb/dapla/metadata/EncryptionAlgorithmParameter.java

@@ -5,12 +5,12 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import javax.validation.Valid;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import jakarta.validation.Valid;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({

generated/java/datadoc-model/target/generated-sources/jsonschema2pojo/no/ssb/dapla/metadata/MetadataContainerJsonSchema.java → generated/java/datadoc-model/src/main/java/no/ssb/dapla/metadata/MetadataContainer.java

@@ -5,14 +5,14 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import javax.validation.Valid;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import no.ssb.dapla.metadata.datadoc.DatadocJsonSchema;
+import jakarta.validation.Valid;
+import no.ssb.dapla.metadata.datadoc.DatadocMetadata;
 
 
 /**
@@ -28,7 +28,7 @@
     "pseudonymization"
 })
 @Generated("jsonschema2pojo")
-public class MetadataContainerJsonSchema implements Serializable
+public class MetadataContainer implements Serializable
 {
 
     /**
@@ -45,7 +45,7 @@ public class MetadataContainerJsonSchema implements Serializable
      */
     @JsonProperty("datadoc")
     @Valid
-    private DatadocJsonSchema datadoc;
+    private DatadocMetadata datadoc;
     /**
      * Pseudonymization metadata
      * <p>
@@ -54,20 +54,20 @@ public class MetadataContainerJsonSchema implements Serializable
      */
     @JsonProperty("pseudonymization")
     @Valid
-    private PseudonymizationJsonSchema pseudonymization;
+    private PseudonymizationMetadata pseudonymization;
     @JsonIgnore
     @Valid
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-    private final static long serialVersionUID = -7643741090930903820L;
+    private final static long serialVersionUID = 4303907007177379069L;
 
     /**
      * No args constructor for use in serialization
      * 
      */
-    public MetadataContainerJsonSchema() {
+    public MetadataContainer() {
     }
 
-    public MetadataContainerJsonSchema(Object documentVersion, DatadocJsonSchema datadoc, PseudonymizationJsonSchema pseudonymization) {
+    public MetadataContainer(Object documentVersion, DatadocMetadata datadoc, PseudonymizationMetadata pseudonymization) {
         super();
         this.documentVersion = documentVersion;
         this.datadoc = datadoc;
@@ -99,7 +99,7 @@ public void setDocumentVersion(Object documentVersion) {
      * 
      */
     @JsonProperty("datadoc")
-    public DatadocJsonSchema getDatadoc() {
+    public DatadocMetadata getDatadoc() {
         return datadoc;
     }
 
@@ -110,7 +110,7 @@ public DatadocJsonSchema getDatadoc() {
      * 
      */
     @JsonProperty("datadoc")
-    public void setDatadoc(DatadocJsonSchema datadoc) {
+    public void setDatadoc(DatadocMetadata datadoc) {
         this.datadoc = datadoc;
     }
 
@@ -121,7 +121,7 @@ public void setDatadoc(DatadocJsonSchema datadoc) {
      * 
      */
     @JsonProperty("pseudonymization")
-    public PseudonymizationJsonSchema getPseudonymization() {
+    public PseudonymizationMetadata getPseudonymization() {
         return pseudonymization;
     }
 
@@ -132,7 +132,7 @@ public PseudonymizationJsonSchema getPseudonymization() {
      * 
      */
     @JsonProperty("pseudonymization")
-    public void setPseudonymization(PseudonymizationJsonSchema pseudonymization) {
+    public void setPseudonymization(PseudonymizationMetadata pseudonymization) {
         this.pseudonymization = pseudonymization;
     }
 
@@ -149,7 +149,7 @@ public void setAdditionalProperty(String name, Object value) {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append(MetadataContainerJsonSchema.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
+        sb.append(MetadataContainer.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
         sb.append("documentVersion");
         sb.append('=');
         sb.append(((this.documentVersion == null)?"<null>":this.documentVersion));
@@ -189,10 +189,10 @@ public boolean equals(Object other) {
         if (other == this) {
             return true;
         }
-        if ((other instanceof MetadataContainerJsonSchema) == false) {
+        if ((other instanceof MetadataContainer) == false) {
             return false;
         }
-        MetadataContainerJsonSchema rhs = ((MetadataContainerJsonSchema) other);
+        MetadataContainer rhs = ((MetadataContainer) other);
         return (((((this.datadoc == rhs.datadoc)||((this.datadoc!= null)&&this.datadoc.equals(rhs.datadoc)))&&((this.additionalProperties == rhs.additionalProperties)||((this.additionalProperties!= null)&&this.additionalProperties.equals(rhs.additionalProperties))))&&((this.pseudonymization == rhs.pseudonymization)||((this.pseudonymization!= null)&&this.pseudonymization.equals(rhs.pseudonymization))))&&((this.documentVersion == rhs.documentVersion)||((this.documentVersion!= null)&&this.documentVersion.equals(rhs.documentVersion))));
     }
 

generated/java/datadoc-model/target/generated-sources/jsonschema2pojo/no/ssb/dapla/metadata/PseudoDataset.java → generated/java/datadoc-model/src/main/java/no/ssb/dapla/metadata/PseudoDataset.java

@@ -6,15 +6,15 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({

generated/java/datadoc-model/target/generated-sources/jsonschema2pojo/no/ssb/dapla/metadata/PseudoVariable.java → generated/java/datadoc-model/src/main/java/no/ssb/dapla/metadata/PseudoVariable.java

@@ -8,8 +8,6 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -19,6 +17,8 @@
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonValue;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 
 /**
@@ -138,11 +138,11 @@ public class PseudoVariable implements Serializable
      */
     @JsonProperty("source_variable_datatype")
     @JsonPropertyDescription("Data type of the variable prior to pseudonymization.")
-    private PseudoVariable.SourceVariableDatatype sourceVariableDatatype;
+    private PseudoVariable.SourceVariableDataType sourceVariableDatatype;
     @JsonIgnore
     @Valid
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-    private final static long serialVersionUID = -1415496424825597852L;
+    private final static long serialVersionUID = 5828695100678287117L;
 
     /**
      * No args constructor for use in serialization
@@ -174,7 +174,7 @@ public PseudoVariable() {
      * @param encryptionAlgorithm
      *     Encryption algorithm. The encryption algorithm used to pseudonymize the variable.
      */
-    public PseudoVariable(String shortName, String dataElementPath, String dataElementPattern, String stableIdentifierType, String stableIdentifierVersion, String encryptionAlgorithm, String encryptionKeyReference, List<EncryptionAlgorithmParameter> encryptionAlgorithmParameters, String sourceVariable, PseudoVariable.SourceVariableDatatype sourceVariableDatatype) {
+    public PseudoVariable(String shortName, String dataElementPath, String dataElementPattern, String stableIdentifierType, String stableIdentifierVersion, String encryptionAlgorithm, String encryptionKeyReference, List<EncryptionAlgorithmParameter> encryptionAlgorithmParameters, String sourceVariable, PseudoVariable.SourceVariableDataType sourceVariableDatatype) {
         super();
         this.shortName = shortName;
         this.dataElementPath = dataElementPath;
@@ -399,7 +399,7 @@ public void setSourceVariable(String sourceVariable) {
      * 
      */
     @JsonProperty("source_variable_datatype")
-    public PseudoVariable.SourceVariableDatatype getSourceVariableDatatype() {
+    public PseudoVariable.SourceVariableDataType getSourceVariableDatatype() {
         return sourceVariableDatatype;
     }
 
@@ -410,7 +410,7 @@ public PseudoVariable.SourceVariableDatatype getSourceVariableDatatype() {
      * 
      */
     @JsonProperty("source_variable_datatype")
-    public void setSourceVariableDatatype(PseudoVariable.SourceVariableDatatype sourceVariableDatatype) {
+    public void setSourceVariableDatatype(PseudoVariable.SourceVariableDataType sourceVariableDatatype) {
         this.sourceVariableDatatype = sourceVariableDatatype;
     }
 
@@ -517,22 +517,22 @@ public boolean equals(Object other) {
      * 
      */
     @Generated("jsonschema2pojo")
-    public enum SourceVariableDatatype {
+    public enum SourceVariableDataType {
 
         STRING("STRING"),
         INTEGER("INTEGER"),
         FLOAT("FLOAT"),
         DATETIME("DATETIME");
         private final String value;
-        private final static Map<String, PseudoVariable.SourceVariableDatatype> CONSTANTS = new HashMap<String, PseudoVariable.SourceVariableDatatype>();
+        private final static Map<String, PseudoVariable.SourceVariableDataType> CONSTANTS = new HashMap<String, PseudoVariable.SourceVariableDataType>();
 
         static {
-            for (PseudoVariable.SourceVariableDatatype c: values()) {
+            for (PseudoVariable.SourceVariableDataType c: values()) {
                 CONSTANTS.put(c.value, c);
             }
         }
 
-        SourceVariableDatatype(String value) {
+        SourceVariableDataType(String value) {
             this.value = value;
         }
 
@@ -547,8 +547,8 @@ public String value() {
         }
 
         @JsonCreator
-        public static PseudoVariable.SourceVariableDatatype fromValue(String value) {
-            PseudoVariable.SourceVariableDatatype constant = CONSTANTS.get(value);
+        public static PseudoVariable.SourceVariableDataType fromValue(String value) {
+            PseudoVariable.SourceVariableDataType constant = CONSTANTS.get(value);
             if (constant == null) {
                 throw new IllegalArgumentException(value);
             } else {

generated/java/datadoc-model/target/generated-sources/jsonschema2pojo/no/ssb/dapla/metadata/PseudonymizationJsonSchema.java → generated/java/datadoc-model/src/main/java/no/ssb/dapla/metadata/PseudonymizationMetadata.java

@@ -7,14 +7,14 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.processing.Generated;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 
 /**
@@ -30,7 +30,7 @@
     "pseudo_variables"
 })
 @Generated("jsonschema2pojo")
-public class PseudonymizationJsonSchema implements Serializable
+public class PseudonymizationMetadata implements Serializable
 {
 
     /**
@@ -61,16 +61,16 @@ public class PseudonymizationJsonSchema implements Serializable
     @JsonIgnore
     @Valid
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-    private final static long serialVersionUID = 4491182946050709357L;
+    private final static long serialVersionUID = 5122921273769273027L;
 
     /**
      * No args constructor for use in serialization
      * 
      */
-    public PseudonymizationJsonSchema() {
+    public PseudonymizationMetadata() {
     }
 
-    public PseudonymizationJsonSchema(Object documentVersion, PseudoDataset pseudoDataset, List<PseudoVariable> pseudoVariables) {
+    public PseudonymizationMetadata(Object documentVersion, PseudoDataset pseudoDataset, List<PseudoVariable> pseudoVariables) {
         super();
         this.documentVersion = documentVersion;
         this.pseudoDataset = pseudoDataset;
@@ -150,7 +150,7 @@ public void setAdditionalProperty(String name, Object value) {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append(PseudonymizationJsonSchema.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
+        sb.append(PseudonymizationMetadata.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
         sb.append("documentVersion");
         sb.append('=');
         sb.append(((this.documentVersion == null)?"<null>":this.documentVersion));
@@ -190,10 +190,10 @@ public boolean equals(Object other) {
         if (other == this) {
             return true;
         }
-        if ((other instanceof PseudonymizationJsonSchema) == false) {
+        if ((other instanceof PseudonymizationMetadata) == false) {
             return false;
         }
-        PseudonymizationJsonSchema rhs = ((PseudonymizationJsonSchema) other);
+        PseudonymizationMetadata rhs = ((PseudonymizationMetadata) other);
         return (((((this.additionalProperties == rhs.additionalProperties)||((this.additionalProperties!= null)&&this.additionalProperties.equals(rhs.additionalProperties)))&&((this.pseudoDataset == rhs.pseudoDataset)||((this.pseudoDataset!= null)&&this.pseudoDataset.equals(rhs.pseudoDataset))))&&((this.documentVersion == rhs.documentVersion)||((this.documentVersion!= null)&&this.documentVersion.equals(rhs.documentVersion))))&&((this.pseudoVariables == rhs.pseudoVariables)||((this.pseudoVariables!= null)&&this.pseudoVariables.equals(rhs.pseudoVariables))));
     }