Merge remote-tracking branch 'refs/remotes/origin/feat/update-use-restriction' into feat/update-use-restriction

Author: Jorgen-5

generated/java/datadoc-model/src/main/java/no/ssb/dapla/metadata/datadoc/Dataset.java

@@ -172,11 +172,11 @@ public class Dataset implements Serializable
     /**
      * Use restriction
      * <p>
-     * Use restriction
+     * Any usage restrictions and usage restriction dates for the dataset, for example a deadline (date) for when the dataset should be deleted/anonymized.
      * 
      */
     @JsonProperty("use_restrictions")
-    @JsonPropertyDescription("Use restriction")
+    @JsonPropertyDescription("Any usage restrictions and usage restriction dates for the dataset, for example a deadline (date) for when the dataset should be deleted/anonymized.")
     @Valid
     private List<UseRestriction> useRestrictions = new ArrayList<UseRestriction>();
     /**
@@ -337,7 +337,7 @@ public Dataset() {
      * @param name
      *     Name. Name of data set.
      * @param useRestrictions
-     *     Use restriction. Use restriction.
+     *     Use restriction. Any usage restrictions and usage restriction dates for the dataset, for example a deadline (date) for when the dataset should be deleted/anonymized.
      * @param id
      *     Identifier. Unique identifier for the data set.
      * @param shortName
@@ -641,7 +641,7 @@ public void setSpatialCoverageDescription(List<Object> spatialCoverageDescriptio
     /**
      * Use restriction
      * <p>
-     * Use restriction
+     * Any usage restrictions and usage restriction dates for the dataset, for example a deadline (date) for when the dataset should be deleted/anonymized.
      * 
      */
     @JsonProperty("use_restrictions")
