wip

Author: hmottestad

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/data/VerySimpleRdfsBackwardsChainingConnection.java

@@ -55,26 +55,26 @@ public VerySimpleRdfsBackwardsChainingConnection(SailConnection wrappedCon,
 	public boolean hasStatement(Resource subj, IRI pred, Value obj, boolean includeInferred, Resource... contexts)
 			throws SailException {
 
-		if (rdfsSubClassOfReasoner == null && includeInferredStatements) {
-			return super.hasStatement(subj, pred, obj, includeInferred, contexts);
+		boolean includeBaseInferred = includeInferredStatements && includeInferred;
+		if (rdfsSubClassOfReasoner == null) {
+			return super.hasStatement(subj, pred, obj, includeBaseInferred, contexts);
 		}
 
-		boolean hasStatement = super.hasStatement(subj, pred, obj, false, contexts);
+		boolean hasStatement = super.hasStatement(subj, pred, obj, includeBaseInferred, contexts);
 
 		if (hasStatement) {
 			return true;
 		}
 
-		if (rdfsSubClassOfReasoner != null && includeInferred && obj != null && obj.isResource()
-				&& RDF.TYPE.equals(pred)) {
+		if (obj != null && obj.isResource() && RDF.TYPE.equals(pred)) {
 
 			Set<Resource> types = rdfsSubClassOfReasoner.backwardsChain((Resource) obj);
 			if (types.size() == 1) {
 				return hasStatement;
 			}
 			if (types.size() > 10) {
 				try (CloseableIteration<? extends Statement> statements = super.getStatements(subj,
-						RDF.TYPE, null, false, contexts)) {
+						RDF.TYPE, null, includeBaseInferred, contexts)) {
 					return statements.stream()
 							.map(Statement::getObject)
 							.filter(Value::isResource)
@@ -84,7 +84,7 @@ public boolean hasStatement(Resource subj, IRI pred, Value obj, boolean includeI
 			} else {
 				return types
 						.stream()
-						.anyMatch(type -> super.hasStatement(subj, pred, type, false, contexts));
+						.anyMatch(type -> super.hasStatement(subj, pred, type, includeBaseInferred, contexts));
 			}
 
 		}
@@ -96,13 +96,14 @@ public boolean hasStatement(Resource subj, IRI pred, Value obj, boolean includeI
 	public CloseableIteration<? extends Statement> getStatements(Resource subj, IRI pred, Value obj,
 			boolean includeInferred, Resource... contexts) throws SailException {
 
-		if (rdfsSubClassOfReasoner != null && includeInferred && obj != null && obj.isResource()
+		boolean includeBaseInferred = includeInferredStatements && includeInferred;
+		if (rdfsSubClassOfReasoner != null && obj != null && obj.isResource()
 				&& RDF.TYPE.equals(pred)) {
 			Set<Resource> inferredTypes = rdfsSubClassOfReasoner.backwardsChain((Resource) obj);
 			if (inferredTypes.size() > 1) {
 
 				CloseableIteration<Statement>[] statementsMatchingInferredTypes = inferredTypes.stream()
-						.map(r -> super.getStatements(subj, pred, r, false, contexts))
+						.map(r -> super.getStatements(subj, pred, r, includeBaseInferred, contexts))
 						.toArray(CloseableIteration[]::new);
 
 				return new LookAheadIteration<>() {
@@ -154,6 +155,6 @@ protected void handleClose() throws SailException {
 			}
 		}
 
-		return super.getStatements(subj, pred, obj, includeInferred, contexts);
+		return super.getStatements(subj, pred, obj, includeBaseInferred, contexts);
 	}
 }

core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/RdfsShaclConnectionTest.java

@@ -60,6 +60,27 @@ public void testHasStatement() {
 
 	}
 
+	@Test
+	public void testHasStatementWithoutInferredKeepsRdfsReasoning() {
+
+		ShaclSail shaclSail = new ShaclSail(new MemoryStore());
+		shaclSail.init();
+
+		fill(shaclSail);
+
+		try (NotifyingSailConnection connection = shaclSail.getConnection()) {
+			((ShaclSailConnection) connection).rdfsSubClassOfReasoner = RdfsSubClassOfReasoner
+					.createReasoner((ShaclSailConnection) connection, new ValidationSettings());
+			VerySimpleRdfsBackwardsChainingConnection connection2 = new VerySimpleRdfsBackwardsChainingConnection(
+					connection,
+					((ShaclSailConnection) connection).getRdfsSubClassOfReasoner());
+
+			Assertions.assertTrue(connection2.hasStatement(aSubSub, RDF.TYPE, sup, false));
+		}
+		shaclSail.shutDown();
+
+	}
+
 	@Test
 	public void testGetStatement() {
 
@@ -102,6 +123,34 @@ public void testGetStatement() {
 
 	}
 
+	@Test
+	public void testGetStatementWithoutInferredKeepsRdfsReasoning() {
+
+		ShaclSail shaclSail = new ShaclSail(new MemoryStore());
+		shaclSail.init();
+
+		fill(shaclSail);
+
+		try (NotifyingSailConnection connection = shaclSail.getConnection()) {
+			((ShaclSailConnection) connection).rdfsSubClassOfReasoner = RdfsSubClassOfReasoner
+					.createReasoner((ShaclSailConnection) connection, new ValidationSettings());
+
+			VerySimpleRdfsBackwardsChainingConnection connection2 = new VerySimpleRdfsBackwardsChainingConnection(
+					connection,
+					((ShaclSailConnection) connection).getRdfsSubClassOfReasoner());
+
+			try (Stream<? extends Statement> stream = connection2.getStatements(aSubSub, RDF.TYPE, sup, false)
+					.stream()) {
+				Set<? extends Statement> collect = stream.collect(Collectors.toSet());
+				Set<Statement> expected = Set.of(vf.createStatement(aSubSub, RDF.TYPE, sup));
+				Assertions.assertEquals(expected, collect);
+			}
+		}
+
+		shaclSail.shutDown();
+
+	}
+
 	@Test
 	public void testGetStatementNoDuplicates() {