From ae72799d46e0cb6686b0fb6cc15961c161cc9cd5 Mon Sep 17 00:00:00 2001 From: Jeen Broekstra Date: Wed, 1 Feb 2017 14:03:17 +1100 Subject: [PATCH] #643 class names shortened and number of tests trimmed a bit Signed-off-by: Jeen Broekstra --- ...SchemaMemoryRepositoryConnectionTest.java} | 8 +-- ...cerRDFSMemoryRepositoryConnectionTest.java | 71 ------------------- ...rencerNativeRepositoryConnectionTest.java} | 8 +-- ...hingRDFSInferencerMemInferencingTest.java} | 10 +-- ...achingRDFSMemoryStoreConcurrencyTest.java} | 6 +- ...rdChainingSchemaCachingRDFSInferencer.java | 35 --------- ....java => SchemaCachingRDFSInferencer.java} | 52 +++++++------- ...chemaCachingRDFSInferencerConnection.java} | 6 +- 8 files changed, 45 insertions(+), 151 deletions(-) rename compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/{ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest.java => SchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest.java} (71%) delete mode 100644 compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/SpinForwardChainingSchemaCachingRDFSInferencerRDFSMemoryRepositoryConnectionTest.java rename compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/nativerdf/{ForwardChainingSchemaCachingRDFSInferencerNativeRepositoryConnectionTest.java => SchemaCachingRDFSInferencerNativeRepositoryConnectionTest.java} (77%) rename compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/{ForwardChainingSchemaCachingRDFSInferencerMemInferencingTest.java => SchemaCachingRDFSInferencerMemInferencingTest.java} (92%) rename compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/{ForwardChainingSchemaCachingRDFSMemoryStoreConcurrencyTest.java => SchemaCachingRDFSMemoryStoreConcurrencyTest.java} (79%) delete mode 100644 compliance/store/src/test/java/org/eclipse/rdf4j/sail/nativerdf/NativeStoreInferencingTestForwardChainingSchemaCachingRDFSInferencer.java rename core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/{ForwardChainingSchemaCachingRDFSInferencer.java => SchemaCachingRDFSInferencer.java} (87%) rename core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/{ForwardChainingSchemaCachingRDFSInferencerConnection.java => SchemaCachingRDFSInferencerConnection.java} (99%) diff --git a/compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest.java b/compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/SchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest.java similarity index 71% rename from compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest.java rename to compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/SchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest.java index d929edb5115..1f11d7c045a 100644 --- a/compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest.java +++ b/compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/SchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest.java @@ -11,14 +11,14 @@ import org.eclipse.rdf4j.repository.RDFSchemaRepositoryConnectionTest; import org.eclipse.rdf4j.repository.Repository; import org.eclipse.rdf4j.repository.sail.SailRepository; -import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer; +import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer; import org.eclipse.rdf4j.sail.memory.MemoryStore; -public class ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest +public class SchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest extends RDFSchemaRepositoryConnectionTest { - public ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest( + public SchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest( IsolationLevel level) { super(level); @@ -26,7 +26,7 @@ public ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnec @Override protected Repository createRepository() { - return new SailRepository(new ForwardChainingSchemaCachingRDFSInferencer(new MemoryStore(), true)); + return new SailRepository(new SchemaCachingRDFSInferencer(new MemoryStore(), true)); } } diff --git a/compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/SpinForwardChainingSchemaCachingRDFSInferencerRDFSMemoryRepositoryConnectionTest.java b/compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/SpinForwardChainingSchemaCachingRDFSInferencerRDFSMemoryRepositoryConnectionTest.java deleted file mode 100644 index 3114e6d1e04..00000000000 --- a/compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/SpinForwardChainingSchemaCachingRDFSInferencerRDFSMemoryRepositoryConnectionTest.java +++ /dev/null @@ -1,71 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Eclipse RDF4J contributors. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Distribution License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/org/documents/edl-v10.php. - *******************************************************************************/ -package org.eclipse.rdf4j.repository.sail.memory; - -import org.eclipse.rdf4j.IsolationLevel; -import org.eclipse.rdf4j.query.MalformedQueryException; -import org.eclipse.rdf4j.query.UnsupportedQueryLanguageException; -import org.eclipse.rdf4j.repository.Repository; -import org.eclipse.rdf4j.repository.RepositoryConnectionTest; -import org.eclipse.rdf4j.repository.sail.SailRepository; -import org.eclipse.rdf4j.sail.SailException; -import org.eclipse.rdf4j.sail.inferencer.fc.DedupingInferencer; -import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer; -import org.eclipse.rdf4j.sail.memory.MemoryStore; -import org.eclipse.rdf4j.sail.spin.SpinSail; -import org.junit.Ignore; -import org.junit.Test; - -import java.io.IOException; - -@Ignore("#58 - disabled spin compliance tests due to being slow and unstable. Manually execute when modifying SPIN functionality") -public class SpinForwardChainingSchemaCachingRDFSInferencerRDFSMemoryRepositoryConnectionTest - extends RepositoryConnectionTest -{ - - public SpinForwardChainingSchemaCachingRDFSInferencerRDFSMemoryRepositoryConnectionTest( - IsolationLevel level) - { - super(level); - } - - @Override - protected Repository createRepository() - throws MalformedQueryException, UnsupportedQueryLanguageException, SailException, IOException - { - return new SailRepository(new SpinSail(new ForwardChainingSchemaCachingRDFSInferencer( - new DedupingInferencer(new MemoryStore()), true))); - } - - @Ignore - @Test - @Override - public void testDefaultContext() - throws Exception - { - // ignore - } - - @Ignore - @Test - @Override - public void testDefaultInsertContext() - throws Exception - { - // ignore - } - - @Ignore - @Test - @Override - public void testExclusiveNullContext() - throws Exception - { - // ignore - } -} \ No newline at end of file diff --git a/compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/nativerdf/ForwardChainingSchemaCachingRDFSInferencerNativeRepositoryConnectionTest.java b/compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/nativerdf/SchemaCachingRDFSInferencerNativeRepositoryConnectionTest.java similarity index 77% rename from compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/nativerdf/ForwardChainingSchemaCachingRDFSInferencerNativeRepositoryConnectionTest.java rename to compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/nativerdf/SchemaCachingRDFSInferencerNativeRepositoryConnectionTest.java index 14ca30dc1d3..6332cb060d1 100644 --- a/compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/nativerdf/ForwardChainingSchemaCachingRDFSInferencerNativeRepositoryConnectionTest.java +++ b/compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/nativerdf/SchemaCachingRDFSInferencerNativeRepositoryConnectionTest.java @@ -15,16 +15,16 @@ import org.eclipse.rdf4j.repository.RDFSchemaRepositoryConnectionTest; import org.eclipse.rdf4j.repository.Repository; import org.eclipse.rdf4j.repository.sail.SailRepository; -import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer; +import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer; import org.eclipse.rdf4j.sail.nativerdf.NativeStore; -public class ForwardChainingSchemaCachingRDFSInferencerNativeRepositoryConnectionTest +public class SchemaCachingRDFSInferencerNativeRepositoryConnectionTest extends RDFSchemaRepositoryConnectionTest { private File dataDir; - public ForwardChainingSchemaCachingRDFSInferencerNativeRepositoryConnectionTest(IsolationLevel level) { + public SchemaCachingRDFSInferencerNativeRepositoryConnectionTest(IsolationLevel level) { super(level); } @@ -34,7 +34,7 @@ protected Repository createRepository() { dataDir = FileUtil.createTempDir("nativestore"); return new SailRepository( - new ForwardChainingSchemaCachingRDFSInferencer(new NativeStore(dataDir, "spoc"), true)); + new SchemaCachingRDFSInferencer(new NativeStore(dataDir, "spoc"), true)); } @Override diff --git a/compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/ForwardChainingSchemaCachingRDFSInferencerMemInferencingTest.java b/compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/SchemaCachingRDFSInferencerMemInferencingTest.java similarity index 92% rename from compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/ForwardChainingSchemaCachingRDFSInferencerMemInferencingTest.java rename to compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/SchemaCachingRDFSInferencerMemInferencingTest.java index 31f646336c5..d9908a5436a 100644 --- a/compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/ForwardChainingSchemaCachingRDFSInferencerMemInferencingTest.java +++ b/compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/SchemaCachingRDFSInferencerMemInferencingTest.java @@ -17,7 +17,7 @@ import org.eclipse.rdf4j.repository.sail.SailRepository; import org.eclipse.rdf4j.sail.InferencingTest; import org.eclipse.rdf4j.sail.Sail; -import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer; +import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer; import org.junit.Test; import java.lang.reflect.InvocationTargetException; @@ -25,11 +25,11 @@ import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertTrue; -public class ForwardChainingSchemaCachingRDFSInferencerMemInferencingTest extends InferencingTest { +public class SchemaCachingRDFSInferencerMemInferencingTest extends InferencingTest { @Override protected Sail createSail() { - Sail sailStack = new ForwardChainingSchemaCachingRDFSInferencer(new MemoryStore(), true); + Sail sailStack = new SchemaCachingRDFSInferencer(new MemoryStore(), true); return sailStack; } @@ -127,8 +127,8 @@ public void testFastInstantiate() } SailRepository sailRepository1 = new SailRepository( - ForwardChainingSchemaCachingRDFSInferencer.fastInstantiateFrom( - (ForwardChainingSchemaCachingRDFSInferencer)sail, new MemoryStore())); + SchemaCachingRDFSInferencer.fastInstantiateFrom( + (SchemaCachingRDFSInferencer)sail, new MemoryStore())); sailRepository1.initialize(); try (RepositoryConnection connection = sailRepository1.getConnection()) { diff --git a/compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/ForwardChainingSchemaCachingRDFSMemoryStoreConcurrencyTest.java b/compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/SchemaCachingRDFSMemoryStoreConcurrencyTest.java similarity index 79% rename from compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/ForwardChainingSchemaCachingRDFSMemoryStoreConcurrencyTest.java rename to compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/SchemaCachingRDFSMemoryStoreConcurrencyTest.java index 462a6889716..f148677dc9b 100644 --- a/compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/ForwardChainingSchemaCachingRDFSMemoryStoreConcurrencyTest.java +++ b/compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/SchemaCachingRDFSMemoryStoreConcurrencyTest.java @@ -10,14 +10,14 @@ import org.eclipse.rdf4j.sail.Sail; import org.eclipse.rdf4j.sail.SailConcurrencyTest; import org.eclipse.rdf4j.sail.SailException; -import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer; +import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer; import org.junit.Ignore; import org.junit.Test; /** * An extension of {@link SailConcurrencyTest} for testing the class {@link MemoryStore}. */ -public class ForwardChainingSchemaCachingRDFSMemoryStoreConcurrencyTest extends SailConcurrencyTest { +public class SchemaCachingRDFSMemoryStoreConcurrencyTest extends SailConcurrencyTest { /*---------* * Methods * @@ -27,7 +27,7 @@ public class ForwardChainingSchemaCachingRDFSMemoryStoreConcurrencyTest extends protected Sail createSail() throws SailException { - Sail sailStack = new ForwardChainingSchemaCachingRDFSInferencer(new MemoryStore(), true); + Sail sailStack = new SchemaCachingRDFSInferencer(new MemoryStore(), true); return sailStack; } diff --git a/compliance/store/src/test/java/org/eclipse/rdf4j/sail/nativerdf/NativeStoreInferencingTestForwardChainingSchemaCachingRDFSInferencer.java b/compliance/store/src/test/java/org/eclipse/rdf4j/sail/nativerdf/NativeStoreInferencingTestForwardChainingSchemaCachingRDFSInferencer.java deleted file mode 100644 index 65f18f40414..00000000000 --- a/compliance/store/src/test/java/org/eclipse/rdf4j/sail/nativerdf/NativeStoreInferencingTestForwardChainingSchemaCachingRDFSInferencer.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Eclipse RDF4J contributors. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Distribution License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/org/documents/edl-v10.php. - *******************************************************************************/ -package org.eclipse.rdf4j.sail.nativerdf; - -import java.io.IOException; - -import org.eclipse.rdf4j.sail.InferencingTest; -import org.eclipse.rdf4j.sail.NotifyingSail; -import org.eclipse.rdf4j.sail.Sail; -import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer; -import org.junit.Rule; -import org.junit.rules.TemporaryFolder; - -public class NativeStoreInferencingTestForwardChainingSchemaCachingRDFSInferencer extends InferencingTest { - - @Rule - public TemporaryFolder tempDir = new TemporaryFolder(); - - @Override - protected Sail createSail() { - try { - NotifyingSail sailStack = new NativeStore(tempDir.newFolder("nativestore"), "spoc,posc"); - sailStack = new ForwardChainingSchemaCachingRDFSInferencer(sailStack, true); - return sailStack; - } - catch (IOException e) { - throw new AssertionError(e); - } - } -} diff --git a/core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/ForwardChainingSchemaCachingRDFSInferencer.java b/core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/SchemaCachingRDFSInferencer.java similarity index 87% rename from core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/ForwardChainingSchemaCachingRDFSInferencer.java rename to core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/SchemaCachingRDFSInferencer.java index 167bb458562..bb3c16461bb 100644 --- a/core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/ForwardChainingSchemaCachingRDFSInferencer.java +++ b/core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/SchemaCachingRDFSInferencer.java @@ -38,7 +38,7 @@ /** *

