Update to model v3

.github/workflows/generate-java.yml

@@ -1,13 +1,14 @@
+name: Generate Java
 
 on:
   push:
     branches:
-    - "**"
-    - "!main"
+      - "**"
+      - "!main"
     paths:
-    - "src/**"
-    - "generated/java/datadoc-model/pom.xml"
-    - ".github/workflows/generate-java.yml"
+      - "src/**"
+      - "generated/java/datadoc-model/pom.xml"
+      - ".github/workflows/generate-java.yml"
 
 # Allow only one generate workflow to run at a time. This avoids race conditions when
 # pushing to the same branch.
@@ -38,10 +39,10 @@ jobs:
 
       - name: Generate Java
         run: |
-            pushd generated/java/datadoc-model
-            rm -rf src/main/java
-            ./mvnw jsonschema2pojo:generate
-            popd
+          pushd generated/java/datadoc-model
+          rm -rf src/main/java
+          ./mvnw jsonschema2pojo:generate
+          popd
 
       - name: Check for modified files
         id: git-check
@@ -50,11 +51,11 @@ jobs:
       - name: Commit
         if: steps.git-check.outputs.modified == 'true'
         run: |
-            git add -A
-            git commit -m '[GENERATE] Java classes from JSON Schema'
+          git add -A
+          git commit -m '[GENERATE] Java classes from JSON Schema'
 
       - name: Push
         if: steps.git-check.outputs.modified == 'true'
         run: |
-            git pull --rebase origin "${GITHUB_REF}"
-            git push origin "${GITHUB_REF}"
+          git pull --rebase origin "${GITHUB_REF}"
+          git push origin "${GITHUB_REF}"

.github/workflows/generate-python.yml

@@ -1,12 +1,13 @@
+name: Generate Python
 
 on:
   push:
     branches:
-    - "**"
-    - "!main"
+      - "**"
+      - "!main"
     paths:
-    - "src/**/*.json"
-    - ".github/workflows/generate-python.yml"
+      - "src/**/*.json"
+      - ".github/workflows/generate-python.yml"
 
 # Allow only one generate workflow to run at a time. This avoids race conditions when
 # pushing to the same branch.
@@ -40,29 +41,29 @@ jobs:
 
       - name: Install pipx
         run: |
-            python -m pip install --upgrade pipx
-            python -m pipx ensurepath
+          python -m pip install --upgrade pipx
+          python -m pipx ensurepath
 
       - name: Install datamodel-codegen
         run: |
-            python -m pipx install datamodel-code-generator==0.25.2
+          python -m pipx install datamodel-code-generator==0.25.2
 
       - name: Generate Python
         run: >
-            datamodel-codegen
-            --input-file-type jsonschema
-            --input src/metadata-container-json-schema.json
-            --output-model-type pydantic_v2.BaseModel
-            --base-class "datadoc_model.datadoc_base_model.DatadocBaseModel"
-            --use-default
-            --use-title-as-name
-            --use-one-literal-as-default
-            --force-optional
-            --use-subclass-enum
-            --use-standard-collections
-            --use-double-quotes
-            --target-python-version 3.10
-            --output generated/python/datadoc_model/datadoc_model/model.py
+          datamodel-codegen
+          --input-file-type jsonschema
+          --input src/metadata-container-json-schema.json
+          --output-model-type pydantic_v2.BaseModel
+          --base-class "datadoc_model.datadoc_base_model.DatadocBaseModel"
+          --use-default
+          --use-title-as-name
+          --use-one-literal-as-default
+          --force-optional
+          --use-subclass-enum
+          --use-standard-collections
+          --use-double-quotes
+          --target-python-version 3.10
+          --output generated/python/datadoc_model/datadoc_model/model.py
 
       - name: Check for modified files
         id: git-check
@@ -71,11 +72,11 @@ jobs:
       - name: Commit
         if: steps.git-check.outputs.modified == 'true'
         run: |
-            git add -A
-            git commit -m '[GENERATE] Pydantic models from JSON Schema'
+          git add -A
+          git commit -m '[GENERATE] Pydantic models from JSON Schema'
 
       - name: Push
         if: steps.git-check.outputs.modified == 'true'
         run: |
-            git pull --rebase origin "${GITHUB_REF}"
-            git push origin "${GITHUB_REF}"
+          git pull --rebase origin "${GITHUB_REF}"
+          git push origin "${GITHUB_REF}"

generated/java/datadoc-model/pom.xml

@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>no.ssb.dapla.metadata</groupId>
   <artifactId>datadoc-model</artifactId>
@@ -13,7 +15,8 @@
     <maven.compiler.source>${jdk.version}</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <artifact-registry.url>artifactregistry://europe-north1-maven.pkg.dev/artifact-registry-5n/dapla-stat-maven/</artifact-registry.url>
+    <artifact-registry.url>
+      artifactregistry://europe-north1-maven.pkg.dev/artifact-registry-5n/dapla-stat-maven/</artifact-registry.url>
     <github.repository>statisticsnorway/ssb-datadoc-model</github.repository>
 
     <!-- Dependency versions -->
@@ -35,66 +38,66 @@
 
   <dependencies>
     <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>${commons-lang.version}</version>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>${commons-lang.version}</version>
     </dependency>
     <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>${jackson-databind.version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <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>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>${jakarta.validation-api.version}</version>
     </dependency>
   </dependencies>
 
   <build>
     <pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>${maven-release-plugin.version}</version>
-                <configuration>
-                <tagNameFormat>java-v@{project.version}</tagNameFormat>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.jsonschema2pojo</groupId>
-                <artifactId>jsonschema2pojo-maven-plugin</artifactId>
-                <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>
-                    <generateBuilders>true</generateBuilders>
-                    <useInnerClassBuilders>true</useInnerClassBuilders>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${jdk.version}</source>
-                    <target>${jdk.version}</target>
-                </configuration>
-            </plugin>
-        </plugins>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>${maven-release-plugin.version}</version>
+          <configuration>
+            <tagNameFormat>java-v@{project.version}</tagNameFormat>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.jsonschema2pojo</groupId>
+          <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+          <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>
+            <generateBuilders>true</generateBuilders>
+            <useInnerClassBuilders>true</useInnerClassBuilders>
+          </configuration>
+          <executions>
+            <execution>
+              <goals>
+                <goal>generate</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>${jdk.version}</source>
+            <target>${jdk.version}</target>
+          </configuration>
+        </plugin>
+      </plugins>
     </pluginManagement>
 
     <extensions>
@@ -104,7 +107,6 @@
         <version>${artifactregistry-maven-wagon.version}</version>
       </extension>
     </extensions>
-
   </build>
 
   <repositories>
@@ -158,4 +160,4 @@
     </repository>
   </distributionManagement>
 
-</project>
+</project>