JENA-1917: Deprecate readModel, loadModel; add internal versions
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
index ce412fe..e68e85d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
@@ -344,15 +344,8 @@
// LEGACY
- /** Load a model from a file (local or remote).
- * This operation may attempt content negotiation for http URLs.
- * @param filenameOrURI The filename or a URI (file:, http:)
- * @return a new model
- * @exception JenaException if there is syntax error in file.
- */
-
@Override
- public Model loadModel(String filenameOrURI)
+ public Model loadModelInternal(String filenameOrURI)
{
if ( log.isDebugEnabled() )
log.debug("loadModel("+filenameOrURI+")") ;
@@ -368,7 +361,7 @@
* @return a new model
* @exception JenaException if there is syntax error in file.
*/
-
+ @Deprecated
@Override
public Model loadModel(String filenameOrURI, String rdfSyntax)
{
@@ -385,8 +378,7 @@
* @return a new model
* @exception JenaException if there is syntax error in file.
*/
-
-
+ @Deprecated
@Override
public Model loadModel(String filenameOrURI, String baseURI, String rdfSyntax)
{
@@ -413,17 +405,8 @@
return m ;
}
- /**
- * Read a file of RDF into a model. Guesses the syntax of the file based on filename extension,
- * defaulting to RDF/XML.
- * @param model
- * @param filenameOrURI
- * @return The model or null, if there was an error.
- * @exception JenaException if there is syntax error in file.
- */
-
@Override
- public Model readModel(Model model, String filenameOrURI)
+ public Model readModelInternal(Model model, String filenameOrURI)
{
if ( log.isDebugEnabled() )
log.debug("readModel(model,"+filenameOrURI+")") ;
@@ -438,7 +421,7 @@
* @return The model or null, if there was an error.
* @exception JenaException if there is syntax error in file.
*/
-
+ @Deprecated
@Override
public Model readModel(Model model, String filenameOrURI, String rdfSyntax)
{
@@ -456,7 +439,7 @@
* @return The model
* @exception JenaException if there is syntax error in file.
*/
-
+ @Deprecated
@Override
public Model readModel(Model model, String filenameOrURI, String baseURI, String syntax)
{
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java b/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
index 4509027..74a9116 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
@@ -75,14 +75,14 @@
public void testFileManagerNoFile2() {
FileManager fileManager = FileManager.create() ;
fileManager.addLocatorFile() ;
- fileManager.readModel(ModelFactory.createDefaultModel(), filenameNonExistent);
+ fileManager.readModelInternal(ModelFactory.createDefaultModel(), filenameNonExistent);
}
@Test(expected = NotFoundException.class)
public void testFileManagerNoFile3() {
FileManager fileManager = new AdapterFileManager(new StreamManager(), new org.apache.jena.riot.system.stream.LocationMapper()) ;
fileManager.addLocatorFile() ;
- fileManager.readModel(ModelFactory.createDefaultModel(), filenameNonExistent);
+ fileManager.readModelInternal(ModelFactory.createDefaultModel(), filenameNonExistent);
}
@Test public void testFileManagerLocatorClassLoader() {
@@ -150,7 +150,7 @@
@Test public void testFileManagerReadOntModel() {
OntModel model = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM) ;
- FileManager.getInternal().readModel(model, testingDir+"/data.ttl") ;
+ FileManager.getInternal().readModelInternal(model, testingDir+"/data.ttl") ;
// Check
Individual ind = model.getIndividual("http://example.com/individual") ;
String t = ind.getOntClass().getURI() ;
@@ -187,8 +187,8 @@
@Test public void testCache1() {
FileManager fileManager = FileManager.create() ;
fileManager.addLocatorFile(testingDir) ;
- Model m1 = fileManager.loadModel(fileModel) ;
- Model m2 = fileManager.loadModel(fileModel) ;
+ Model m1 = fileManager.loadModelInternal(fileModel) ;
+ Model m2 = fileManager.loadModelInternal(fileModel) ;
assertNotSame(m1, m2) ;
}
@@ -199,8 +199,8 @@
FileManager fileManager = FileManager.getInternal() ;
fileManager.addLocatorFile(testingDir) ;
fileManager.setModelCaching(true) ;
- Model m1 = fileManager.loadModel(fileModel) ;
- Model m2 = fileManager.loadModel(fileModel) ;
+ Model m1 = fileManager.loadModelInternal(fileModel) ;
+ Model m2 = fileManager.loadModelInternal(fileModel) ;
assertSame(m1, m2) ;
}
@@ -209,17 +209,17 @@
FileManager fileManager = FileManager.getInternal() ;
fileManager.addLocatorFile(testingDir) ;
fileManager.setModelCaching(true) ;
- Model m1 = fileManager.loadModel(fileModel) ;
- Model m2 = fileManager.loadModel(fileModel) ;
+ Model m1 = fileManager.loadModelInternal(fileModel) ;
+ Model m2 = fileManager.loadModelInternal(fileModel) ;
assertSame(m1, m2) ;
fileManager.removeCacheModel(fileModel) ;
- Model m3 = fileManager.loadModel(fileModel) ;
+ Model m3 = fileManager.loadModelInternal(fileModel) ;
assertNotSame(m1, m3) ;
fileManager.resetCache() ;
- Model m4 = fileManager.loadModel(fileModel) ;
- Model m5 = fileManager.loadModel(fileModel) ;
+ Model m4 = fileManager.loadModelInternal(fileModel) ;
+ Model m5 = fileManager.loadModelInternal(fileModel) ;
assertSame(m4, m5) ;
assertNotSame(m1, m4) ;
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/ImportManager.java b/jena-core/src/main/java/org/apache/jena/assembler/ImportManager.java
index 99196ee..d894721 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/ImportManager.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/ImportManager.java
@@ -102,7 +102,7 @@
Graph already = cache.get( path );
if (already == null)
{
- Graph result = withImports( fm, fm.loadModel( path ), loading ).getGraph();
+ Graph result = withImports( fm, fm.loadModelInternal( path ), loading ).getGraph();
cache.put( path, result );
return result;
}
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/JA.java b/jena-core/src/main/java/org/apache/jena/assembler/JA.java
index 41dee4d..3e65085 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/JA.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/JA.java
@@ -193,7 +193,7 @@
public static Model getSchema()
{ // inline packagename to avoid clash with /our/ FileManager.
- if (schema == null) schema = complete( org.apache.jena.util.FileManager.getInternal().loadModel( getSchemaPath() ) );
+ if (schema == null) schema = complete( org.apache.jena.util.FileManager.getInternal().loadModelInternal( getSchemaPath() ) );
return schema;
}
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ContentAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ContentAssembler.java
index 2365270..2619e59 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ContentAssembler.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ContentAssembler.java
@@ -151,7 +151,7 @@
protected Content objectAsContent( FileManager fm, Statement s )
{
- final Model m = fm.loadModel( getModelName( s ) );
+ final Model m = fm.loadModelInternal( getModelName( s ) );
return newModelContent( m );
}
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/OntDocumentManager.java b/jena-core/src/main/java/org/apache/jena/ontology/OntDocumentManager.java
index ddfe1aa..5636b81 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/OntDocumentManager.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/OntDocumentManager.java
@@ -1057,7 +1057,7 @@
}
else {
// do the actual read
- getFileManager().readModel( model, source );
+ getFileManager().readModelInternal( model, source );
}
// now the post-read hook
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/WrappedReasonerFactory.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/WrappedReasonerFactory.java
index 2f3f0f6..1e2d1bc 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/WrappedReasonerFactory.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/WrappedReasonerFactory.java
@@ -61,7 +61,7 @@
{
Statement s = schemas.nextStatement();
Resource sc = s.getResource();
- FileManager.getInternal().readModel( schema, sc.getURI() );
+ FileManager.getInternal().readModelInternal( schema, sc.getURI() );
}
return schema;
}
diff --git a/jena-core/src/main/java/org/apache/jena/util/FileManager.java b/jena-core/src/main/java/org/apache/jena/util/FileManager.java
index efd2eb9..79d7261 100644
--- a/jena-core/src/main/java/org/apache/jena/util/FileManager.java
+++ b/jena-core/src/main/java/org/apache/jena/util/FileManager.java
@@ -30,7 +30,7 @@
public static final String PATH_DELIMITER = ";";
public static final String filePathSeparator = java.io.File.separator ;
- /** For usage with Jena libraries only */
+ /** For use within Jena libraries only. */
public static FileManager getInternal() { return FileManagerImpl.get(); }
/** @deprecated Use {@code StreamManager} if needed; to read RDF files, use {@code RDFDataMgr}. */
@@ -108,8 +108,15 @@
* @param filenameOrURI The filename or a URI (file:, http:)
* @return a new model
* @exception JenaException if there is syntax error in file.
+ * @deprecated Use {@code RDFDataMgr}
*/
- Model loadModel(String filenameOrURI);
+ @Deprecated
+ default Model loadModel(String filenameOrURI) {
+ return loadModelInternal(filenameOrURI);
+ }
+
+ /** For use within Jena libraries only. */
+ Model loadModelInternal(String filenameOrURI);
/** Load a model from a file (local or remote).
* URI is the base for reading the model.
@@ -118,8 +125,8 @@
* @param rdfSyntax RDF Serialization syntax.
* @return a new model
* @exception JenaException if there is syntax error in file.
+ * @deprecated Use {@code RDFDataMgr}
*/
-
@Deprecated
Model loadModel(String filenameOrURI, String rdfSyntax);
@@ -130,7 +137,8 @@
* @param rdfSyntax RDF Serialization syntax.
* @return a new model
* @exception JenaException if there is syntax error in file.
- */
+ * @deprecated Use {@code RDFDataMgr}
+ */
@Deprecated
Model loadModel(String filenameOrURI, String baseURI, String rdfSyntax);
@@ -140,9 +148,15 @@
* @param model
* @param filenameOrURI
* @return The model or null, if there was an error.
- * @exception JenaException if there is syntax error in file.
+ * @exception JenaException if there is syntax error in file.
+ * @deprecated Use {@code RDFDataMgr}
*/
- Model readModel(Model model, String filenameOrURI);
+ default Model readModel(Model model, String filenameOrURI) {
+ return readModelInternal(model, filenameOrURI);
+ }
+
+ /** For use within Jena libraries only. */
+ Model readModelInternal(Model model, String filenameOrURI);
/**
* Read a file of RDF into a model.
@@ -150,7 +164,8 @@
* @param filenameOrURI
* @param rdfSyntax RDF Serialization syntax.
* @return The model or null, if there was an error.
- * @exception JenaException if there is syntax error in file.
+ * @exception JenaException if there is syntax error in file.
+ * @deprecated Use {@code RDFDataMgr}
*/
@Deprecated
Model readModel(Model model, String filenameOrURI, String rdfSyntax);
diff --git a/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java b/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java
index d32bb21..418ba52 100644
--- a/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java
@@ -273,7 +273,7 @@
*/
@Override
- public Model loadModel(String filenameOrURI)
+ public Model loadModelInternal(String filenameOrURI)
{
if ( log.isDebugEnabled() )
log.debug("loadModel("+filenameOrURI+")") ;
@@ -344,7 +344,7 @@
*/
@Override
- public Model readModel(Model model, String filenameOrURI)
+ public Model readModelInternal(Model model, String filenameOrURI)
{
if ( log.isDebugEnabled() )
log.debug("readModel(model,"+filenameOrURI+")") ;
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestContentAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestContentAssembler.java
index df15b4e..09ebb5a 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestContentAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestContentAssembler.java
@@ -94,7 +94,7 @@
String source = Testing + "/schema.n3";
Resource root = resourceInModel( "x rdf:type ja:Content; x rdf:type ja:ExternalContent; x ja:externalContent file:" + source );
Content c = (Content) a.open( root );
- assertIsoModels( FileManager.getInternal().loadModel( "file:" + source ), c.fill( model( "" ) ) );
+ assertIsoModels( FileManager.getInternal().loadModelInternal( "file:" + source ), c.fill( model( "" ) ) );
}
public void testMultipleExternalContent()
@@ -106,7 +106,7 @@
( "x rdf:type ja:Content; x rdf:type ja:ExternalContent"
+ "; x ja:externalContent file:" + sourceA + "; x ja:externalContent file:" + sourceB );
Content c = (Content) a.open( root );
- Model wanted = FileManager.getInternal().loadModel( "file:" + sourceA ).add( FileManager.getInternal().loadModel( "file:" + sourceB ) );
+ Model wanted = FileManager.getInternal().loadModelInternal( "file:" + sourceA ).add( FileManager.getInternal().loadModelInternal( "file:" + sourceB ) );
assertIsoModels( wanted, c.fill( model( "" ) ) );
}
@@ -168,7 +168,7 @@
+ "; x ja:literalContent '<eh:/eggs>\\srdf:type\\srdf:Property.'"
+ "; x ja:externalContent file:" + source );
Content c = (Content) a.open( root );
- Model wanted = FileManager.getInternal().loadModel( "file:" + source ).add( model( "eggs rdf:type rdf:Property" ) );
+ Model wanted = FileManager.getInternal().loadModelInternal( "file:" + source ).add( model( "eggs rdf:type rdf:Property" ) );
assertIsoModels( wanted, c.fill( model( "" ) ) );
}
@@ -234,17 +234,17 @@
FileManager fm = new FileManagerImpl()
{
@Override
- public Model loadModel( String filenameOrURI )
+ public Model loadModelInternal( String filenameOrURI )
{
used[0] = true;
- return FileManager.getInternal().loadModel( filenameOrURI );
+ return FileManager.getInternal().loadModelInternal( filenameOrURI );
}
};
Assembler a = new ContentAssembler( fm );
String source = Testing + "/schema.n3";
Resource root = resourceInModel( "x rdf:type ja:Content; x rdf:type ja:ExternalContent; x ja:externalContent file:" + source );
Content c = (Content) a.open( root );
- assertIsoModels( FileManager.getInternal().loadModel( "file:" + source ), c.fill( model( "" ) ) );
+ assertIsoModels( FileManager.getInternal().loadModelInternal( "file:" + source ), c.fill( model( "" ) ) );
assertTrue( "the supplied file manager must have been used", used[0] );
}
@@ -274,7 +274,7 @@
{ this.expected = expected; this.fileName = fileName; }
@Override
- public Model loadModel( String filenameOrURI )
+ public Model loadModelInternal( String filenameOrURI )
{
used = true;
assertEquals( fileName, filenameOrURI );
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestImportManager.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestImportManager.java
index c22f10b..9eb3176 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestImportManager.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestImportManager.java
@@ -35,7 +35,7 @@
{
Map<String, Model> map = new HashMap<>();
- @Override public Model loadModel( String URL )
+ @Override public Model loadModelInternal( String URL )
{
Model result = map.get( URL );
if (result == null) fail( "no model for " + URL );
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestProperty.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestProperty.java
index e638e40..9d4495c 100644
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestProperty.java
+++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestProperty.java
@@ -596,7 +596,7 @@
@Override
protected void ontTest( OntModel m ) {
OntModel m0 = ModelFactory.createOntologyModel( OntModelSpec.OWL_DL_MEM_RULE_INF, null );
- FileManager.getInternal().readModel( m0, "file:testing/ontology/testImport9/a.ttl" );
+ FileManager.getInternal().readModelInternal( m0, "file:testing/ontology/testImport9/a.ttl" );
OntProperty p0 = m0.getOntProperty( "http://incubator.apache.org/jena/2011/10/testont/b#propB" );
TestUtil.assertIteratorLength( p0.listDomain(), 3 );
@@ -604,7 +604,7 @@
// repeat test - thus using previously cached model for import
OntModel m1 = ModelFactory.createOntologyModel( OntModelSpec.OWL_DL_MEM_RULE_INF, null );
- FileManager.getInternal().readModel( m1, "file:testing/ontology/testImport9/a.ttl" );
+ FileManager.getInternal().readModelInternal( m1, "file:testing/ontology/testImport9/a.ttl" );
OntProperty p1 = m1.getOntProperty( "http://incubator.apache.org/jena/2011/10/testont/b#propB" );
TestUtil.assertIteratorLength( p1.listDomain(), 3 );
diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestWriterFeatures.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestWriterFeatures.java
index 8238dee..aaf9587 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestWriterFeatures.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestWriterFeatures.java
@@ -41,7 +41,7 @@
String propertyName, String propertyValue)
{
Model model = createMemModel();
- FileManager.getInternal().readModel(model, filename );
+ FileManager.getInternal().readModelInternal(model, filename );
String contents = null ;
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java
index 21816a6..440bbe3 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java
@@ -138,7 +138,7 @@
* Load a test data set from file.
*/
public void load(String testFile) {
- testdata = FileManager.getInternal().loadModel(testFile).getGraph();
+ testdata = FileManager.getInternal().loadModelInternal(testFile).getGraph();
schema = null;
}
@@ -146,8 +146,8 @@
* Load both a schema and an instance data file.
*/
public void load(String schemaFile, String testFile) {
- testdata = FileManager.getInternal().loadModel(testFile).getGraph();
- schema = FileManager.getInternal().loadModel(schemaFile).getGraph();
+ testdata = FileManager.getInternal().loadModelInternal(testFile).getGraph();
+ schema = FileManager.getInternal().loadModelInternal(schemaFile).getGraph();
}
/**
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLConsistencyTest.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLConsistencyTest.java
index 8b9fbab..b697f14 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLConsistencyTest.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLConsistencyTest.java
@@ -111,8 +111,8 @@
* Run the consistency check, returning a ValidityReport.
*/
public ValidityReport testResults() {
- Model t = FileManager.getInternal().loadModel(BASE_DIR + tbox);
- Model a = FileManager.getInternal().loadModel(BASE_DIR + abox);
+ Model t = FileManager.getInternal().loadModelInternal(BASE_DIR + tbox);
+ Model a = FileManager.getInternal().loadModelInternal(BASE_DIR + abox);
// Work around non-deterministic bug in bindSchema
// Reasoner r = rf.create(null).bindSchema(t);
Reasoner r = rf.create(null);
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLWGTester.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLWGTester.java
index ff59d95..6064d56 100755
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLWGTester.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/OWLWGTester.java
@@ -127,7 +127,7 @@
*/
public boolean runTests(String manifestFile, boolean log, boolean stats) throws IOException {
// Load up the manifest
- Model manifest = FileManager.getInternal().loadModel(baseDir + manifestFile);
+ Model manifest = FileManager.getInternal().loadModelInternal(baseDir + manifestFile);
ResIterator tests = manifest.listResourcesWithProperty(RDF.type, PositiveEntailmentTest);
while (tests.hasNext()) {
Resource test = tests.nextResource();
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBugs.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBugs.java
index ff09142..2ae1286 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBugs.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBugs.java
@@ -248,8 +248,8 @@
*/
public void testBindSchemaValidate() {
Reasoner reasoner = ReasonerRegistry.getOWLReasoner();
- Model schema = FileManager.getInternal().loadModel("file:testing/reasoners/bugs/sbug.owl");
- Model data = FileManager.getInternal().loadModel("file:testing/reasoners/bugs/sbug.rdf");
+ Model schema = FileManager.getInternal().loadModelInternal("file:testing/reasoners/bugs/sbug.owl");
+ Model data = FileManager.getInternal().loadModelInternal("file:testing/reasoners/bugs/sbug.rdf");
// Union version
InfModel infu = ModelFactory.createInfModel(reasoner, data.union(schema));
@@ -382,7 +382,7 @@
/** Problem with bindSchema and validation rules */
public void test_der_validation() {
- Model abox = FileManager.getInternal().loadModel("file:testing/reasoners/owl/nondetbug.rdf");
+ Model abox = FileManager.getInternal().loadModelInternal("file:testing/reasoners/owl/nondetbug.rdf");
List<Rule> rules = FBRuleReasoner.loadRules("testing/reasoners/owl/nondetbug.rules");
GenericRuleReasoner r = new GenericRuleReasoner(rules);
// r.setTraceOn(true);
@@ -857,7 +857,7 @@
* used to trip up validation
*/
public void testLayeredValidation() {
- Model ont = FileManager.getInternal().loadModel("testing/reasoners/bugs/layeredValidation.owl");
+ Model ont = FileManager.getInternal().loadModelInternal("testing/reasoners/bugs/layeredValidation.owl");
InfModel infModel =
ModelFactory.createInfModel(ReasonerRegistry.getOWLReasoner(), ont);
OntModel model = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM_RULE_INF,
@@ -886,7 +886,7 @@
private void doTestmaxCard2(OntModelSpec spec) {
String NS = "http://jena.hpl.hp.com/eg#";
- Model base = FileManager.getInternal().loadModel("testing/reasoners/bugs/terrorism.owl");
+ Model base = FileManager.getInternal().loadModelInternal("testing/reasoners/bugs/terrorism.owl");
OntModel model = ModelFactory.createOntologyModel(spec, base);
OntClass event = model.getOntClass(NS + "Event");
List<OntClass> subclasses = event.listSubClasses().toList();
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java
index a73c9b9..53bcefa 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java
@@ -989,7 +989,7 @@
boolean prior = JenaParameters.enableFilteringOfHiddenInfNodes;
try {
JenaParameters.enableFilteringOfHiddenInfNodes = false;
- Model premisesM = FileManager.getInternal().loadModel("file:testing/wg/equivalentClass/premises004.rdf");
+ Model premisesM = FileManager.getInternal().loadModelInternal("file:testing/wg/equivalentClass/premises004.rdf");
Graph data = premisesM.getGraph();
Reasoner reasoner = new OWLFBRuleReasoner(OWLFBRuleReasonerFactory.theInstance());
InfGraph infgraph = reasoner.bind(data);
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestOWLConsistency.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestOWLConsistency.java
index 12aa1a2..a485891 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestOWLConsistency.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestOWLConsistency.java
@@ -63,7 +63,7 @@
*/
public Reasoner makeReasoner() {
if (reasonerCache == null) {
- Model tbox = FileManager.getInternal().loadModel(testTbox);
+ Model tbox = FileManager.getInternal().loadModelInternal(testTbox);
reasonerCache = ReasonerRegistry.getOWLReasoner().bindSchema(tbox.getGraph());
}
return reasonerCache;
@@ -124,7 +124,7 @@
*/
private boolean doTestOn(String dataFile) {
// System.out.println("Test: " + dataFile);
- Model data = FileManager.getInternal().loadModel(dataFile);
+ Model data = FileManager.getInternal().loadModelInternal(dataFile);
InfModel infmodel = ModelFactory.createInfModel(makeReasoner(), data);
ValidityReport reportList = infmodel.validate();
/* Debug only
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestOWLMisc.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestOWLMisc.java
index 025f1f8..d0f03b4 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestOWLMisc.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestOWLMisc.java
@@ -153,7 +153,7 @@
* Test looping on recursive someValuesFrom.
*/
public void hiddenTestOWLLoop() {
- Model data = FileManager.getInternal().loadModel("file:testing/reasoners/bugs/loop.owl");
+ Model data = FileManager.getInternal().loadModelInternal("file:testing/reasoners/bugs/loop.owl");
InfModel infmodel = ModelFactory.createInfModel(ReasonerRegistry.getOWLReasoner(), data);
((FBRuleInfGraph)infmodel.getGraph()).setTraceOn(true);
String baseURI = "http://jena.hpl.hp.com/eg#";
@@ -186,7 +186,7 @@
* Test bug with leaking variables which results in an incorrect "range = Nothing" deduction.
*/
public void testRangeBug() {
- Model model = FileManager.getInternal().loadModel("file:testing/reasoners/bugs/rangeBug.owl");
+ Model model = FileManager.getInternal().loadModelInternal("file:testing/reasoners/bugs/rangeBug.owl");
// Model m = ModelFactory.createDefaultModel();
Reasoner r = ReasonerRegistry.getOWLReasoner();
InfModel omodel = ModelFactory.createInfModel(r, model);
@@ -201,7 +201,7 @@
* Test change of RDF specs to allow plain literals w/o lang and XSD string to be the same.
*/
public void testLiteralBug() {
- Model model = FileManager.getInternal().loadModel("file:testing/reasoners/bugs/dtValidation.owl");
+ Model model = FileManager.getInternal().loadModelInternal("file:testing/reasoners/bugs/dtValidation.owl");
// Model m = ModelFactory.createDefaultModel();
Reasoner r = ReasonerRegistry.getOWLReasoner();
InfModel infmodel = ModelFactory.createInfModel(r, model);
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestTrialOWLRules.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestTrialOWLRules.java
index 6ad62a8..e125d45 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestTrialOWLRules.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestTrialOWLRules.java
@@ -185,7 +185,7 @@
* for use during debugging.
*/
public static void main(String[] args) {
- Model premises = FileManager.getInternal().loadModel("file:testing/wg/someValuesFrom/premises001.rdf");
+ Model premises = FileManager.getInternal().loadModelInternal("file:testing/wg/someValuesFrom/premises001.rdf");
Reasoner reasoner = GenericRuleReasonerFactory.theInstance().create(configuration);
InfModel conclusions = ModelFactory.createInfModel(reasoner, premises);
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/ManualExample.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/ManualExample.java
index d85b4fe..0904320 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/test/ManualExample.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/test/ManualExample.java
@@ -66,7 +66,7 @@
/** illustrate validation */
public void test2(String fname) {
System.out.println("Testing " + fname);
- Model data = FileManager.getInternal().loadModel(fname);
+ Model data = FileManager.getInternal().loadModelInternal(fname);
InfModel infmodel = ModelFactory.createRDFSModel(data);
ValidityReport validity = infmodel.validate();
if (validity.isValid()) {
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestReasoners.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestReasoners.java
index 675def2..46c3d11 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestReasoners.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestReasoners.java
@@ -270,7 +270,7 @@
* Check a complex graph's transitive reduction.
*/
public void testTransitiveReduction() {
- Model test = FileManager.getInternal().loadModel("testing/reasoners/bugs/subpropertyModel.n3");
+ Model test = FileManager.getInternal().loadModelInternal("testing/reasoners/bugs/subpropertyModel.n3");
Property dp = test.getProperty(TransitiveReasoner.directSubPropertyOf.getURI());
doTestTransitiveReduction(test, dp);
}
@@ -441,7 +441,7 @@
* Cycle bug in transitive reasoner
*/
public void testTransitiveCycleBug() {
- Model m = FileManager.getInternal().loadModel( "file:testing/reasoners/bugs/unbroken.n3" );
+ Model m = FileManager.getInternal().loadModelInternal( "file:testing/reasoners/bugs/unbroken.n3" );
OntModel om = ModelFactory.createOntologyModel( OntModelSpec.RDFS_MEM_TRANS_INF, m );
OntClass rootClass = om.getOntClass( RDFS.Resource.getURI() );
Resource c = m.getResource("c");
diff --git a/jena-core/src/test/java/org/apache/jena/util/TestFileManager.java b/jena-core/src/test/java/org/apache/jena/util/TestFileManager.java
index ce64444..5ef47e4 100644
--- a/jena-core/src/test/java/org/apache/jena/util/TestFileManager.java
+++ b/jena-core/src/test/java/org/apache/jena/util/TestFileManager.java
@@ -171,8 +171,8 @@
{
FileManager fileManager = new FileManagerImpl() ;
fileManager.addLocatorFile(testingDir) ;
- Model m1 = fileManager.loadModel(fileModel) ;
- Model m2 = fileManager.loadModel(fileModel) ;
+ Model m1 = fileManager.loadModelInternal(fileModel) ;
+ Model m2 = fileManager.loadModelInternal(fileModel) ;
assertNotSame(m1, m2) ;
}
@@ -182,8 +182,8 @@
FileManager fileManager = FileManager.getInternal() ;
fileManager.addLocatorFile(testingDir) ;
fileManager.setModelCaching(true) ;
- Model m1 = fileManager.loadModel(fileModel) ;
- Model m2 = fileManager.loadModel(fileModel) ;
+ Model m1 = fileManager.loadModelInternal(fileModel) ;
+ Model m2 = fileManager.loadModelInternal(fileModel) ;
assertSame(m1, m2) ;
}
@@ -193,17 +193,17 @@
FileManager fileManager = FileManager.getInternal() ;
fileManager.addLocatorFile(testingDir) ;
fileManager.setModelCaching(true) ;
- Model m1 = fileManager.loadModel(fileModel) ;
- Model m2 = fileManager.loadModel(fileModel) ;
+ Model m1 = fileManager.loadModelInternal(fileModel) ;
+ Model m2 = fileManager.loadModelInternal(fileModel) ;
assertSame(m1, m2) ;
fileManager.removeCacheModel(fileModel) ;
- Model m3 = fileManager.loadModel(fileModel) ;
+ Model m3 = fileManager.loadModelInternal(fileModel) ;
assertNotSame(m1, m3) ;
fileManager.resetCache() ;
- Model m4 = fileManager.loadModel(fileModel) ;
- Model m5 = fileManager.loadModel(fileModel) ;
+ Model m4 = fileManager.loadModelInternal(fileModel) ;
+ Model m5 = fileManager.loadModelInternal(fileModel) ;
assertSame(m4, m5) ;
assertNotSame(m1, m4) ;
diff --git a/jena-core/src/test/java/org/apache/jena/util/TestLocationMapper.java b/jena-core/src/test/java/org/apache/jena/util/TestLocationMapper.java
index 7d6603a..09e2934 100644
--- a/jena-core/src/test/java/org/apache/jena/util/TestLocationMapper.java
+++ b/jena-core/src/test/java/org/apache/jena/util/TestLocationMapper.java
@@ -76,7 +76,7 @@
public void testLocationMapperFromModel()
{
- Model model = FileManager.getInternal().loadModel(testingDir+"/location-mapping-test.n3") ;
+ Model model = FileManager.getInternal().loadModelInternal(testingDir+"/location-mapping-test.n3") ;
LocationMapper loc = new LocationMapper(model) ;
// Light test that the two location mappers are "the same"
diff --git a/jena-core/src/test/java/org/apache/jena/util/junit/Manifest.java b/jena-core/src/test/java/org/apache/jena/util/junit/Manifest.java
index 5c26306..45afcdc 100644
--- a/jena-core/src/test/java/org/apache/jena/util/junit/Manifest.java
+++ b/jena-core/src/test/java/org/apache/jena/util/junit/Manifest.java
@@ -52,7 +52,7 @@
log.debug("Manifest = "+fn ) ;
filename = org.apache.jena.n3.N3IRIResolver.resolveGlobal(fn) ;
log.debug(" = "+filename ) ;
- manifest = FileManager.getInternal().loadModel(filename) ;
+ manifest = FileManager.getInternal().loadModelInternal(filename) ;
parseIncludes() ;
parseManifest() ;
}
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/StoreDesc.java b/jena-sdb/src/main/java/org/apache/jena/sdb/StoreDesc.java
index 71c2cb8..523c08f 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/StoreDesc.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/StoreDesc.java
@@ -51,7 +51,7 @@
public static StoreDesc read(String filename)
{
- Model m = Env.fileManager().loadModel(filename) ;
+ Model m = Env.fileManager().loadModelInternal(filename) ;
return read(m) ;
}
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/assembler/QueryAssembler.java b/jena-sdb/src/main/java/org/apache/jena/sdb/assembler/QueryAssembler.java
index 71e6355..b1f8177 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/assembler/QueryAssembler.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/assembler/QueryAssembler.java
@@ -43,7 +43,9 @@
if ( queryString == null )
{
String filename = GraphUtils.getStringValue(cmd, AssemblerVocab.pQueryFile) ;
- queryString = FileManager.getInternal().readWholeFileAsUTF8(filename) ;
+ @SuppressWarnings("deprecation")
+ String s = FileManager.getInternal().readWholeFileAsUTF8(filename) ;
+ queryString = s;
}
// Base??
// Convert to another exception?
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/script/CmdDesc.java b/jena-sdb/src/main/java/org/apache/jena/sdb/script/CmdDesc.java
index 32e7209..1cd01fe 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/script/CmdDesc.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/script/CmdDesc.java
@@ -43,7 +43,7 @@
public static CmdDesc read(String filename)
{
ScriptVocab.init() ;
- Model m = FileManager.getInternal().loadModel(filename) ;
+ Model m = FileManager.getInternal().loadModelInternal(filename) ;
return worker(m) ;
}
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/script/ScriptDesc.java b/jena-sdb/src/main/java/org/apache/jena/sdb/script/ScriptDesc.java
index ee98655..83ddb40 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/script/ScriptDesc.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/script/ScriptDesc.java
@@ -38,7 +38,7 @@
public static ScriptDesc read(String filename)
{
AssemblerVocab.init() ;
- Model m = FileManager.getInternal().loadModel(filename) ;
+ Model m = FileManager.getInternal().loadModelInternal(filename) ;
return worker(m) ;
}
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/sql/SDBConnectionDesc.java b/jena-sdb/src/main/java/org/apache/jena/sdb/sql/SDBConnectionDesc.java
index d57658c..4047a7f 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/sql/SDBConnectionDesc.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/sql/SDBConnectionDesc.java
@@ -54,7 +54,7 @@
public static SDBConnectionDesc read(String filename)
{
- Model m = FileManager.getInternal().loadModel(filename) ;
+ Model m = FileManager.getInternal().loadModelInternal(filename) ;
return worker(m) ;
}
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/util/StoreUtils.java b/jena-sdb/src/main/java/org/apache/jena/sdb/util/StoreUtils.java
index 827ec0f..9bd1b0f 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/util/StoreUtils.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/util/StoreUtils.java
@@ -92,13 +92,13 @@
public static void load(Store store, String filename)
{
Model model = SDBFactory.connectDefaultModel(store) ;
- FileManager.getInternal().readModel(model, filename) ;
+ FileManager.getInternal().readModelInternal(model, filename) ;
}
public static void load(Store store, String graphIRI, String filename)
{
Model model = SDBFactory.connectNamedModel(store, graphIRI) ;
- FileManager.getInternal().readModel(model, filename) ;
+ FileManager.getInternal().readModelInternal(model, filename) ;
}
public static Iterator<Node> storeGraphNames(Store store)
diff --git a/jena-sdb/src/main/java/sdb/cmd/ModStore.java b/jena-sdb/src/main/java/sdb/cmd/ModStore.java
index d0d83da..aa0d5ad 100644
--- a/jena-sdb/src/main/java/sdb/cmd/ModStore.java
+++ b/jena-sdb/src/main/java/sdb/cmd/ModStore.java
@@ -288,7 +288,7 @@
{
for ( String s : loadFiles )
- FileManager.getInternal().readModel(model, s) ;
+ FileManager.getInternal().readModelInternal(model, s) ;
}
loadFiles = null ;
}
diff --git a/jena-sdb/src/main/java/sdb/sdbmeta.java b/jena-sdb/src/main/java/sdb/sdbmeta.java
index 071ad49..93d9421 100644
--- a/jena-sdb/src/main/java/sdb/sdbmeta.java
+++ b/jena-sdb/src/main/java/sdb/sdbmeta.java
@@ -127,7 +127,7 @@
if ( model == null )
model = ModelFactory.createDefaultModel() ;
for ( String filename : positionalArgs)
- FileManager.getInternal().readModel(model, filename) ;
+ FileManager.getInternal().readModelInternal(model, filename) ;
conf.setModel(tag, model) ;
}
diff --git a/jena-sdb/src/main/java/sdb/sdbsql.java b/jena-sdb/src/main/java/sdb/sdbsql.java
index 33f0bfd..1b2d5171 100644
--- a/jena-sdb/src/main/java/sdb/sdbsql.java
+++ b/jena-sdb/src/main/java/sdb/sdbsql.java
@@ -76,6 +76,7 @@
if ( contains(argDeclQuery) )
{
String x = super.getValue(argDeclQuery) ;
+ @SuppressWarnings("deprecation")
String sqlStmt = FileManager.getInternal().readWholeFileAsUTF8(x) ;
positionalArg.add(sqlStmt) ;
}
@@ -95,8 +96,11 @@
System.out.println() ;
}
- if ( sqlStmt.startsWith("@") )
- sqlStmt = FileManager.getInternal().readWholeFileAsUTF8(sqlStmt.substring(1)) ;
+ if ( sqlStmt.startsWith("@") ) {
+ @SuppressWarnings("deprecation")
+ String s = FileManager.getInternal().readWholeFileAsUTF8(sqlStmt.substring(1)) ;
+ sqlStmt = s;
+ }
getModTime().startTimer() ;
long queryTime = 0 ;
diff --git a/jena-sdb/src/test/java/org/apache/jena/sdb/test/junit/StoreList.java b/jena-sdb/src/test/java/org/apache/jena/sdb/test/junit/StoreList.java
index 35af35a..b0669f3 100644
--- a/jena-sdb/src/test/java/org/apache/jena/sdb/test/junit/StoreList.java
+++ b/jena-sdb/src/test/java/org/apache/jena/sdb/test/junit/StoreList.java
@@ -98,7 +98,7 @@
private static List<Pair<String, String>> storesByQuery(String fn)
{
- Model model = FileManager.getInternal().loadModel(fn) ;
+ Model model = FileManager.getInternal().loadModelInternal(fn) ;
List<Pair<String, String>> data = new ArrayList<Pair<String, String>>();
Query query = QueryFactory.create(queryString) ;
try ( QueryExecution qExec = QueryExecutionFactory.create(query, model) ) {
diff --git a/jena-sdb/src/test/java/org/apache/jena/sdb/test/misc/TestAssembler.java b/jena-sdb/src/test/java/org/apache/jena/sdb/test/misc/TestAssembler.java
index e6ce692..7cca039 100644
--- a/jena-sdb/src/test/java/org/apache/jena/sdb/test/misc/TestAssembler.java
+++ b/jena-sdb/src/test/java/org/apache/jena/sdb/test/misc/TestAssembler.java
@@ -67,7 +67,7 @@
@Test public void model_1()
{
- Model assem = FileManager.getInternal().loadModel(dir+"graph-assembler.ttl") ;
+ Model assem = FileManager.getInternal().loadModelInternal(dir+"graph-assembler.ttl") ;
Resource x = assem.getResource("http://example/test#graphDft") ;
// Model for default graph
Model model = (Model)Assembler.general.open(x) ;
@@ -76,7 +76,7 @@
@Test public void model_2()
{
- Model assem = FileManager.getInternal().loadModel(dir+"graph-assembler.ttl") ;
+ Model assem = FileManager.getInternal().loadModelInternal(dir+"graph-assembler.ttl") ;
Resource x = assem.getResource("http://example/test#graphNamed") ;
// Model for default graph
Model model = (Model)Assembler.general.open(x) ;
@@ -94,7 +94,7 @@
@Test public void model_3()
{
- Model assem = FileManager.getInternal().loadModel(dir+"graph-assembler.ttl") ;
+ Model assem = FileManager.getInternal().loadModelInternal(dir+"graph-assembler.ttl") ;
Resource xDft = assem.getResource("http://example/test#graphDft") ;
Resource xNamed = assem.getResource("http://example/test#graphNamed") ;
@@ -107,7 +107,7 @@
@Test public void model_4()
{
- Model assem = FileManager.getInternal().loadModel(dir+"graph-assembler.ttl") ;
+ Model assem = FileManager.getInternal().loadModelInternal(dir+"graph-assembler.ttl") ;
Resource xDft = assem.getResource("http://example/test#graphDft") ;
Resource xNamed = assem.getResource("http://example/test#graphNamed") ;
@@ -131,7 +131,7 @@
@Test public void model_5()
{
- Model assem = FileManager.getInternal().loadModel(dir+"graph-assembler.ttl") ;
+ Model assem = FileManager.getInternal().loadModelInternal(dir+"graph-assembler.ttl") ;
Resource xDft = assem.getResource("http://example/test#graphDft") ;
Store store = create(assem) ;
@@ -150,7 +150,7 @@
@Test public void model_6()
{
- Model assem = FileManager.getInternal().loadModel(dir+"graph-assembler.ttl") ;
+ Model assem = FileManager.getInternal().loadModelInternal(dir+"graph-assembler.ttl") ;
Resource xNamed = assem.getResource("http://example/test#graphNamed") ;
Store store = create(assem) ;
