Skip to content

Presence required #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DD-Arras merged 2 commits into from
Mar 17, 2026
Merged

Presence required #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8a2423
fix(core): break required/presencerequired association
DD-Arras Mar 17, 2026
e13d29f
fix(test): change test documentmodels for new constraint presencerequ…
DD-Arras Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 0 additions & 12 deletions validator-core/src/main/java/fr/ign/validator/model/AttributeConstraints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,9 @@ public class AttributeConstraints {
*/
private String reference;

// checks wheter presenceRequired has been modified
private boolean presenceRequiredModified;

public AttributeConstraints() {
this.required = true;
this.presenceRequired = true;
this.presenceRequiredModified = false;
this.unique = false;
}

Expand All @@ -105,7 +101,6 @@ public boolean isPresenceRequired() {
// Must be called after setRequired
public void setPresenceRequired(boolean presenceRequired) {
this.presenceRequired = presenceRequired;
this.presenceRequiredModified = true;
}

public boolean isRequired() {
Expand All @@ -114,9 +109,6 @@ public boolean isRequired() {

public void setRequired(boolean required) {
this.required = required;
if (!this.presenceRequiredModified) {
this.presenceRequired = required;
}
}

public boolean isUnique() {
Expand Down Expand Up @@ -177,8 +169,4 @@ public void setReference(String reference) {
this.reference = reference;
}

public boolean isPresenceRequiredModified() {
return this.presenceRequiredModified;
}

}
2 changes: 1 addition & 1 deletion validator-core/src/test/java/fr/ign/validator/model/AttributeTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void testJsonIO() throws IOException {
ObjectMapper mapper = ObjectMapperFactory.createObjectMapper();
String result = mapper.writeValueAsString(attribute);
assertEquals(
"{\"type\":\"String\",\"name\":\"TEST\",\"description\":\"Test description\",\"constraints\":{\"required\":true,\"presenceRequired\":true,\"unique\":false,\"presenceRequiredModified\":false}}",
"{\"type\":\"String\",\"name\":\"TEST\",\"description\":\"Test description\",\"constraints\":{\"required\":true,\"presenceRequired\":true,\"unique\":false}}",
result
);

Expand Down
7 changes: 5 additions & 2 deletions validator-core/src/test/resources/config-json/adresse/table-models/ADRESSE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"type": "Integer",
"constraints": {
"required": true,
"presenceRequired": true,
"unique": true
}
},
Expand All @@ -17,6 +18,7 @@
"type": "String",
"constraints": {
"required": false,
"presenceRequired": false,
"minLength": 5,
"maxLength": 254
}
Expand All @@ -26,8 +28,9 @@
"description": "Page de présentation",
"type": "Url",
"constraints": {
"required": false
"required": false,
"presenceRequired": false
}
}
]
}
}
20 changes: 13 additions & 7 deletions validator-core/src/test/resources/config-json/cadastre-etalab/types/BATIMENT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,49 @@
"name": "commune",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "nom",
"type": "String",
"constraints": {
"required": false
"required": false,
"presenceRequired": false
}
},
{
"name": "type",
"type": "String",
"constraints": {
"required": false
"required": false,
"presenceRequired": false
}
},
{
"name": "created",
"type": "Date",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "updated",
"type": "Date",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "WKT",
"type": "MultiPolygon",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
}
]
}
}
13 changes: 9 additions & 4 deletions validator-core/src/test/resources/config-json/cadastre-etalab/types/COMMUNE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,40 @@
"type": "String",
"constraints": {
"required": true,
"presenceRequired": true,
"unique": true
}
},
{
"name": "nom",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "created",
"type": "Date",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "updated",
"type": "Date",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "WKT",
"type": "MultiPolygon",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
}
]
Expand Down
31 changes: 21 additions & 10 deletions validator-core/src/test/resources/config-json/cadastre-etalab/types/FEUILLE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,77 +6,88 @@
"type": "String",
"constraints": {
"required": true,
"presenceRequired": true,
"unique": true
}
},
{
"name": "commune",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "prefixe",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "section",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "numero",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "qualite",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "modeConfec",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "echelle",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "created",
"type": "Date",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "updated",
"type": "Date",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "WKT",
"type": "MultiPolygon",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
}
]
Expand Down
25 changes: 17 additions & 8 deletions validator-core/src/test/resources/config-json/cadastre-etalab/types/PARCELLE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,63 +6,72 @@
"type": "String",
"constraints": {
"required": true,
"presenceRequired": true,
"unique": true
}
},
{
"name": "commune",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "prefixe",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "section",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "numero",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "contenance",
"type": "String",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "created",
"type": "Date",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "updated",
"type": "Date",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
},
{
"name": "WKT",
"type": "MultiPolygon",
"constraints": {
"required": true
"required": true,
"presenceRequired": true
}
}
]
Expand Down
Loading
Loading