- * The ForwardChainingSchemaCachingRDFSInferencer is an RDFS reasoner that caches all schema (TBox) statements + * The SchemaCachingRDFSInferencer is an RDFS reasoner that caches all schema (TBox) statements * and calculates an inference map to quickly determine inferred statements. The reasoner can also be * instantiated with a predefined schema for improved performance. *

@@ -54,7 +54,7 @@ * * @author Håvard Mikkelsen Ottestad */ -public class ForwardChainingSchemaCachingRDFSInferencer extends NotifyingSailWrapper { +public class SchemaCachingRDFSInferencer extends NotifyingSailWrapper { // The schema, or null Repository schema; @@ -94,19 +94,19 @@ public class ForwardChainingSchemaCachingRDFSInferencer extends NotifyingSailWra boolean rolledBackAfterModifyingSchemaCache; /** - * Instantiate a ForwardChainingSchemaCachingRDFSInferencer. + * Instantiate a SchemaCachingRDFSInferencer. * * @param data * Base sail for storing data. */ - public ForwardChainingSchemaCachingRDFSInferencer(NotifyingSail data) { + public SchemaCachingRDFSInferencer(NotifyingSail data) { super(data); schema = null; } /** - * Instantiate a ForwardChainingSchemaCachingRDFSInferencer with a predefined schema. The schema will be + * Instantiate a SchemaCachingRDFSInferencer with a predefined schema. The schema will be * used for inference, all other schema statements added will be ignored and no schema statements can be * removed. Using a predefined schema significantly improves performance. * @@ -115,7 +115,7 @@ public ForwardChainingSchemaCachingRDFSInferencer(NotifyingSail data) { * @param schema * Repository containing the schema. */ - public ForwardChainingSchemaCachingRDFSInferencer(NotifyingSail data, Repository schema) { + public SchemaCachingRDFSInferencer(NotifyingSail data, Repository schema) { super(data); this.schema = schema; @@ -123,14 +123,14 @@ public ForwardChainingSchemaCachingRDFSInferencer(NotifyingSail data, Repository } /** - * Instantiate a ForwardChainingSchemaCachingRDFSInferencer. + * Instantiate a SchemaCachingRDFSInferencer. * * @param data * Base sail for storing data. * @param useAllRdfsRules * Usel all RDFS rules. If set to false rule rdf4a and rdfs4b will be ignore */ - public ForwardChainingSchemaCachingRDFSInferencer(NotifyingSail data, boolean useAllRdfsRules) { + public SchemaCachingRDFSInferencer(NotifyingSail data, boolean useAllRdfsRules) { super(data); schema = null; @@ -139,7 +139,7 @@ public ForwardChainingSchemaCachingRDFSInferencer(NotifyingSail data, boolean us } /** - * Instantiate a ForwardChainingSchemaCachingRDFSInferencer with a predefined schema. The schema will be + * Instantiate a SchemaCachingRDFSInferencer with a predefined schema. The schema will be * used for inference, all other schema statements added will be ignored and no schema statements can be * removed. Using a predefined schema significantly improves performance. * @@ -150,7 +150,7 @@ public ForwardChainingSchemaCachingRDFSInferencer(NotifyingSail data, boolean us * @param useAllRdfsRules * Usel all RDFS rules. If set to false rule rdf4a and rdfs4b will be ignore */ - public ForwardChainingSchemaCachingRDFSInferencer(NotifyingSail data, Repository schema, + public SchemaCachingRDFSInferencer(NotifyingSail data, Repository schema, boolean useAllRdfsRules) { super(data); @@ -213,7 +213,7 @@ public void initialize() return; } - try (final ForwardChainingSchemaCachingRDFSInferencerConnection conn = getConnection()) { + try (final SchemaCachingRDFSInferencerConnection conn = getConnection()) { conn.begin(); conn.addAxiomStatements(); @@ -243,11 +243,11 @@ public void initialize() } - public ForwardChainingSchemaCachingRDFSInferencerConnection getConnection() + public SchemaCachingRDFSInferencerConnection getConnection() throws SailException { InferencerConnection e = (InferencerConnection)super.getConnection(); - return new ForwardChainingSchemaCachingRDFSInferencerConnection(this, e); + return new SchemaCachingRDFSInferencerConnection(this, e); } public ValueFactory getValueFactory() { @@ -255,49 +255,49 @@ public ValueFactory getValueFactory() { } /** - * Instantiate a new ForwardChainingSchemaCachingRDFSInferencer from an existing one. Fast instantiation + * Instantiate a new SchemaCachingRDFSInferencer from an existing one. Fast instantiation * extracts the schema lookup tables generated by the existing sail and uses them to populate the lookup * tables of a new reasoner. Schema triples can not be queried in the - * ForwardChainingSchemaCachingRDFSInferencer returned by this method. + * SchemaCachingRDFSInferencer returned by this method. * * @param sailToInstantiateFrom - * The ForwardChainingSchemaCachingRDFSInferencer to extract the lookup tables from. + * The SchemaCachingRDFSInferencer to extract the lookup tables from. * @param store * Base sail for storing data. * @return */ - static public ForwardChainingSchemaCachingRDFSInferencer fastInstantiateFrom( - ForwardChainingSchemaCachingRDFSInferencer sailToInstantiateFrom, NotifyingSail store) + static public SchemaCachingRDFSInferencer fastInstantiateFrom( + SchemaCachingRDFSInferencer sailToInstantiateFrom, NotifyingSail store) { return fastInstantiateFrom(sailToInstantiateFrom, store, true); } /** - * Instantiate a new ForwardChainingSchemaCachingRDFSInferencer from an existing one. Fast instantiation + * Instantiate a new SchemaCachingRDFSInferencer from an existing one. Fast instantiation * extracts the schema lookup tables generated by the existing sail and uses them to populate the lookup * tables of a new reasoner. Schema triples can not be queried in the - * ForwardChainingSchemaCachingRDFSInferencer returned by this method. + * SchemaCachingRDFSInferencer returned by this method. * * @param sailToInstantiateFrom - * The ForwardChainingSchemaCachingRDFSInferencer to extract the lookup tables from. + * The SchemaCachingRDFSInferencer to extract the lookup tables from. * @param store * Base sail for storing data. * @param useAllRdfsRules * Usel all RDFS rules. If set to false rule rdf4a and rdfs4b will be ignore * @return */ - static public ForwardChainingSchemaCachingRDFSInferencer fastInstantiateFrom( - ForwardChainingSchemaCachingRDFSInferencer sailToInstantiateFrom, NotifyingSail store, + static public SchemaCachingRDFSInferencer fastInstantiateFrom( + SchemaCachingRDFSInferencer sailToInstantiateFrom, NotifyingSail store, boolean useAllRdfsRules) { if (sailToInstantiateFrom.rolledBackAfterModifyingSchemaCache) { throw new SailException( - "ForwardChainingSchemaCachingRDFSInferencer used was previously rolled back and can not be used by fastInstantiateFrom()."); + "SchemaCachingRDFSInferencer used was previously rolled back and can not be used by fastInstantiateFrom()."); } sailToInstantiateFrom.getConnection().close(); - ForwardChainingSchemaCachingRDFSInferencer ret = new ForwardChainingSchemaCachingRDFSInferencer(store, + SchemaCachingRDFSInferencer ret = new SchemaCachingRDFSInferencer(store, sailToInstantiateFrom.schema, useAllRdfsRules); ret.sharedSchema = true; @@ -347,7 +347,7 @@ long getSchemaSize() { + domainStatements.size() + properties.size() + types.size(); } - void calculateInferenceMaps(ForwardChainingSchemaCachingRDFSInferencerConnection conn) { + void calculateInferenceMaps(SchemaCachingRDFSInferencerConnection conn) { calculateSubClassOf(subClassOfStatements); properties.forEach(predicate -> { conn.addInferredStatement(predicate, RDF.TYPE, RDF.PROPERTY); diff --git a/core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/ForwardChainingSchemaCachingRDFSInferencerConnection.java b/core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/SchemaCachingRDFSInferencerConnection.java similarity index 99% rename from core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/ForwardChainingSchemaCachingRDFSInferencerConnection.java rename to core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/SchemaCachingRDFSInferencerConnection.java index 92965f58504..deee7220807 100644 --- a/core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/ForwardChainingSchemaCachingRDFSInferencerConnection.java +++ b/core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/SchemaCachingRDFSInferencerConnection.java @@ -31,13 +31,13 @@ * @author Håvard Mikkelsen Ottestad */ -public class ForwardChainingSchemaCachingRDFSInferencerConnection extends InferencerConnectionWrapper +public class SchemaCachingRDFSInferencerConnection extends InferencerConnectionWrapper implements SailConnectionListener { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private final ForwardChainingSchemaCachingRDFSInferencer sail; + private final SchemaCachingRDFSInferencer sail; private final NotifyingSailConnection connection; @@ -51,7 +51,7 @@ public class ForwardChainingSchemaCachingRDFSInferencerConnection extends Infere */ private boolean statementsAdded; - ForwardChainingSchemaCachingRDFSInferencerConnection(ForwardChainingSchemaCachingRDFSInferencer sail, + SchemaCachingRDFSInferencerConnection(SchemaCachingRDFSInferencer sail, InferencerConnection connection) {