You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/01/15 11:48:10 UTC
[05/10] jena git commit: Add documentation about legecay uses. Clean
classes.
Add documentation about legecay uses. Clean classes.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c055fa62
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c055fa62
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c055fa62
Branch: refs/heads/master
Commit: c055fa62b54ff800a820b87712a1c5403ff366e5
Parents: 35a5cc9
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jan 13 17:19:18 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jan 13 17:19:18 2018 +0000
----------------------------------------------------------------------
.../org/apache/jena/rdfxml/xmlinput/ARPOptions.java | 6 ++++++
.../jena/rdfxml/xmloutput/impl/BaseXMLWriter.java | 2 ++
.../jena/rdfxml/xmlinput/NTripleTestSuite.java | 8 ++++----
.../org/apache/jena/rdfxml/xmlinput/TestARPMain.java | 8 ++++----
.../org/apache/jena/rdfxml/xmlinput/URITests.java | 2 ++
.../org/apache/jena/rdfxml/xmlinput/WGTestSuite.java | 12 ++++++------
.../jena/shared/wg/InputStreamFactoryTests.java | 15 ++++++++-------
7 files changed, 32 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c055fa62/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/ARPOptions.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/ARPOptions.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/ARPOptions.java
index c66fae7..6df6fee 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/ARPOptions.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/ARPOptions.java
@@ -67,6 +67,12 @@ public class ARPOptions implements ARPErrorNumbers {
private boolean embedding = false;
private int errorMode[] = defaultErrorMode.clone();
+ // Note: This is the legacy setup for jena-core only.
+ // When used normally, with RIOT, the IRIFcatory is
+ // org.apache.jena.riot.system.IRIResolver.iriFactory
+ // which is RDF 1.1 and also the IRIfcatory used by all
+ // RIOT parsing.
+
@SuppressWarnings("deprecation")
private static IRIFactory defaultIriFactory = IRIFactory.jenaImplementation() ;
private IRIFactory iriFactory = defaultIriFactory ;
http://git-wip-us.apache.org/repos/asf/jena/blob/c055fa62/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java
index 26591f7..0bd4367 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java
@@ -490,6 +490,8 @@ abstract public class BaseXMLWriter implements RDFXMLWriterI {
}
@SuppressWarnings("deprecation")
+ // Testing.
+ // Agrees with ARPOptions.defaultIriFactory.
static IRIFactory factory = IRIFactory.jenaImplementation();
http://git-wip-us.apache.org/repos/asf/jena/blob/c055fa62/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java
index f5ae838..b40883c 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java
@@ -31,7 +31,7 @@ import org.apache.jena.rdfxml.xmlinput.AResource ;
import org.apache.jena.rdfxml.xmlinput.NTriple ;
import org.apache.jena.rdfxml.xmlinput.impl.ARPResource ;
import org.apache.jena.rdfxml.xmlinput.impl.ARPSaxErrorHandler ;
-import org.apache.jena.shared.wg.TestInputStreamFactory ;
+import org.apache.jena.shared.wg.InputStreamFactoryTests ;
import org.junit.Assert ;
import org.xml.sax.SAXException ;
import org.xml.sax.SAXParseException ;
@@ -42,20 +42,20 @@ import org.xml.sax.SAXParseException ;
* Jena N-triple writer.
*/
class NTripleTestSuite extends WGTestSuite {
- NTripleTestSuite(TestInputStreamFactory fact, String name, boolean b) {
+ NTripleTestSuite(InputStreamFactoryTests fact, String name, boolean b) {
super(fact, name, b);
}
static TestSuite suite(IRI testDir, String d, String nm) {
return new NTripleTestSuite(
- new TestInputStreamFactory(testDir, d),
+ new InputStreamFactoryTests(testDir, d),
nm,
true);
}
static TestSuite suite(IRI testDir, IRI d, String nm) {
return new NTripleTestSuite(
- new TestInputStreamFactory(testDir, d),
+ new InputStreamFactoryTests(testDir, d),
nm,
true);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/c055fa62/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/TestARPMain.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/TestARPMain.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/TestARPMain.java
index e44105e..a8997e3 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/TestARPMain.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/TestARPMain.java
@@ -21,7 +21,7 @@ package org.apache.jena.rdfxml.xmlinput ;
import junit.framework.Test ;
import junit.framework.TestSuite ;
import org.apache.jena.iri.IRIFactory ;
-import org.apache.jena.shared.wg.TestInputStreamFactory ;
+import org.apache.jena.shared.wg.InputStreamFactoryTests ;
public class TestARPMain
{
@@ -30,7 +30,7 @@ public class TestARPMain
TestSuite test0 = new TestSuite("ARP") ;
WGTestSuite test1 =
new org.apache.jena.rdfxml.xmlinput.WGTestSuite(
- new TestInputStreamFactory(
+ new InputStreamFactoryTests(
IRIFactory
.iriImplementation()
.create(
@@ -1296,7 +1296,7 @@ public class TestARPMain
// test1.addTest(test173);
test0.addTest(test1) ;
WGTestSuite test175 = new org.apache.jena.rdfxml.xmlinput.WGTestSuite(
- new TestInputStreamFactory(IRIFactory.iriImplementation().create("http://jcarroll.hpl.hp.com/arp-tests/"),
+ new InputStreamFactoryTests(IRIFactory.iriImplementation().create("http://jcarroll.hpl.hp.com/arp-tests/"),
"arp"),
"ARP Tests", false) ;
TestSuite test176 = new TestSuite("ARP") ;
@@ -1483,7 +1483,7 @@ public class TestARPMain
test175.addTest(test176) ;
test0.addTest(test175) ;
WGTestSuite test211 = new org.apache.jena.rdfxml.xmlinput.NTripleTestSuite(
- new TestInputStreamFactory(
+ new InputStreamFactoryTests(
IRIFactory
.iriImplementation()
.create(
http://git-wip-us.apache.org/repos/asf/jena/blob/c055fa62/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/URITests.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/URITests.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/URITests.java
index 618e31c..44e851c 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/URITests.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/URITests.java
@@ -52,6 +52,8 @@ public class URITests
}
@SuppressWarnings("deprecation")
+ // Testing.
+ // Agrees with ARPOptions.defaultIriFactory.
static IRIFactory factory = IRIFactory.jenaImplementation();
// static {
// factory.useSpecificationRDF(false);
http://git-wip-us.apache.org/repos/asf/jena/blob/c055fa62/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java
index 7984a32..20aa675 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java
@@ -46,7 +46,7 @@ import org.apache.jena.reasoner.test.WGReasonerTester ;
import org.apache.jena.shared.BrokenException ;
import org.apache.jena.shared.JenaException ;
import org.apache.jena.shared.impl.JenaParameters ;
-import org.apache.jena.shared.wg.TestInputStreamFactory ;
+import org.apache.jena.shared.wg.InputStreamFactoryTests ;
import org.apache.jena.vocabulary.OWLResults ;
import org.apache.jena.vocabulary.RDF ;
import org.apache.jena.vocabulary.RDFS ;
@@ -185,7 +185,7 @@ class WGTestSuite extends TestSuite implements ARPErrorNumbers {
}
};
- TestInputStreamFactory factory;
+ InputStreamFactoryTests factory;
static private Collection<String> misc =
Arrays.asList(
@@ -236,7 +236,7 @@ class WGTestSuite extends TestSuite implements ARPErrorNumbers {
});
}
- private Model loadRDF(final TestInputStreamFactory fact,
+ private Model loadRDF(final InputStreamFactoryTests fact,
final String file) {
Model m = null;
String base = fact.getBase().toString();
@@ -270,7 +270,7 @@ class WGTestSuite extends TestSuite implements ARPErrorNumbers {
*/
String createMe;
- WGTestSuite(TestInputStreamFactory fact, String name, boolean dynamic) {
+ WGTestSuite(InputStreamFactoryTests fact, String name, boolean dynamic) {
super(name);
factory = fact;
testDir = fact.getBase();
@@ -334,14 +334,14 @@ class WGTestSuite extends TestSuite implements ARPErrorNumbers {
static TestSuite suite(IRI testDir, String d, String nm) {
return new WGTestSuite(
- new TestInputStreamFactory(testDir, d),
+ new InputStreamFactoryTests(testDir, d),
nm,
true);
}
static TestSuite suite(IRI testDir, IRI d, String nm) {
return new WGTestSuite(
- new TestInputStreamFactory(testDir, d),
+ new InputStreamFactoryTests(testDir, d),
nm,
true);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/c055fa62/jena-core/src/test/java/org/apache/jena/shared/wg/InputStreamFactoryTests.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/shared/wg/InputStreamFactoryTests.java b/jena-core/src/test/java/org/apache/jena/shared/wg/InputStreamFactoryTests.java
index 0375eec..1d7a59d 100644
--- a/jena-core/src/test/java/org/apache/jena/shared/wg/InputStreamFactoryTests.java
+++ b/jena-core/src/test/java/org/apache/jena/shared/wg/InputStreamFactoryTests.java
@@ -30,12 +30,13 @@ import java.util.zip.ZipFile;
import org.apache.jena.iri.*;
import org.apache.jena.shared.JenaException ;
-/**
+/** In support of the RDF 2004 Working Group tests.
+ *
* This class provides input streams that:
* 1: can be from a URL or from a zip
* 2: do not actually open until the first read
*/
-public class TestInputStreamFactory {
+public class InputStreamFactoryTests {
@SuppressWarnings("deprecation")
final IRIFactory iriFactory = IRIFactory.jenaImplementation();
@@ -48,7 +49,7 @@ public class TestInputStreamFactory {
/** @param baseDir A prefix of all URLs accessed through this factory.
* @param getBaseDir Replace the baseDir into getBaseDir before opening any URL.
*/
- public TestInputStreamFactory(IRI baseDir, IRI getBaseDir) {
+ public InputStreamFactoryTests(IRI baseDir, IRI getBaseDir) {
base = baseDir;
mapBase = getBaseDir;
zip = null;
@@ -57,14 +58,14 @@ public class TestInputStreamFactory {
/** @param baseDir A prefix of all URLs accessed through this factory.
* @param zip To open a URL remove the baseDir from the URL and get the named file from the zip.
*/
- public TestInputStreamFactory(IRI baseDir, ZipFile zip) {
+ public InputStreamFactoryTests(IRI baseDir, ZipFile zip) {
base = baseDir;
mapBase = null;
this.zip = zip;
property = null;
}
- public TestInputStreamFactory(IRI baseDir, String propDir) {
+ public InputStreamFactoryTests(IRI baseDir, String propDir) {
createMe = "new TestInputStreamFactory(URI.create(\""+baseDir.toString()
+"\"),\""+propDir+"\")";
base = baseDir;
@@ -160,13 +161,13 @@ public class TestInputStreamFactory {
if (zip != null)
return new LazyZipEntryInputStream(zip,relPath );
else
- return TestInputStreamFactory.getInputStream(property + relPath );
+ return InputStreamFactoryTests.getInputStream(property + relPath );
}
private static InputStream getInputStream(String prop) {
// System.err.println(prop);
- ClassLoader loader = TestInputStreamFactory.class.getClassLoader();
+ ClassLoader loader = InputStreamFactoryTests.class.getClassLoader();
if (loader == null)
throw new SecurityException("Cannot access class loader");
InputStream in =