Skip to content
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

Jump to bottom

Validate views in data models #128

Merged
merged 3 commits into from
Aug 12, 2024
Merged

Validate views in data models #128

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a78419f
Evaluate constraints of views in data model
domi-b Mar 5, 2024
bcc6b64
Add tests for view constraints
domi-b Mar 5, 2024
6d3d3ea
Move validateObjects to ValidatorTestHelper
domi-b Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 82 additions & 36 deletions src/main/java/ch/interlis/iox_j/validator/Validator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,11 +393,6 @@ public void validate(ch.interlis.iox.IoxEvent event) {
} else if (event instanceof ch.interlis.iox.EndBasketEvent){
cleanupCurrentBasket();
}else if (event instanceof ch.interlis.iox.EndTransferEvent){
String additionalModels=this.validationConfig.getConfigValue(ValidationConfig.PARAMETER, ValidationConfig.ADDITIONAL_MODELS);
if(additionalModels!=null){
String[] additionalModelv = additionalModels.split(";");
iterateThroughAdditionalModels(additionalModelv);
}
if(autoSecondPass){
doSecondPass();
}
Expand Down Expand Up @@ -634,12 +629,60 @@ private boolean isValidTextOid(String valueStr,int maxLength) {
public void doSecondPass() {
if(!singlePass) {
errs.addEvent(errFact.logInfoMsg(rsrc.getString("doSecondPass.secondValidationPass")));
iterateThroughReferencedModels();
String additionalModelsConfig = validationConfig.getConfigValue(ValidationConfig.PARAMETER, ValidationConfig.ADDITIONAL_MODELS);
if (additionalModelsConfig != null) {
String[] additionalModels = additionalModelsConfig.split(";");
iterateThroughAdditionalModels(additionalModels);
}
iterateThroughAllObjects();
validateAllAreas();
validatePlausibilityConstraints();
}
}

}

private void iterateThroughReferencedModels() {
HashSet<String> iteratedModels = new HashSet<String>();
for (String modelName : seenModels) {
Element modelElement = td.getElement(modelName);
if (modelElement instanceof DataModel) {
DataModel model = (DataModel) modelElement;
iterateThroughReferencedModel(model, iteratedModels);
}
}
}

private void iterateThroughReferencedModel(DataModel model, HashSet<String> iteratedModels) {
if (iteratedModels.contains(model.getName())) {
return;
}
iteratedModels.add(model.getName());

Iterator<Element> modelIterator = model.iterator();
while (modelIterator.hasNext()) {
Element modelEntry = modelIterator.next();
if (!(modelEntry instanceof Topic)) {
continue;
}
Topic topic = (Topic) modelEntry;

Iterator<Element> topicIterator = topic.iterator();
while (topicIterator.hasNext()) {
Element topicEntry = topicIterator.next();
if (topicEntry instanceof Projection) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besser hier alle Arten VIEWs sammeln, auch wenn aktuell dann nur die Projection ausgewertet werden.

Copy link
Contributor

@patrickackermann patrickackermann Jul 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@claeis Die anderen VIEW Arten werden noch überhaupt nicht ausgewertet. Ich finde daher, dass das Sammeln der anderen VIEW Arten die Komplexität des Validators nur unnötig erhöht.

Auf diesem PR aufbauend wird dann noch das Auswerten der WHERE condition bei Projection Views umgesetzt: https://github.com/GeoWerkstatt/iox-ili/tree/view-constraints-where

Projection view = (Projection) topicEntry;
collectProjectionConstraints(view);
}
}
}

for (Model importedModel : model.getImporting()) {
if (importedModel instanceof DataModel) {
iterateThroughReferencedModel((DataModel) importedModel, iteratedModels);
}
}
}

private void iterateThroughAdditionalModels(String[] additionalModels){
if(additionalModels==null){
return;
Expand Down Expand Up @@ -696,39 +739,42 @@ private void collectAdditionalConstraints(DataModel model){
}
// view
Projection view = (Projection) topicObj;
Viewable classValue=null;
if(view.getSelected().getAliasing()==null){
continue;
}
// class
classValue = view.getSelected().getAliasing();
// constraint
Iterator iteratorOfViewConstraints=view.iterator();
while (iteratorOfViewConstraints.hasNext()){
Object constraintObj = iteratorOfViewConstraints.next();
if(!(constraintObj instanceof Constraint)){
continue;
}
// constraint off
Constraint constraint = (Constraint) constraintObj;
String constraintName = getScopedName(constraint);
String checkConstraint=null;
if(!enforceConstraintValidation){
checkConstraint=validationConfig.getConfigValue(constraintName, ValidationConfig.CHECK);
}
if(ValidationConfig.OFF.equals(checkConstraint)){
if(!configOffOufputReduction.contains(ValidationConfig.CHECK+":"+constraintName)){
configOffOufputReduction.add(ValidationConfig.CHECK+":"+constraintName);
errs.addEvent(errFact.logInfoMsg(rsrc.getString("collectAdditionalConstraints.validationConfigurationCheckOff"), constraintName));
}
}else{
additionalConstraints.put(constraint, classValue);
}
collectProjectionConstraints(view);
}
}
}

