Skip to content

Commit bbb2726

Browse files
Jorgen-5Jorgen-5
authored
Merge pull request #50 from statisticsnorway/feat/change-type-for-datasource
Change type for datasource
2 parents 87810f5 + 195cfa2 commit bbb2726

File tree

5 files changed

+45
-33
lines changed

5 files changed

+45
-33
lines changed

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

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,14 @@ public class Dataset implements Serializable
120120
@NotNull
121121
private List<Object> description = new ArrayList<Object>();
122122
/**
123-
* Reusableb langugage string type
123+
* Data source
124+
* <p>
125+
* Data source. Set either for the data set or instance variable.
124126
*
125127
*/
126128
@JsonProperty("data_source")
127-
@Valid
128-
private List<Object> dataSource = new ArrayList<Object>();
129+
@JsonPropertyDescription("Data source. Set either for the data set or instance variable.")
130+
private String dataSource;
129131
/**
130132
* Reusableb langugage string type
131133
* (Required)
@@ -335,7 +337,7 @@ public class Dataset implements Serializable
335337
@JsonIgnore
336338
@Valid
337339
private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
338-
private final static long serialVersionUID = 3214435550238803228L;
340+
private final static long serialVersionUID = -226168508644193475L;
339341

340342
/**
341343
* No args constructor for use in serialization
@@ -403,7 +405,7 @@ public Dataset() {
403405
* @param dataSource
404406
* Data source. Data source. Set either for the data set or instance variable.
405407
*/
406-
public Dataset(String shortName, Dataset.Assessment assessment, Dataset.DataSetStatus datasetStatus, Dataset.DataSetState datasetState, List<Object> name, List<Object> description, List<Object> dataSource, List<Object> populationDescription, String version, List<Object> versionDescription, String unitType, Dataset.TemporalityTypeType temporalityType, String subjectField, List<String> keyword, List<Object> spatialCoverageDescription, Boolean containsPersonalData, Dataset.UseRestriction useRestriction, Date useRestrictionDate, List<CustomType> customType, UUID id, String owner, String filePath, Date metadataCreatedDate, String metadataCreatedBy, Date metadataLastUpdatedDate, String metadataLastUpdatedBy, String containsDataFrom, String containsDataUntil) {
408+
public Dataset(String shortName, Dataset.Assessment assessment, Dataset.DataSetStatus datasetStatus, Dataset.DataSetState datasetState, List<Object> name, List<Object> description, String dataSource, List<Object> populationDescription, String version, List<Object> versionDescription, String unitType, Dataset.TemporalityTypeType temporalityType, String subjectField, List<String> keyword, List<Object> spatialCoverageDescription, Boolean containsPersonalData, Dataset.UseRestriction useRestriction, Date useRestrictionDate, List<CustomType> customType, UUID id, String owner, String filePath, Date metadataCreatedDate, String metadataCreatedBy, Date metadataLastUpdatedDate, String metadataLastUpdatedBy, String containsDataFrom, String containsDataUntil) {
407409
super();
408410
this.shortName = shortName;
409411
this.assessment = assessment;
@@ -576,20 +578,24 @@ public void setDescription(List<Object> description) {
576578
}
577579

578580
/**
579-
* Reusableb langugage string type
581+
* Data source
582+
* <p>
583+
* Data source. Set either for the data set or instance variable.
580584
*
581585
*/
582586
@JsonProperty("data_source")
583-
public List<Object> getDataSource() {
587+
public String getDataSource() {
584588
return dataSource;
585589
}
586590

587591
/**
588-
* Reusableb langugage string type
592+
* Data source
593+
* <p>
594+
* Data source. Set either for the data set or instance variable.
589595
*
590596
*/
591597
@JsonProperty("data_source")
592-
public void setDataSource(List<Object> dataSource) {
598+
public void setDataSource(String dataSource) {
593599
this.dataSource = dataSource;
594600
}
595601

@@ -1305,7 +1311,7 @@ public DatasetBuilder() {
13051311
super();
13061312
}
13071313

1308-
public DatasetBuilder(String shortName, Dataset.Assessment assessment, Dataset.DataSetStatus datasetStatus, Dataset.DataSetState datasetState, List<Object> name, List<Object> description, List<Object> dataSource, List<Object> populationDescription, String version, List<Object> versionDescription, String unitType, Dataset.TemporalityTypeType temporalityType, String subjectField, List<String> keyword, List<Object> spatialCoverageDescription, Boolean containsPersonalData, Dataset.UseRestriction useRestriction, Date useRestrictionDate, List<CustomType> customType, UUID id, String owner, String filePath, Date metadataCreatedDate, String metadataCreatedBy, Date metadataLastUpdatedDate, String metadataLastUpdatedBy, String containsDataFrom, String containsDataUntil) {
1314+
public DatasetBuilder(String shortName, Dataset.Assessment assessment, Dataset.DataSetStatus datasetStatus, Dataset.DataSetState datasetState, List<Object> name, List<Object> description, String dataSource, List<Object> populationDescription, String version, List<Object> versionDescription, String unitType, Dataset.TemporalityTypeType temporalityType, String subjectField, List<String> keyword, List<Object> spatialCoverageDescription, Boolean containsPersonalData, Dataset.UseRestriction useRestriction, Date useRestrictionDate, List<CustomType> customType, UUID id, String owner, String filePath, Date metadataCreatedDate, String metadataCreatedBy, Date metadataLastUpdatedDate, String metadataLastUpdatedBy, String containsDataFrom, String containsDataUntil) {
13091315
super(shortName, assessment, datasetStatus, datasetState, name, description, dataSource, populationDescription, version, versionDescription, unitType, temporalityType, subjectField, keyword, spatialCoverageDescription, containsPersonalData, useRestriction, useRestrictionDate, customType, id, owner, filePath, metadataCreatedDate, metadataCreatedBy, metadataLastUpdatedDate, metadataLastUpdatedBy, containsDataFrom, containsDataUntil);
13101316
}
13111317

@@ -1324,7 +1330,7 @@ public DatasetBuilderBase() {
13241330
}
13251331

13261332
@SuppressWarnings("unchecked")
1327-
public DatasetBuilderBase(String shortName, Dataset.Assessment assessment, Dataset.DataSetStatus datasetStatus, Dataset.DataSetState datasetState, List<Object> name, List<Object> description, List<Object> dataSource, List<Object> populationDescription, String version, List<Object> versionDescription, String unitType, Dataset.TemporalityTypeType temporalityType, String subjectField, List<String> keyword, List<Object> spatialCoverageDescription, Boolean containsPersonalData, Dataset.UseRestriction useRestriction, Date useRestrictionDate, List<CustomType> customType, UUID id, String owner, String filePath, Date metadataCreatedDate, String metadataCreatedBy, Date metadataLastUpdatedDate, String metadataLastUpdatedBy, String containsDataFrom, String containsDataUntil) {
1333+
public DatasetBuilderBase(String shortName, Dataset.Assessment assessment, Dataset.DataSetStatus datasetStatus, Dataset.DataSetState datasetState, List<Object> name, List<Object> description, String dataSource, List<Object> populationDescription, String version, List<Object> versionDescription, String unitType, Dataset.TemporalityTypeType temporalityType, String subjectField, List<String> keyword, List<Object> spatialCoverageDescription, Boolean containsPersonalData, Dataset.UseRestriction useRestriction, Date useRestrictionDate, List<CustomType> customType, UUID id, String owner, String filePath, Date metadataCreatedDate, String metadataCreatedBy, Date metadataLastUpdatedDate, String metadataLastUpdatedBy, String containsDataFrom, String containsDataUntil) {
13281334
// Skip initialization when called from subclass
13291335
if (this.getClass().equals(Dataset.DatasetBuilder.class)) {
13301336
this.instance = ((T) new Dataset(shortName, assessment, datasetStatus, datasetState, name, description, dataSource, populationDescription, version, versionDescription, unitType, temporalityType, subjectField, keyword, spatialCoverageDescription, containsPersonalData, useRestriction, useRestrictionDate, customType, id, owner, filePath, metadataCreatedDate, metadataCreatedBy, metadataLastUpdatedDate, metadataLastUpdatedBy, containsDataFrom, containsDataUntil));
@@ -1368,7 +1374,7 @@ public Dataset.DatasetBuilderBase withDescription(List<Object> description) {
13681374
return this;
13691375
}
13701376

1371-
public Dataset.DatasetBuilderBase withDataSource(List<Object> dataSource) {
1377+
public Dataset.DatasetBuilderBase withDataSource(String dataSource) {
13721378
((Dataset) this.instance).dataSource = dataSource;
13731379
return this;
13741380
}

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

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,14 @@ public class Variable implements Serializable
123123
@NotNull
124124
private Boolean directPersonIdentifying;
125125
/**
126-
* Reusableb langugage string type
126+
* Data source
127+
* <p>
128+
* Data source. Set at data set level, but can be overwritten at variable instance level.
127129
*
128130
*/
129131
@JsonProperty("data_source")
130-
@Valid
131-
private List<Object> dataSource = new ArrayList<Object>();
132+
@JsonPropertyDescription("Data source. Set at data set level, but can be overwritten at variable instance level.")
133+
private String dataSource;
132134
/**
133135
* Reusableb langugage string type
134136
*
@@ -243,7 +245,7 @@ public class Variable implements Serializable
243245
@JsonIgnore
244246
@Valid
245247
private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
246-
private final static long serialVersionUID = 1019444275429139130L;
248+
private final static long serialVersionUID = 2841624760609543476L;
247249

248250
/**
249251
* No args constructor for use in serialization
@@ -297,7 +299,7 @@ public Variable() {
297299
* @param invalidValueDescription
298300
* Invalid value(s) description. Invalid value(s) description used in addition (or as an alternative) to standard sentinel values.
299301
*/
300-
public Variable(String shortName, String dataElementPath, List<Object> name, Variable.DataType dataType, Variable.VariableRole variableRole, URI definitionUri, Boolean directPersonIdentifying, List<Object> dataSource, List<Object> populationDescription, List<Object> comment, no.ssb.dapla.metadata.datadoc.Dataset.TemporalityTypeType temporalityType, String measurementUnit, Integer multiplicationFactor, String format, URI classificationUri, SpecialValues specialValue, List<Object> invalidValueDescription, List<CustomType__1> customType, UUID id, Date containsDataFrom, Date containsDataUntil) {
302+
public Variable(String shortName, String dataElementPath, List<Object> name, Variable.DataType dataType, Variable.VariableRole variableRole, URI definitionUri, Boolean directPersonIdentifying, String dataSource, List<Object> populationDescription, List<Object> comment, no.ssb.dapla.metadata.datadoc.Dataset.TemporalityTypeType temporalityType, String measurementUnit, Integer multiplicationFactor, String format, URI classificationUri, SpecialValues specialValue, List<Object> invalidValueDescription, List<CustomType__1> customType, UUID id, Date containsDataFrom, Date containsDataUntil) {
301303
super();
302304
this.shortName = shortName;
303305
this.dataElementPath = dataElementPath;
@@ -487,20 +489,24 @@ public void setDirectPersonIdentifying(Boolean directPersonIdentifying) {
487489
}
488490

489491
/**
490-
* Reusableb langugage string type
492+
* Data source
493+
* <p>
494+
* Data source. Set at data set level, but can be overwritten at variable instance level.
491495
*
492496
*/
493497
@JsonProperty("data_source")
494-
public List<Object> getDataSource() {
498+
public String getDataSource() {
495499
return dataSource;
496500
}
497501

498502
/**
499-
* Reusableb langugage string type
503+
* Data source
504+
* <p>
505+
* Data source. Set at data set level, but can be overwritten at variable instance level.
500506
*
501507
*/
502508
@JsonProperty("data_source")
503-
public void setDataSource(List<Object> dataSource) {
509+
public void setDataSource(String dataSource) {
504510
this.dataSource = dataSource;
505511
}
506512

@@ -986,7 +992,7 @@ public VariableBuilder() {
986992
super();
987993
}
988994

989-
public VariableBuilder(String shortName, String dataElementPath, List<Object> name, Variable.DataType dataType, Variable.VariableRole variableRole, URI definitionUri, Boolean directPersonIdentifying, List<Object> dataSource, List<Object> populationDescription, List<Object> comment, no.ssb.dapla.metadata.datadoc.Dataset.TemporalityTypeType temporalityType, String measurementUnit, Integer multiplicationFactor, String format, URI classificationUri, SpecialValues specialValue, List<Object> invalidValueDescription, List<CustomType__1> customType, UUID id, Date containsDataFrom, Date containsDataUntil) {
995+
public VariableBuilder(String shortName, String dataElementPath, List<Object> name, Variable.DataType dataType, Variable.VariableRole variableRole, URI definitionUri, Boolean directPersonIdentifying, String dataSource, List<Object> populationDescription, List<Object> comment, no.ssb.dapla.metadata.datadoc.Dataset.TemporalityTypeType temporalityType, String measurementUnit, Integer multiplicationFactor, String format, URI classificationUri, SpecialValues specialValue, List<Object> invalidValueDescription, List<CustomType__1> customType, UUID id, Date containsDataFrom, Date containsDataUntil) {
990996
super(shortName, dataElementPath, name, dataType, variableRole, definitionUri, directPersonIdentifying, dataSource, populationDescription, comment, temporalityType, measurementUnit, multiplicationFactor, format, classificationUri, specialValue, invalidValueDescription, customType, id, containsDataFrom, containsDataUntil);
991997
}
992998

@@ -1005,7 +1011,7 @@ public VariableBuilderBase() {
10051011
}
10061012

10071013
@SuppressWarnings("unchecked")
1008-
public VariableBuilderBase(String shortName, String dataElementPath, List<Object> name, Variable.DataType dataType, Variable.VariableRole variableRole, URI definitionUri, Boolean directPersonIdentifying, List<Object> dataSource, List<Object> populationDescription, List<Object> comment, no.ssb.dapla.metadata.datadoc.Dataset.TemporalityTypeType temporalityType, String measurementUnit, Integer multiplicationFactor, String format, URI classificationUri, SpecialValues specialValue, List<Object> invalidValueDescription, List<CustomType__1> customType, UUID id, Date containsDataFrom, Date containsDataUntil) {
1014+
public VariableBuilderBase(String shortName, String dataElementPath, List<Object> name, Variable.DataType dataType, Variable.VariableRole variableRole, URI definitionUri, Boolean directPersonIdentifying, String dataSource, List<Object> populationDescription, List<Object> comment, no.ssb.dapla.metadata.datadoc.Dataset.TemporalityTypeType temporalityType, String measurementUnit, Integer multiplicationFactor, String format, URI classificationUri, SpecialValues specialValue, List<Object> invalidValueDescription, List<CustomType__1> customType, UUID id, Date containsDataFrom, Date containsDataUntil) {
10091015
// Skip initialization when called from subclass
10101016
if (this.getClass().equals(Variable.VariableBuilder.class)) {
10111017
this.instance = ((T) new Variable(shortName, dataElementPath, name, dataType, variableRole, definitionUri, directPersonIdentifying, dataSource, populationDescription, comment, temporalityType, measurementUnit, multiplicationFactor, format, classificationUri, specialValue, invalidValueDescription, customType, id, containsDataFrom, containsDataUntil));
@@ -1054,7 +1060,7 @@ public Variable.VariableBuilderBase withDirectPersonIdentifying(Boolean directPe
10541060
return this;
10551061
}
10561062

1057-
public Variable.VariableBuilderBase withDataSource(List<Object> dataSource) {
1063+
public Variable.VariableBuilderBase withDataSource(String dataSource) {
10581064
((Variable) this.instance).dataSource = dataSource;
10591065
return this;
10601066
}

‎generated/python/datadoc_model/datadoc_model/model.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# generated by datamodel-codegen:
22
# filename: metadata-container-json-schema.json
3-
# timestamp: 2024-03-13T15:13:32+00:00
3+
# timestamp: 2024-04-23T13:18:29+00:00
44

55
from __future__ import annotations
66

@@ -208,7 +208,7 @@ class Dataset(DatadocBaseModel):
208208
description: Optional[LanguageStringType] = Field(
209209
None, description="Free text description of the data set", title="Description"
210210
)
211-
data_source: Optional[LanguageStringType] = Field(
211+
data_source: Optional[str] = Field(
212212
None,
213213
description="Data source. Set either for the data set or instance variable.",
214214
title="Data source",
@@ -368,7 +368,7 @@ class Variable(DatadocBaseModel):
368368
description="Direct Person identifying Information (DPI). Some of the values \u200b\u200bin an instance variable kan be DPI, others not. In this case, DPI is set equal to true. For example, the variable exporter where some of the values \u200b\u200bcan be organization number, others social security numbers (sole proprietorships).",
369369
title="Direct Person identifying Information (DPI)",
370370
)
371-
data_source: Optional[LanguageStringType] = Field(
371+
data_source: Optional[str] = Field(
372372
None,
373373
description="Data source. Set at data set level, but can be overwritten at variable instance level.",
374374
title="Data source",
@@ -438,8 +438,8 @@ class DatadocMetadata(DatadocBaseModel):
438438
percentage_complete: Optional[int] = Field(
439439
None, description="Percentage of obligatory metadata fields populated."
440440
)
441-
document_version: Literal["3.1.0"] = Field(
442-
"3.1.0", description="Version of this model"
441+
document_version: Literal["3.2.0"] = Field(
442+
"3.2.0", description="Version of this model"
443443
)
444444
dataset: Optional[Dataset] = None
445445
variables: Optional[list[Variable]] = None

‎generated/python/datadoc_model/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "ssb-datadoc-model"
3-
version = "5.1.0"
3+
version = "5.2.0"
44
description = "Data Model for use in Statistics Norway's Metadata system"
55
authors = ["Statistics Norway <stat-dev@ssb.no>"]
66
license = "MIT"

‎src/datadoc/datadoc-json-schema.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"document_version": {
1212
"description": "Version of this model",
13-
"const": "3.1.0"
13+
"const": "3.2.0"
1414
},
1515
"dataset": {
1616
"type": "object",
@@ -67,7 +67,7 @@
6767
"data_source": {
6868
"title": "Data source",
6969
"description": "Data source. Set either for the data set or instance variable.",
70-
"$ref": "./languageStringType.json#/languageStringType"
70+
"type": "string"
7171
},
7272
"population_description": {
7373
"title": "Description of population",
@@ -294,7 +294,7 @@
294294
"data_source": {
295295
"title": "Data source",
296296
"description": "Data source. Set at data set level, but can be overwritten at variable instance level.",
297-
"$ref": "./languageStringType.json#/languageStringType"
297+
"type": "string"
298298
},
299299
"population_description": {
300300
"title": "Population description",

0 commit comments

Comments
 (0)