GH-4864 support sh:name, sh:description, sh:defaultValue, sh:order, sh:group

Author: hmottestad

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSail.java

@@ -320,13 +320,19 @@ public static List<IRI> getSupportedShaclPredicates() {
 				SHACL.QUALIFIED_VALUE_SHAPE,
 				SHACL.SHAPES_GRAPH,
 				SHACL.MESSAGE,
+				SHACL.NAME,
+				SHACL.DESCRIPTION,
+				SHACL.DEFAULT_VALUE,
+				SHACL.ORDER,
+				SHACL.GROUP,
 				SHACL.DECLARE,
 				SHACL.SPARQL,
 				SHACL.SELECT,
 				SHACL.PREFIXES,
 				SHACL.PREFIX_PROP,
 				SHACL.NAMESPACE_PROP,
 				SHACL.SEVERITY_PROP,
+				SHACL.EQUALS,
 				DASH.hasValueIn,
 				RSX.targetShape,
 				RSX.dataGraph,

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/PropertyShape.java

@@ -16,6 +16,7 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Value;
@@ -45,10 +46,11 @@
 public class PropertyShape extends Shape {
 	private static final Logger logger = LoggerFactory.getLogger(PropertyShape.class);
 
-	List<String> name;
-	List<String> description;
-	Object defaultValue;
-	Object group;
+	List<Literal> name;
+	List<Literal> description;
+	Value defaultValue;
+	Value group;
+	Value order;
 
 	Path path;
 
@@ -62,6 +64,7 @@ public PropertyShape(PropertyShape propertyShape) {
 		this.defaultValue = propertyShape.defaultValue;
 		this.group = propertyShape.group;
 		this.path = propertyShape.path;
+		this.order = propertyShape.order;
 	}
 
 	public static PropertyShape getInstance(ShaclProperties properties, ShapeSource shapeSource,
@@ -93,6 +96,12 @@ public void populate(ShaclProperties properties, ShapeSource connection, ParseSe
 			throw new IllegalStateException(properties.getId() + " is a sh:PropertyShape without a sh:path!");
 		}
 
+		this.name = properties.getName();
+		this.description = properties.getDescription();
+		this.defaultValue = properties.getDefaultValue();
+		this.order = properties.getOrder();
+		this.group = properties.getGroup();
+
 		constraintComponents = getConstraintComponents(properties, connection, parseSettings, cache);
 	}
 
@@ -107,6 +116,26 @@ public void toModel(Resource subject, IRI predicate, Model model, Set<Resource>
 		super.toModel(subject, predicate, model, cycleDetection);
 		model.add(getId(), RDF.TYPE, SHACL.PROPERTY_SHAPE);
 
+		for (Literal literal : name) {
+			model.add(getId(), SHACL.NAME, literal);
+		}
+
+		for (Literal literal : description) {
+			model.add(getId(), SHACL.DESCRIPTION, literal);
+		}
+
+		if (defaultValue != null) {
+			model.add(getId(), SHACL.DEFAULT_VALUE, defaultValue);
+		}
+
+		if (order != null) {
+			model.add(getId(), SHACL.ORDER, order);
+		}
+
+		if (group != null) {
+			model.add(getId(), SHACL.GROUP, group);
+		}
+
 		if (subject != null) {
 			if (predicate == null) {
 				model.add(subject, SHACL.PROPERTY, getId());

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/ShaclProperties.java

@@ -96,6 +96,13 @@ public class ShaclProperties {
 	private final List<Literal> message = new ArrayList<>();
 	private IRI severity;
 
+	private final List<Literal> name = new ArrayList<>();
+	private final List<Literal> description = new ArrayList<>();
+
+	private Value defaultValue;
+	private Value order;
+	private Value group;
+
 	private final List<Resource> sparql = new ArrayList<>();
 
 	public ShaclProperties(Resource id, ShapeSource connection) {
@@ -173,6 +180,21 @@ public ShaclProperties(Resource id, ShapeSource connection) {
 						throw getExceptionForCastIssue(id, predicate, Literal.class, object);
 					}
 					break;
+				case "http://www.w3.org/ns/shacl#name":
+					try {
+						name.add((Literal) object);
+					} catch (ClassCastException e) {
+						throw getExceptionForCastIssue(id, predicate, Literal.class, object);
+					}
+					break;
+				case "http://www.w3.org/ns/shacl#description":
+					try {
+						description.add((Literal) object);
+					} catch (ClassCastException e) {
+						throw getExceptionForCastIssue(id, predicate, Literal.class, object);
+					}
+					break;
+
 				case "http://www.w3.org/ns/shacl#severity":
 					if (severity != null) {
 						throw getExceptionForAlreadyPopulated(id, predicate, severity, object);
@@ -183,6 +205,24 @@ public ShaclProperties(Resource id, ShapeSource connection) {
 						throw getExceptionForCastIssue(id, predicate, IRI.class, object);
 					}
 					break;
+				case "http://www.w3.org/ns/shacl#defaultValue":
+					if (defaultValue != null) {
+						throw getExceptionForAlreadyPopulated(id, predicate, defaultValue, object);
+					}
+					defaultValue = object;
+					break;
+				case "http://www.w3.org/ns/shacl#group":
+					if (group != null) {
+						throw getExceptionForAlreadyPopulated(id, predicate, group, object);
+					}
+					group = object;
+					break;
+				case "http://www.w3.org/ns/shacl#order":
+					if (order != null) {
+						throw getExceptionForAlreadyPopulated(id, predicate, order, object);
+					}
+					order = object;
+					break;
 				case "http://www.w3.org/ns/shacl#languageIn":
 					if (languageIn != null) {
 						throw getExceptionForAlreadyPopulated(id, predicate, languageIn, object);
@@ -592,8 +632,9 @@ private static ShaclShapeParsingException getExceptionForCastIssue(Resource id,
 	}
 
 	private static String getClassName(Value object) {
-		if (object == null)
+		if (object == null) {
 			return "null";
+		}
 		String actualClassName;
 		if (object.isIRI()) {
 			actualClassName = "IRI";
@@ -726,6 +767,26 @@ public IRI getSeverity() {
 		return severity;
 	}
 
+	public List<Literal> getName() {
+		return name;
+	}
+
+	public List<Literal> getDescription() {
+		return description;
+	}
+
+	public Value getDefaultValue() {
+		return defaultValue;
+	}
+
+	public Value getOrder() {
+		return order;
+	}
+
+	public Value getGroup() {
+		return group;
+	}
+
 	public List<Resource> getProperty() {
 		return property;
 	}

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/DisjointConstraintComponent.java

@@ -12,14 +12,31 @@
 package org.eclipse.rdf4j.sail.shacl.ast.constraintcomponents;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Value;
 import org.eclipse.rdf4j.model.vocabulary.SHACL;
 import org.eclipse.rdf4j.sail.shacl.SourceConstraintComponent;
+import org.eclipse.rdf4j.sail.shacl.ValidationSettings;
+import org.eclipse.rdf4j.sail.shacl.ast.SparqlFragment;
+import org.eclipse.rdf4j.sail.shacl.ast.StatementMatcher;
+import org.eclipse.rdf4j.sail.shacl.ast.ValidationApproach;
+import org.eclipse.rdf4j.sail.shacl.ast.paths.Path;
+import org.eclipse.rdf4j.sail.shacl.ast.planNodes.CheckDisjointValuesBasedOnPathAndPredicate;
+import org.eclipse.rdf4j.sail.shacl.ast.planNodes.PlanNode;
+import org.eclipse.rdf4j.sail.shacl.ast.planNodes.PlanNodeProvider;
+import org.eclipse.rdf4j.sail.shacl.ast.planNodes.UnionNode;
+import org.eclipse.rdf4j.sail.shacl.ast.planNodes.Unique;
+import org.eclipse.rdf4j.sail.shacl.ast.planNodes.UnorderedSelect;
+import org.eclipse.rdf4j.sail.shacl.ast.planNodes.ValidationTuple;
+import org.eclipse.rdf4j.sail.shacl.ast.targets.EffectiveTarget;
+import org.eclipse.rdf4j.sail.shacl.ast.targets.TargetChain;
+import org.eclipse.rdf4j.sail.shacl.wrapper.data.ConnectionsGroup;
 
 public class DisjointConstraintComponent extends AbstractConstraintComponent {
 
@@ -39,6 +56,89 @@ public SourceConstraintComponent getConstraintComponent() {
 		return SourceConstraintComponent.DisjointConstraintComponent;
 	}
 
+	@Override
+	public PlanNode generateTransactionalValidationPlan(ConnectionsGroup connectionsGroup,
+			ValidationSettings validationSettings, PlanNodeProvider overrideTargetNode, Scope scope) {
+		StatementMatcher.StableRandomVariableProvider stableRandomVariableProvider = new StatementMatcher.StableRandomVariableProvider();
+
+		TargetChain targetChain = getTargetChain();
+
+		EffectiveTarget effectiveTarget = targetChain.getEffectiveTarget(scope,
+				connectionsGroup.getRdfsSubClassOfReasoner(), stableRandomVariableProvider);
+		Optional<Path> path = targetChain.getPath();
+
+		PlanNode allTargets;
+
+		if (overrideTargetNode != null) {
+			allTargets = effectiveTarget.extend(overrideTargetNode.getPlanNode(), connectionsGroup,
+					validationSettings.getDataGraph(), scope, EffectiveTarget.Extend.right, false, null);
+		} else {
+
+			PlanNode targets = effectiveTarget.getPlanNode(connectionsGroup, validationSettings.getDataGraph(),
+					scope, true, null);
+
+			PlanNode allTargetsBasedOnPredicate = getAllTargetsBasedOnPredicate(connectionsGroup, validationSettings,
+					effectiveTarget);
+
+			allTargets = Unique.getInstance(UnionNode.getInstance(allTargetsBasedOnPredicate, targets), false);
+		}
+
+		StatementMatcher.Variable<Resource> subject = new StatementMatcher.Variable<>("a");
+		StatementMatcher.Variable<Value> object = new StatementMatcher.Variable<>("c");
+
+		SparqlFragment targetQueryFragment = null;
+		if (path.isPresent()) {
+			targetQueryFragment = path.get()
+					.getTargetQueryFragment(subject, object, connectionsGroup.getRdfsSubClassOfReasoner(),
+							stableRandomVariableProvider, Set.of());
+		}
+
+		return new CheckDisjointValuesBasedOnPathAndPredicate(connectionsGroup.getBaseConnection(),
+				validationSettings.getDataGraph(), allTargets, predicate, subject, object, targetQueryFragment);
+	}
+
+	private PlanNode getAllTargetsBasedOnPredicate(ConnectionsGroup connectionsGroup,
+			ValidationSettings validationSettings, EffectiveTarget effectiveTarget) {
+		PlanNode addedByPredicate = new UnorderedSelect(connectionsGroup.getAddedStatements(), null, predicate, null,
+				validationSettings.getDataGraph(), (s, d) -> {
+					return new ValidationTuple(s.getSubject(), Scope.propertyShape, false, d);
+				});
+
+		PlanNode removedByPredicate = new UnorderedSelect(connectionsGroup.getRemovedStatements(), null, predicate,
+				null, validationSettings.getDataGraph(), (s, d) -> {
+					return new ValidationTuple(s.getSubject(), Scope.propertyShape, false, d);
+				});
+
+		PlanNode targetFilter1 = effectiveTarget.getTargetFilter(connectionsGroup, validationSettings.getDataGraph(),
+				addedByPredicate);
+		PlanNode targetFilter2 = effectiveTarget.getTargetFilter(connectionsGroup, validationSettings.getDataGraph(),
+				removedByPredicate);
+
+		PlanNode allTargetsBasedOnPredicate = Unique.getInstance(UnionNode.getInstance(targetFilter1, targetFilter2),
+				false);
+		return allTargetsBasedOnPredicate;
+	}
+
+	@Override
+	public ValidationApproach getPreferredValidationApproach(ConnectionsGroup connectionsGroup) {
+		return ValidationApproach.Transactional;
+	}
+
+	@Override
+	public ValidationApproach getOptimalBulkValidationApproach() {
+		return ValidationApproach.Transactional;
+	}
+
+	@Override
+	public boolean requiresEvaluation(ConnectionsGroup connectionsGroup, Scope scope, Resource[] dataGraph,
+			StatementMatcher.StableRandomVariableProvider stableRandomVariableProvider) {
+
+		// todo both consider the target chain with added and removed values (path), and also added and removed values
+		// for the predicate path
+
+		return true;
+	}
+
 	@Override
 	public ConstraintComponent deepClone() {
 		return new DisjointConstraintComponent(predicate);