private void collectProjectionConstraints(Projection view) {
Viewable classValue=null;
if(view.getSelected().getAliasing()==null){
return;
}
// class
classValue = view.getSelected().getAliasing();
// constraint
Iterator iteratorOfViewConstraints=view.iterator();
while (iteratorOfViewConstraints.hasNext()){
Object constraintObj = iteratorOfViewConstraints.next();
if(!(constraintObj instanceof Constraint)){
continue;
}
Constraint constraint = (Constraint) constraintObj;
String constraintName = getScopedName(constraint);
String checkConstraint=null;
if(!enforceConstraintValidation){
checkConstraint=validationConfig.getConfigValue(constraintName, ValidationConfig.CHECK);
}
if(ValidationConfig.OFF.equals(checkConstraint)){
if(!configOffOufputReduction.contains(ValidationConfig.CHECK+":"+constraintName)){
configOffOufputReduction.add(ValidationConfig.CHECK+":"+constraintName);
errs.addEvent(errFact.logInfoMsg(rsrc.getString("collectAdditionalConstraints.validationConfigurationCheckOff"), constraintName));
}
}else{
additionalConstraints.put(constraint, classValue);
}
}
}

private void validateAllAreas() {
setCurrentMainObj(null);
for(AttributeDef attr:areaAttrs.keySet()){
Expand Down
118 changes: 118 additions & 0 deletions src/test/data/validator/ViewConstraints.ili
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
INTERLIS 2.4;

MODEL ViewConstraints AT "http://www.interlis.ch/ili2c/tests/" VERSION "1" =
TOPIC TopicA =
CLASS ClassMandatory =
Name : TEXT*100;
END ClassMandatory;

VIEW ViewMandatory
PROJECTION OF ClassMandatory;
=
ALL OF ClassMandatory;

MANDATORY CONSTRAINT NameLength : INTERLIS.len(Name) >= 4;
END ViewMandatory;

CLASS ClassPlausibility =
Number : 0..1000;
END ClassPlausibility;

VIEW ViewPlausibility
PROJECTION OF ClassPlausibility;
=
ALL OF ClassPlausibility;

CONSTRAINT LessThan100 : >=60% Number < 100;
END ViewPlausibility;

CLASS ClassExistenceA =
Name : TEXT*100;
END ClassExistenceA;

CLASS ClassExistenceB =
Name : TEXT*100;
END ClassExistenceB;

VIEW ViewExistence
PROJECTION OF ClassExistenceA;
=
ALL OF ClassExistenceA;

EXISTENCE CONSTRAINT ExistsInB : Name REQUIRED IN ClassExistenceB:Name;
END ViewExistence;

CLASS ClassUnique =
Name : TEXT*100;
END ClassUnique;

VIEW ViewUnique
PROJECTION OF ClassUnique;
=
ALL OF ClassUnique;

UNIQUE NameUnique : Name;
END ViewUnique;

CLASS ClassBase =
Number : 0..1000;
END ClassBase;

VIEW ViewBase
PROJECTION OF ClassBase;
=
ALL OF ClassBase;

MANDATORY CONSTRAINT LessThan100OrMoreThan200 : Number < 100 OR Number > 200;
END ViewBase;
END TopicA;
END ViewConstraints.

MODEL AdditionalModelMandatory AT "http://www.interlis.ch/ili2c/tests/" VERSION "1" =
IMPORTS ViewConstraints;

VIEW TOPIC ViewTopicA =
DEPENDS ON ViewConstraints.TopicA;
VIEW AdditionalViewMandatory
PROJECTION OF ViewConstraints.TopicA.ClassMandatory;
=
ALL OF ClassMandatory;

MANDATORY CONSTRAINT AdditionalNameLength : INTERLIS.len(Name) < 6;
END AdditionalViewMandatory;
END ViewTopicA;
END AdditionalModelMandatory.

MODEL ViewConstraintsSet AT "http://www.interlis.ch/ili2c/tests/" VERSION "1" =
TOPIC TopicA =
CLASS ClassSet =
Name : TEXT*100;
END ClassSet;

VIEW ViewSet
PROJECTION OF ClassSet;
=
ALL OF ClassSet;

SET CONSTRAINT ObjectCount : INTERLIS.objectCount(ALL) >= 4;
END ViewSet;
END TopicA;
END ViewConstraintsSet.

MODEL ViewConstraintsExtending AT "http://www.interlis.ch/ili2c/tests/" VERSION "1" =
IMPORTS ViewConstraints;

TOPIC ExtendingTopicA EXTENDS ViewConstraints.TopicA =
CLASS ClassExtending EXTENDS ViewConstraints.TopicA.ClassBase =
Text : TEXT*100;
END ClassExtending;

VIEW ViewExtending
PROJECTION OF ClassExtending;
=
ALL OF ClassExtending;

MANDATORY CONSTRAINT NewTextLength : INTERLIS.len(Text) >= 4;
END ViewExtending;
END ExtendingTopicA;
END ViewConstraintsExtending.
Loading