@@ -652,7 +652,7 @@ public List<UseRestriction> getUseRestrictions() {
     /**
      * Use restriction
      * <p>
-     * Use restriction
+     * Any usage restrictions and usage restriction dates for the dataset, for example a deadline (date) for when the dataset should be deleted/anonymized.
      * 
      */
     @JsonProperty("use_restrictions")

generated/java/datadoc-model/src/main/java/no/ssb/dapla/metadata/datadoc/UseRestriction.java

@@ -2,7 +2,6 @@
 package no.ssb.dapla.metadata.datadoc;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -44,11 +43,11 @@ public class UseRestriction implements Serializable
      */
     @JsonProperty("use_restriction_date")
     @JsonPropertyDescription("Use restriction date, eg. the date (deadline) for when data must be deleted/anonymised.")
-    private Date useRestrictionDate;
+    private String useRestrictionDate;
     @JsonIgnore
     @Valid
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-    private final static long serialVersionUID = -5042768301310056697L;
+    private final static long serialVersionUID = -6727527747502538009L;
 
     /**
      * No args constructor for use in serialization
@@ -64,7 +63,7 @@ public UseRestriction() {
      * @param useRestrictionDate
      *     Use restriction date. Use restriction date, eg. the date (deadline) for when data must be deleted/anonymised.
      */
-    public UseRestriction(UseRestriction.UseRestrictionType useRestrictionType, Date useRestrictionDate) {
+    public UseRestriction(UseRestriction.UseRestrictionType useRestrictionType, String useRestrictionDate) {
         super();
         this.useRestrictionType = useRestrictionType;
         this.useRestrictionDate = useRestrictionDate;
@@ -103,7 +102,7 @@ public void setUseRestrictionType(UseRestriction.UseRestrictionType useRestricti
      * 
      */
     @JsonProperty("use_restriction_date")
-    public Date getUseRestrictionDate() {
+    public String getUseRestrictionDate() {
         return useRestrictionDate;
     }
 
@@ -114,7 +113,7 @@ public Date getUseRestrictionDate() {
      * 
      */
     @JsonProperty("use_restriction_date")
-    public void setUseRestrictionDate(Date useRestrictionDate) {
+    public void setUseRestrictionDate(String useRestrictionDate) {
         this.useRestrictionDate = useRestrictionDate;
     }
 
@@ -182,7 +181,7 @@ public UseRestrictionBuilder() {
             super();
         }
 
-        public UseRestrictionBuilder(UseRestriction.UseRestrictionType useRestrictionType, Date useRestrictionDate) {
+        public UseRestrictionBuilder(UseRestriction.UseRestrictionType useRestrictionType, String useRestrictionDate) {
             super(useRestrictionType, useRestrictionDate);
         }
 
@@ -201,7 +200,7 @@ public UseRestrictionBuilderBase() {
         }
 
         @SuppressWarnings("unchecked")
-        public UseRestrictionBuilderBase(UseRestriction.UseRestrictionType useRestrictionType, Date useRestrictionDate) {
+        public UseRestrictionBuilderBase(UseRestriction.UseRestrictionType useRestrictionType, String useRestrictionDate) {
             // Skip initialization when called from subclass
             if (this.getClass().equals(UseRestriction.UseRestrictionBuilder.class)) {
                 this.instance = ((T) new UseRestriction(useRestrictionType, useRestrictionDate));
@@ -220,7 +219,7 @@ public UseRestriction.UseRestrictionBuilderBase withUseRestrictionType(UseRestri
             return this;
         }
 
-        public UseRestriction.UseRestrictionBuilderBase withUseRestrictionDate(Date useRestrictionDate) {
+        public UseRestriction.UseRestrictionBuilderBase withUseRestrictionDate(String useRestrictionDate) {
             ((UseRestriction) this.instance).useRestrictionDate = useRestrictionDate;
             return this;
         }

generated/python/datadoc_model/datadoc_model/all_optional/model.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  metadata-container-json-schema.json
-#   timestamp: 2025-09-03T09:21:45+00:00
+#   timestamp: 2025-09-03T09:57:17+00:00
 
 from __future__ import annotations
 
@@ -41,10 +41,10 @@ class UseRestrictionType(Enum):
 
 
 class UseRestrictionItem(DatadocBaseModel):
-    use_restriction: Optional[UseRestrictionType] = Field(
+    use_restriction_type: Optional[UseRestrictionType] = Field(
         None, description="Use restriction type", title="Use restriction type"
     )
-    use_restriction_date: Optional[AwareDatetime] = Field(
+    use_restriction_date: Optional[date] = Field(
         None,
         description="Use restriction date, eg. the date (deadline) for when data must be deleted/anonymised.",
         title="Use restriction date",
@@ -203,8 +203,10 @@ class Dataset(DatadocBaseModel):
         description="Description of the data set's spatial coverage",
         title="Spatial coverage description",
     )
-    use_restriction: Optional[list[UseRestrictionItem]] = Field(
-        None, description="Use restriction", title="Use restriction"
+    use_restrictions: Optional[list[UseRestrictionItem]] = Field(
+        None,
+        description="Any usage restrictions and usage restriction dates for the dataset, for example a deadline (date) for when the dataset should be deleted/anonymized.",
+        title="Use restriction",
     )
     custom_type: Optional[list[CustomTypeForDatasetMetadatum]] = Field(
         None,
@@ -386,8 +388,8 @@ class DatadocMetadata(DatadocBaseModel):
     percentage_complete: Optional[int] = Field(
         None, description="Percentage of obligatory metadata fields populated."
     )
-    document_version: Literal["6.0.1"] = Field(
-        "6.0.1", description="Version of this model"
+    document_version: Literal["6.1.0"] = Field(
+        "6.1.0", description="Version of this model"
     )
     dataset: Optional[Dataset] = None
     variables: Optional[list[Variable]] = None

generated/python/datadoc_model/datadoc_model/required/model.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  metadata-container-json-schema.json
-#   timestamp: 2025-09-03T09:21:47+00:00
+#   timestamp: 2025-09-03T09:57:19+00:00
 
 from __future__ import annotations
 
@@ -41,10 +41,10 @@ class UseRestrictionType(Enum):
 
 
 class UseRestrictionItem(DatadocBaseModel):
-    use_restriction: Optional[UseRestrictionType] = Field(
+    use_restriction_type: Optional[UseRestrictionType] = Field(
         None, description="Use restriction type", title="Use restriction type"
     )
-    use_restriction_date: Optional[AwareDatetime] = Field(
+    use_restriction_date: Optional[date] = Field(
         None,
         description="Use restriction date, eg. the date (deadline) for when data must be deleted/anonymised.",
         title="Use restriction date",
@@ -197,8 +197,10 @@ class Dataset(DatadocBaseModel):
         description="Description of the data set's spatial coverage",
         title="Spatial coverage description",
     )
-    use_restriction: Optional[list[UseRestrictionItem]] = Field(
-        None, description="Use restriction", title="Use restriction"
+    use_restrictions: Optional[list[UseRestrictionItem]] = Field(
+        None,
+        description="Any usage restrictions and usage restriction dates for the dataset, for example a deadline (date) for when the dataset should be deleted/anonymized.",
+        title="Use restriction",
     )
     custom_type: Optional[list[CustomTypeForDatasetMetadatum]] = Field(
         None,
@@ -378,8 +380,8 @@ class DatadocMetadata(DatadocBaseModel):
     percentage_complete: Optional[int] = Field(
         None, description="Percentage of obligatory metadata fields populated."
     )
-    document_version: Literal["6.0.1"] = Field(
-        "6.0.1", description="Version of this model"
+    document_version: Literal["6.1.0"] = Field(
+        "6.1.0", description="Version of this model"
     )
     dataset: Dataset
     variables: list[Variable]