diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/RRX.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/RRX.java index 7ceb8ef8622..2307f674a84 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/RRX.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/RRX.java @@ -68,7 +68,10 @@ public static void register() { register(RDFXML_StAX_sr, ReaderRDFXML_StAX_SR.factory); // ARP using IRIx - register(RDFXML_ARP1, ReaderRDFXML_ARP1.factory); + + @SuppressWarnings("removal") + var arpFactory = ReaderRDFXML_ARP1.factory; + register(RDFXML_ARP1, arpFactory); } private static void register(Lang lang, ReaderRIOTFactory factory) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java index 8151ee9a140..f7a2899101a 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java @@ -32,8 +32,8 @@ import org.apache.jena.graph.Triple ; import org.apache.jena.irix.IRIs; import org.apache.jena.rdf.model.RDFErrorHandler ; -import org.apache.jena.rdfxml.xmlinput1.*; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPSaxErrorHandler; +import org.apache.jena.rdfxml.arp1.*; +import org.apache.jena.rdfxml.arp1.impl.ARPSaxErrorHandler; import org.apache.jena.riot.*; import org.apache.jena.riot.system.ErrorHandler; import org.apache.jena.riot.system.FactoryRDF; @@ -48,12 +48,13 @@ *

* LEGACY *

- * Uses xmlinput1 - the version of ARP from Jena 4.7.0 to Jena 4.10.0. + * Uses ARP1 - the version of ARP from Jena 4.7.0 to Jena 4.10.0. *

* Replaced at Jena 5 by RRX. * * @see http://www.w3.org/TR/rdf-syntax-grammar/ */ +@Deprecated(forRemoval = true) public class ReaderRDFXML_ARP1 implements ReaderRIOT { public static ReaderRIOTFactory factory = (Lang language, ParserProfile parserProfile) -> { @@ -133,13 +134,13 @@ private void oneProperty(ARPOptions options, String pName, Object value) { options.setErrorMode(cond, val); } - @SuppressWarnings({"deprecation"}) private void parse(InputStream input, Reader reader, String xmlBase, ContentType ct, StreamRDF sink, Context context) { // Hacked out of ARP because of all the "private" methods // JenaReader has reset the options since new ARP() was called. sink.start() ; HandlerSink rslt = new HandlerSink(sink, parserProfile) ; + @SuppressWarnings("removal") ARP arp = new ARP(); arp.getHandlers().setStatementHandler(rslt) ; arp.getHandlers().setErrorHandler(rslt) ; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java index 9a3af3130bd..b8242d2a1e6 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java @@ -29,6 +29,7 @@ public class RDFXMLAbbrevWriter extends AdapterRDFWriter { public RDFXMLAbbrevWriter() {} + @SuppressWarnings("deprecation") @Override protected RDFWriterI create() { return new RDFXML_Abbrev(); diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java index 2a7c670439d..aecd49f5b4c 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java @@ -28,6 +28,7 @@ public class RDFXMLPlainWriter extends AdapterRDFWriter { public RDFXMLPlainWriter() {} + @SuppressWarnings("deprecation") @Override protected RDFWriterI create() { return new RDFXML_Basic(); diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_ARP1_RDFXML.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_ARP1_RDFXML.java index e14e2caefe1..2a265858db4 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_ARP1_RDFXML.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_ARP1_RDFXML.java @@ -37,6 +37,8 @@ public class Scripts_ARP1_RDFXML { @TestFactory @DisplayName("ARP1 (legacy)") public Stream testFactoryARP1() { - return withAltParserFactory(Lang.RDFXML, ReaderRDFXML_ARP1.factory, TestConsts.RDF11_TESTS_DIR+"rdf-xml/manifest.ttl"); + @SuppressWarnings("removal") + var factory = ReaderRDFXML_ARP1.factory; + return withAltParserFactory(Lang.RDFXML, factory, TestConsts.RDF11_TESTS_DIR+"rdf-xml/manifest.ttl"); } } diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java index 919cef8cee2..dafcb83c0e3 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java @@ -45,6 +45,7 @@ /** Ways to run tests on parsers. */ public class RunTestRDFXML { + @SuppressWarnings("removal") static ReaderRIOTFactory arpFactory = ReaderRDFXML_ARP1.factory; /** diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java index e475d5b9891..4f5faad0135 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java @@ -19,17 +19,22 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.apache.jena.atlas.logging.LogCtl; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFReaderF; import org.apache.jena.rdf.model.impl.RDFReaderFImpl; import org.apache.jena.riot.IO_Jena; import org.apache.jena.riot.adapters.RDFReaderRIOT; import org.apache.jena.shared.NoReaderForLangException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestIO_JenaReaders { @BeforeAll public static void beforeClass() { } @@ -59,20 +64,31 @@ public void wireIntoJena() { public void resetJena() { IO_Jena.wireIntoJena(); IO_Jena.resetJena(); - RDFReaderF readerF = new RDFReaderFImpl(); + try { + RDFReaderF readerF = new RDFReaderFImpl(); + Model model = ModelFactory.createDefaultModel(); + Logger logger = LoggerFactory.getLogger("RDFReader"); - assertNotEquals(RDFReaderRIOT.class, readerF.getReader(null).getClass()); - assertNotEquals(RDFReaderRIOT.class, readerF.getReader("RDF/XML").getClass()); - assertNotEquals(RDFReaderRIOT.class, readerF.getReader("RDF/XML-ABBREV").getClass()); - assertNotEquals(RDFReaderRIOT.class, readerF.getReader("N-TRIPLES").getClass()); - assertNotEquals(RDFReaderRIOT.class, readerF.getReader("N-Triples").getClass()); - assertNotEquals(RDFReaderRIOT.class, readerF.getReader("N-TRIPLE").getClass()); + LogCtl.withLevel(logger, "off", ()->{ + assertThrows(NoReaderForLangException.class, ()->readerF.getReader("RDF")); + assertThrows(NoReaderForLangException.class, ()->readerF.getReader("RDF/XML")); + assertThrows(NoReaderForLangException.class, ()->readerF.getReader("RDF/XML-ABBREV")); - try { readerF.getReader("NT") ; fail("Exception expected"); } catch (NoReaderForLangException e) {} - try { readerF.getReader("JSON_LD"); fail("Exception expected"); } catch (NoReaderForLangException e) {} - try { readerF.getReader("RDF/JSON"); fail("Exception expected"); } catch (NoReaderForLangException e) {} + assertThrows(NoReaderForLangException.class, ()->model.read("http://example/")); + assertThrows(NoReaderForLangException.class, ()->model.read("http://example/", "RDF/XML")); + }); - IO_Jena.wireIntoJena(); + assertNotEquals(RDFReaderRIOT.class, readerF.getReader("N-TRIPLES").getClass()); + assertNotEquals(RDFReaderRIOT.class, readerF.getReader("N-Triples").getClass()); + assertNotEquals(RDFReaderRIOT.class, readerF.getReader("N-TRIPLE").getClass()); + + // It's not called "NT" in jena-core on it's own. + assertThrows(NoReaderForLangException.class, ()->readerF.getReader("NT")); + assertThrows(NoReaderForLangException.class, ()->readerF.getReader("TURTLE")); + assertThrows(NoReaderForLangException.class, ()->readerF.getReader("JSON-LD")); + } finally { + IO_Jena.wireIntoJena(); + } } diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java index d21b8ab5b6c..de9c9f4a9bd 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java @@ -19,17 +19,22 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.apache.jena.atlas.logging.LogCtl; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFWriterF; import org.apache.jena.rdf.model.impl.RDFWriterFImpl; import org.apache.jena.riot.IO_Jena; import org.apache.jena.riot.adapters.RDFWriterRIOT; import org.apache.jena.shared.NoWriterForLangException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestIO_JenaWriters { @@ -57,30 +62,34 @@ public void testWireIntoJena() { assertEquals(RDFWriterRIOT.class, writerF.getWriter("RDFJSON").getClass()); } + @SuppressWarnings("removal") @Test public void testResetJena() { IO_Jena.wireIntoJena(); IO_Jena.resetJena(); - RDFWriterF writerF = new RDFWriterFImpl(); + try { + RDFWriterF writerF = new RDFWriterFImpl(); + Model model = ModelFactory.createDefaultModel(); + Logger logger = LoggerFactory.getLogger("RDFWriter"); - assertNotEquals(RDFWriterRIOT.class, writerF.getWriter(null).getClass()); - assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("RDF/XML").getClass()); - assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("RDF/XML-ABBREV").getClass()); - assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("N-TRIPLE").getClass()); - assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("N-Triples").getClass()); - assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("N-TRIPLE").getClass()); + LogCtl.withLevel(logger, "off", ()->{ + assertThrows(NoWriterForLangException.class, ()->writerF.getWriter("RDF/XML")); + assertThrows(NoWriterForLangException.class, ()->writerF.getWriter("RDF/XML-ABBREV")); - //N3 , Turtle in jena-core removed. -// assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("N3").getClass()); -// assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("TURTLE").getClass()); -// assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("Turtle").getClass()); -// assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("TTL").getClass()); - - try { writerF.getWriter("NT"); fail("Exception expected"); } catch (NoWriterForLangException ex) {} - try { writerF.getWriter("RDF/JSON"); fail("Exception expected"); } catch (NoWriterForLangException ex) {} - try { writerF.getWriter("RDFJSON"); fail("Exception expected"); } catch (NoWriterForLangException ex) {} - IO_Jena.wireIntoJena(); - } + assertThrows(NoWriterForLangException.class, ()->model.write(System.err)); + assertThrows(NoWriterForLangException.class, ()->model.write(System.err, "RDF/XML")); + }); + assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("N-TRIPLE").getClass()); + assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("N-Triples").getClass()); + assertNotEquals(RDFWriterRIOT.class, writerF.getWriter("N-TRIPLE").getClass()); + // It's not called "NT" in jena-core on it's own. + assertThrows(NoWriterForLangException.class, ()->writerF.getWriter("NT")); + assertThrows(NoWriterForLangException.class, ()->writerF.getWriter("TURTLE")); + assertThrows(NoWriterForLangException.class, ()->writerF.getWriter("JSON-LD")); + } finally { + IO_Jena.wireIntoJena(); + } + } } diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java b/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java index aaa026f7d59..a8036423af6 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java @@ -552,7 +552,7 @@ update interface (which means turning them into triples in one form or */ @Deprecated(forRemoval = true) public default Model write(Writer writer) { return write(writer, "RDF/XML"); } - + /** *

Write a serialized representation of a model in a specified language. * It is often better to use an OutputStream rather than a Writer, since this @@ -585,13 +585,11 @@ update interface (which means turning them into triples in one form or */ public Model write( Writer writer, String lang, String base ); - /** *

Write a serialization of this model as an XML document.s

* @deprecated Use {@code write(OutputStream, "RDF/XML")} */ @Deprecated(forRemoval = true) - public default Model write(OutputStream out) { return write(out, "RDF/XML"); } /** diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderI.java b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderI.java index 7527ea1a43b..7e45647dbf5 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderI.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFReaderI.java @@ -87,7 +87,7 @@ public interface RDFReaderI { *
N-TRIPLE
*
No properties.
*
RDF/XML
RDF/XML-ABBREV
- *
See {@link org.apache.jena.rdfxml.xmlinput1.RDFXMLReader#setProperty(String,Object)} + *
See {@link org.apache.jena.rdfxml.arp1.RDFXMLReader#setProperty(String,Object)} * * @param propName the name of the property * @param propValue the value of the property diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java index da93c2d16d9..ec186472e7e 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java @@ -19,7 +19,7 @@ package org.apache.jena.rdf.model.impl; import org.apache.jena.rdf.model.* ; -import org.apache.jena.rdfxml.xmlinput1.ParseException; +import org.apache.jena.rdfxml.arp1.ParseException; import org.apache.jena.shared.* ; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java index 6711c1b1bf0..f72985f5a8a 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java @@ -20,81 +20,82 @@ import java.util.LinkedHashMap; import java.util.Map; +import java.util.Set; -import org.apache.jena.atlas.logging.Log ; +import org.apache.jena.atlas.lib.Creator; +import org.apache.jena.atlas.logging.Log; import org.apache.jena.rdf.model.RDFReaderF; import org.apache.jena.rdf.model.RDFReaderI; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.shared.JenaException; import org.apache.jena.shared.NoReaderForLangException; public class RDFReaderFImpl extends Object implements RDFReaderF { - public static final String DEFAULTLANG = "RDF/XML" ; - private static Map> custom = new LinkedHashMap<>(); - private static RDFReaderF rewiredAlternative = null ; + public static final String DEFAULTLANG = "RDF/XML"; + private static Map> custom = new LinkedHashMap<>(); + private static RDFReaderF rewiredAlternative = null; + + // Jena6 + private static final boolean includeRDFXML = false; + /** Rewire to use an external RDFReaderF (typically, RIOT). * Set to null to use old jena-core setup. * @param other */ public static void alternative(RDFReaderF other) { - rewiredAlternative = other ; + rewiredAlternative = other; } + private static String msgNoRDFXML = "RDF/XML is no longer supported in jena-core. Add jena-arq to the classpath"; + private static Set removedLangs = Set.of("RDF", "RDF/XML", "RDF/XML-ABBREV"); + /** Creates new RDFReaderFImpl */ public RDFReaderFImpl() {} + static { setup(); } + @Override public RDFReaderI getReader(String lang) { // Jena model.read rule for defaulting. if (lang==null || lang.equals("")) - lang = DEFAULTLANG ; + lang = DEFAULTLANG; // if RIOT -> if ( rewiredAlternative != null ) - return rewiredAlternative.getReader(lang) ; - Class c = custom.get(lang); + return rewiredAlternative.getReader(lang); + + if ( ! includeRDFXML ) { + // Jena6: reading RDF/XML removed from jena-core + if ( removedLangs.contains(lang) ) + Log.error("RDFReader", msgNoRDFXML); + } + + Creator c = custom.get(lang); if ( c == null ) throw new NoReaderForLangException("Reader not found: " + lang); try { - return c.getConstructor().newInstance(); + return c.create(); } - catch (Exception e) { + catch (RuntimeException e) { throw new JenaException(e); } } - static { - // static initializer - set default readers - reset(); - } - - private static void reset() { - Class rdfxmlReader = org.apache.jena.rdfxml.xmlinput1.RDFXMLReader.class; - Class ntReader = org.apache.jena.rdf.model.impl.NTripleReader.class; + private static void setup() { // Turtle moved to test-only + // Jena6: ARP1 (RDF/XML) not installed except for tests - custom.put("RDF", rdfxmlReader); - custom.put("RDF/XML", rdfxmlReader); - custom.put("RDF/XML-ABBREV", rdfxmlReader); - - custom.put("N-TRIPLE", ntReader); + Creator ntReader = NTripleReader::new; + custom.put("N-TRIPLE", ntReader); custom.put("N-TRIPLES", ntReader); custom.put("N-Triples", ntReader); - } - - private static String currentEntry(String lang) { - Class oldClass = custom.get(lang); - if ( oldClass != null ) - return oldClass.getName(); - else - return null; - } - - private static String remove(String lang) { - if ( rewiredAlternative != null ) - Log.error(RDFReaderFImpl.class, "Rewired RDFReaderFImpl - configuration changes have no effect on reading"); - String oldClassName = currentEntry(lang); - custom.remove(lang); - return oldClassName; + if ( includeRDFXML ) { + @SuppressWarnings("removal") + Creator rdfxmlReader = RDFXMLReader::new; + custom.put("RDF", rdfxmlReader); + custom.put("RDF/XML", rdfxmlReader); + custom.put("RDF/XML-ABBREV", rdfxmlReader); + } } } diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFWriterFImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFWriterFImpl.java index 391e86529e7..2153aab850c 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFWriterFImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFWriterFImpl.java @@ -20,25 +20,31 @@ import java.util.LinkedHashMap; import java.util.Map; +import java.util.Set; -import org.apache.jena.atlas.logging.Log ; -import org.apache.jena.rdf.model.RDFWriterI; +import org.apache.jena.atlas.lib.Creator; +import org.apache.jena.atlas.logging.Log; import org.apache.jena.rdf.model.RDFWriterF; +import org.apache.jena.rdf.model.RDFWriterI; +import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Abbrev; +import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Basic; import org.apache.jena.shared.JenaException; -import org.apache.jena.shared.NoWriterForLangException ; +import org.apache.jena.shared.NoWriterForLangException; -/** - */ public class RDFWriterFImpl extends Object implements RDFWriterF { public static final String DEFAULTLANG = "RDF/XML"; - private static Map> custom = new LinkedHashMap<>(); - private static RDFWriterF rewiredAlternative = null ; + private static Map> custom = new LinkedHashMap<>(); + private static RDFWriterF rewiredAlternative = null; + + // Jena6 + private static final boolean includeRDFXML = false; + /** Rewire to use an external RDFWriterF (typically, RIOT). * Set to null to use old jena-core setup. * @param other */ public static void alternative(RDFWriterF other) { - rewiredAlternative = other ; + rewiredAlternative = other; } /** Return the the current "rewiredAlternative" which may be null, meaning {@code RDFWriterFImpl} is in use. */ @@ -46,59 +52,54 @@ public static RDFWriterF getCurrentRDFWriterF(RDFWriterF other) { return rewiredAlternative; } + private static String msgNoRDFXML = "RDF/XML is no longer supported in jena-core. Add jena-arq to the classpath"; + private static Set removedLangs = Set.of("RDF/XML", "RDF/XML-ABBREV"); + + static { setup(); } + /** Creates new RDFReaderFImpl */ public RDFWriterFImpl() {} @Override public RDFWriterI getWriter(String lang) { if (lang==null || lang.equals("")) - lang = DEFAULTLANG ; + lang = DEFAULTLANG; // If RIOT -> if ( rewiredAlternative != null ) - return rewiredAlternative.getWriter(lang) ; - if (lang==null || lang.equals("")) - lang = DEFAULTLANG ; - Class c = custom.get(lang); + return rewiredAlternative.getWriter(lang); + + if ( ! includeRDFXML ) { + // Jena6: writing RDF/XML removed from jena-core + if ( removedLangs.contains(lang) ) + Log.error("RDFWriter", msgNoRDFXML); + } + + Creator c = custom.get(lang); if ( c == null ) throw new NoWriterForLangException("Writer not found: " + lang); try { - return c.getConstructor().newInstance(); + return c.create(); } - catch (Exception e) { + catch (RuntimeException e) { throw new JenaException(e); } } - static { - reset(); - } - - private static void reset() { - Class rdfxmlWriter = org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Basic.class; - Class rdfxmlAbbrevWriter = org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Abbrev.class; - Class ntWriter = org.apache.jena.rdf.model.impl.NTripleWriter.class; - - custom.put("RDF/XML", rdfxmlWriter); - custom.put("RDF/XML-ABBREV", rdfxmlAbbrevWriter); - + private static void setup() { + Creator ntWriter = NTripleWriter::new; custom.put("N-TRIPLE", ntWriter); custom.put("N-TRIPLES", ntWriter); custom.put("N-Triples", ntWriter); - } - private static String currentEntry(String lang) { - Class oldClass = custom.get(lang); - if ( oldClass != null ) - return oldClass.getName(); - else - return null; - } + if ( includeRDFXML ) { + // Jena6: RDF/XML writing not installed except for tests. + @SuppressWarnings("deprecation") + Creator rdfxmlWriterBasic = RDFXML_Basic::new; + @SuppressWarnings("deprecation") + Creator rdfxmlWriterAbbrev = RDFXML_Abbrev::new; - private static String remove(String lang) { - if ( rewiredAlternative != null ) - Log.error(RDFWriterFImpl.class, "Rewired RDFWriterFImpl2 - configuration changes have no effect on writing"); - String oldClassName = currentEntry(lang); - custom.remove(lang); - return oldClassName; + custom.put("RDF/XML", rdfxmlWriterBasic); + custom.put("RDF/XML-ABBREV", rdfxmlWriterAbbrev); + } } } diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ALiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ALiteral.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ALiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ALiteral.java index 0cb5ed275c5..b7066148fec 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ALiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ALiteral.java @@ -22,9 +22,9 @@ * Created on June 26, 2001, 9:27 AM */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.ANode; /** * A string literal property value from an RDF/XML file. diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARP.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARP.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARP.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARP.java index 0bdaa166713..c79d4ab2b53 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARP.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARP.java @@ -21,12 +21,12 @@ * See end of file for BSD-style license. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import java.io.IOException; import java.io.InputStream; import java.io.Reader; -import org.apache.jena.rdfxml.xmlinput1.impl.RDFXMLParser; +import org.apache.jena.rdfxml.arp1.impl.RDFXMLParser; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.Locator; @@ -65,7 +65,7 @@ * Includes contributions from Simon Raboczi and Andrew Newman * @deprecated Direct access to the RDF/XML parser is planned for removal. Please contact the Jena development community for details. */ -@Deprecated +@Deprecated(forRemoval = true) public class ARP implements ARPConfig { @@ -73,9 +73,9 @@ public class ARP implements ARPConfig /** * Can parse one file at a time. - * @deprecated Direct access to the RDF/XML parser is planned for removal. Please contact the Jena development community for details. + * @deprecated Direct access to this RDF/XML parser is planned for removal. Please contact the Jena development community for details. */ - @Deprecated + @Deprecated(forRemoval = true) public ARP() { arpf = RDFXMLParser.create(); } @@ -203,7 +203,7 @@ public void setOptionsWith(ARPOptions opts){ arpf.setOptionsWith(opts); } - void setBadStatementHandler(StatementHandler sh) { + public void setBadStatementHandler(StatementHandler sh) { arpf.setBadStatementHandler(sh); } diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPConfig.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPConfig.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPConfig.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPConfig.java index f3639256494..5806ce499ec 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPConfig.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPConfig.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import org.xml.sax.ErrorHandler; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPErrorNumbers.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPErrorNumbers.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPErrorNumbers.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPErrorNumbers.java index 077d675936a..2db77ab0948 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPErrorNumbers.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPErrorNumbers.java @@ -22,7 +22,7 @@ * Created on July 10, 2001, 8:34 AM */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** * Error numbers used by ARP. diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPEventHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPEventHandler.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPEventHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPEventHandler.java index 10f8013074b..b07aa6efa03 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPEventHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPEventHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** * Convenience generalization of all ARP handler interfaces. diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPHandlers.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPHandlers.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPHandlers.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPHandlers.java index 4c649038e2d..9991bb1869c 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPHandlers.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPHandlers.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; -import org.apache.jena.rdfxml.xmlinput1.impl.DefaultErrorHandler; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.DefaultErrorHandler; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.ErrorHandler; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPOptions.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPOptions.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPOptions.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPOptions.java index 3a4d0678871..e7dcf76511d 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARPOptions.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ARPOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import org.apache.jena.irix.IRIProvider; import org.apache.jena.irix.SystemIRIx; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/AResource.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/AResource.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/AResource.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/AResource.java index 86aa4fd2812..bec703bdc48 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/AResource.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/AResource.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** * A URI or blank node reported to a {@link StatementHandler}. diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/DOM2Model.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/DOM2Model.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/DOM2Model.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/DOM2Model.java index e2a4be224bf..6d2fb4952a2 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/DOM2Model.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/DOM2Model.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import javax.xml.transform.Source; import javax.xml.transform.Transformer; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ExtendedHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ExtendedHandler.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ExtendedHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ExtendedHandler.java index 1d44ad37dc8..dbb3d1e54f1 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ExtendedHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ExtendedHandler.java @@ -21,7 +21,7 @@ * See end of file for BSD-style license. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /**Extended callbacks from a reader to an RDF application. * This reports: diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/FatalParsingErrorException.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/FatalParsingErrorException.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/FatalParsingErrorException.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/FatalParsingErrorException.java index 16d55b9f4af..4684683be8d 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/FatalParsingErrorException.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/FatalParsingErrorException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** * This exception should only be seen in user code when using diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/JenaHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/JenaHandler.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/JenaHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/JenaHandler.java index 97d7ff0a50e..19a3ec17818 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/JenaHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/JenaHandler.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import org.apache.jena.graph.Graph ; import org.apache.jena.graph.Triple ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.RDFErrorHandler ; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPSaxErrorHandler; +import org.apache.jena.rdfxml.arp1.impl.ARPSaxErrorHandler; import org.apache.jena.shared.JenaException ; import org.apache.jena.shared.PrefixMapping ; import org.apache.jena.util.XMLChar; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/NamespaceHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/NamespaceHandler.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/NamespaceHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/NamespaceHandler.java index 68ffeb5ddcb..94e31a7572e 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/NamespaceHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/NamespaceHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** * The interface for being notified about namespace use in an RDF/XML diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ParseException.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ParseException.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ParseException.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ParseException.java index dbc0852629f..25908ce9f8c 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ParseException.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/ParseException.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPLocation; +import org.apache.jena.rdfxml.arp1.impl.ARPLocation; import org.xml.sax.SAXParseException; import java.lang.reflect.Field; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/RDFXMLReader.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/RDFXMLReader.java index 882e857eb3a..853413aecd8 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/RDFXMLReader.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import java.io.*; import java.net.HttpURLConnection; @@ -33,7 +33,8 @@ import org.apache.jena.rdf.model.RDFErrorHandler ; import org.apache.jena.rdf.model.RDFReaderI ; import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler ; -import org.apache.jena.rdfxml.xmlinput1.impl.RDFXMLParser; +import org.apache.jena.rdf.model.impl.RDFReaderFImpl; +import org.apache.jena.rdfxml.arp1.impl.RDFXMLParser; import org.apache.jena.shared.DoesNotExistException ; import org.apache.jena.shared.JenaException ; import org.apache.jena.shared.UnknownPropertyException ; @@ -68,11 +69,12 @@ public class RDFXMLReader implements RDFReaderI, ARPErrorNumbers { private final boolean resolveInitialXmlBase; /** - * Creates new JenaReader + * Creates new JenaReader (used by {@link RDFReaderFImpl}) + * Modern RDF/XML support is available from RIOT in jena-arq. */ + @Deprecated(forRemoval = true) public RDFXMLReader() { - arpf = RDFXMLParser.create(); - this.resolveInitialXmlBase = true; + this(true); } /** @@ -81,12 +83,12 @@ public RDFXMLReader() { * RIOT; only directly creating an RDFXMLReader or running without RIOT * (which is in jena-arq) has had that behaviour. */ + @Deprecated(forRemoval = true) public RDFXMLReader(boolean resolveInitialXmlBase) { arpf = RDFXMLParser.create(); this.resolveInitialXmlBase = resolveInitialXmlBase; } - final private RDFXMLParser arpf; private Model model; @@ -95,10 +97,8 @@ public RDFXMLReader(boolean resolveInitialXmlBase) { * Reads from url, using url as base, adding triples to model. * Uses content negotiation to ask for application/rdf+xml, if available. * - * @param m - * A model to add triples to. - * @param url - * The URL of the RDF/XML document. + * @param m A model to add triples to. + * @param url The URL of the RDF/XML document. */ @Override public void read(Model m, String url) throws JenaException { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2Model.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2Model.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2Model.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2Model.java index 4386bec81b7..8df5a4ee402 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2Model.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2Model.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.RDFErrorHandler ; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2RDF.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2RDF.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2RDF.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2RDF.java index 27131eec111..45f4d29b638 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/SAX2RDF.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/SAX2RDF.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; -import org.apache.jena.rdfxml.xmlinput1.impl.SAX2RDFImpl; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +package org.apache.jena.rdfxml.arp1; +import org.apache.jena.rdfxml.arp1.impl.SAX2RDFImpl; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; @@ -128,7 +128,7 @@ public void startPrefixMapping (String prefix, String uri) throws SAXParseExcept /**The handlers used for processing ARP events. * Do not use with a {@link SAX2Model}. - * @see org.apache.jena.rdfxml.xmlinput1.ARPConfig#getHandlers() + * @see org.apache.jena.rdfxml.arp1.ARPConfig#getHandlers() */ @Override public ARPHandlers getHandlers() { @@ -137,7 +137,7 @@ public ARPHandlers getHandlers() { /**Copys handlers used for processing ARP events. * Do not use with a {@link SAX2Model}. - * @see org.apache.jena.rdfxml.xmlinput1.ARPConfig#setHandlersWith(ARPHandlers) + * @see org.apache.jena.rdfxml.arp1.ARPConfig#setHandlersWith(ARPHandlers) */ @Override public void setHandlersWith(ARPHandlers handlers) { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2Model.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2Model.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2Model.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2Model.java index 0c2c102b149..516ead83099 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2Model.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2Model.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLStreamException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2SAX.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2SAX.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2SAX.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2SAX.java index 20a44f9bbcb..5c6308de466 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StAX2SAX.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StAX2SAX.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; import java.util.Iterator; import javax.xml.namespace.QName; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StatementHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StatementHandler.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StatementHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StatementHandler.java index 63d4601782e..86b18e4f884 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/StatementHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/StatementHandler.java @@ -22,7 +22,7 @@ * Created on June 26, 2001, 9:30 AM */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1; /** The callback from a reader to an RDF application. * Each triple in the input file causes a call on one of the statement methods. diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ANode.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ANode.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ANode.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ANode.java index 02119cf69c9..8e9f739cbc4 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ANode.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ANode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; public interface ANode extends Taint { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPDatatypeLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPDatatypeLiteral.java similarity index 82% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPDatatypeLiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPDatatypeLiteral.java index 6a04608b084..75f9dbfe225 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPDatatypeLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPDatatypeLiteral.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.ALiteral; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.ALiteral; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.SAXParseException; public class ARPDatatypeLiteral extends TaintImpl implements ALiteral { @@ -36,7 +36,7 @@ public ARPDatatypeLiteral(Frame f, String lexf,URIReference dt) throws SAXParseE taint(); } /** - * @see org.apache.jena.rdfxml.xmlinput1.ALiteral#isWellFormedXML() + * @see org.apache.jena.rdfxml.arp1.ALiteral#isWellFormedXML() */ @Override public boolean isWellFormedXML() { @@ -49,7 +49,7 @@ public String toString() { } /** - * @see org.apache.jena.rdfxml.xmlinput1.ALiteral#getDatatypeURI() + * @see org.apache.jena.rdfxml.arp1.ALiteral#getDatatypeURI() */ @Override public String getDatatypeURI() { @@ -57,7 +57,7 @@ public String getDatatypeURI() { } /** - * @see org.apache.jena.rdfxml.xmlinput1.ALiteral#getLang() + * @see org.apache.jena.rdfxml.arp1.ALiteral#getLang() */ @Override public String getLang() { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPLocation.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPLocation.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPLocation.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPLocation.java index 4327006ee0a..60db617268e 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPLocation.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPLocation.java @@ -22,7 +22,7 @@ * Created on July 14, 2001, 11:47 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.xml.sax.Locator; public class ARPLocation implements Locator { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPResource.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPResource.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPResource.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPResource.java index 1c43b335ca9..585148082d9 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPResource.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPResource.java @@ -22,7 +22,7 @@ * Created on June 25, 2001, 9:57 PM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; public class ARPResource extends TaintImpl implements AResourceInternal { // Constants cribbed from com.megginson.sax.rdf.RDFFilter diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPSaxErrorHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPSaxErrorHandler.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPSaxErrorHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPSaxErrorHandler.java index 8e616163479..2062ef0e6fe 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPSaxErrorHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPSaxErrorHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.apache.jena.rdf.model.RDFErrorHandler ; import org.xml.sax.SAXException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPString.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPString.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPString.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPString.java index 402ca43cbb3..d0187a07a9f 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ARPString.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ARPString.java @@ -22,10 +22,10 @@ * Created on June 22, 2001, 9:44 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.ALiteral; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.ALiteral; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.SAXParseException; public class ARPString extends TaintImpl implements ALiteral { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AResourceInternal.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AResourceInternal.java similarity index 92% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AResourceInternal.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AResourceInternal.java index f8a5f92c73d..c7469a59a52 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AResourceInternal.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AResourceInternal.java @@ -22,9 +22,9 @@ * Created on June 26, 2001, 9:26 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.AResource; +import org.apache.jena.rdfxml.arp1.AResource; /** A resource from the input file. */ diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AbsXMLContext.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AbsXMLContext.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AbsXMLContext.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AbsXMLContext.java index 91ca827994c..8e43e02e6aa 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AbsXMLContext.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AbsXMLContext.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.util.regex.Pattern; import org.apache.jena.irix.IRIx; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; import org.apache.jena.shared.JenaException; import org.xml.sax.SAXParseException ; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AttributeLexer.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AttributeLexer.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AttributeLexer.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AttributeLexer.java index 50135d52401..65caecd24b0 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/AttributeLexer.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/AttributeLexer.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.util.BitSet; import org.apache.jena.irix.IRIException; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.ParseException; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/CharacterModel.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/CharacterModel.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/CharacterModel.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/CharacterModel.java index ed74ed49579..0552a07137e 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/CharacterModel.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/CharacterModel.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.text.Normalizer; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/DefaultErrorHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/DefaultErrorHandler.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/DefaultErrorHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/DefaultErrorHandler.java index 420bb1650b5..46d47fed472 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/DefaultErrorHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/DefaultErrorHandler.java @@ -22,9 +22,9 @@ * Created on July 10, 2001, 11:23 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.ParseException; +import org.apache.jena.rdfxml.arp1.ParseException; /** */ diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ElementLexer.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ElementLexer.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ElementLexer.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ElementLexer.java index 05d32c6ffb5..89d8a016fc5 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ElementLexer.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ElementLexer.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.SAXParseException; public class ElementLexer extends QNameLexer { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/LexicalHandlerImpl.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/LexicalHandlerImpl.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/LexicalHandlerImpl.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/LexicalHandlerImpl.java index 4d36eabed06..4e2da6e2f3f 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/LexicalHandlerImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/LexicalHandlerImpl.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Names.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Names.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Names.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Names.java index b55b84c1f01..1bbdfb9e30d 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Names.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Names.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; public interface Names { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ParserSupport.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ParserSupport.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ParserSupport.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ParserSupport.java index 1ece0982275..58b0a7bdab5 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/ParserSupport.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/ParserSupport.java @@ -22,13 +22,13 @@ * Created on July 15, 2001, 7:13 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.util.HashMap ; import java.util.Map ; import org.apache.jena.irix.IRIx; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; import org.apache.jena.util.XML11Char; import org.apache.jena.util.XMLChar; import org.xml.sax.SAXParseException ; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/QNameLexer.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/QNameLexer.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/QNameLexer.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/QNameLexer.java index 5a09a9644d3..3ca0cc91901 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/QNameLexer.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/QNameLexer.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.util.HashSet; import java.util.Set; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.SAXParseException; abstract public class QNameLexer implements Names, ARPErrorNumbers { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/RDFXMLParser.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/RDFXMLParser.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/RDFXMLParser.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/RDFXMLParser.java index bc7c5438281..fba643ed901 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/RDFXMLParser.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/RDFXMLParser.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.io.IOException; import java.io.InputStreamReader; @@ -24,9 +24,9 @@ import java.io.UTFDataFormatException; import org.apache.jena.irix.IRIException; -import org.apache.jena.rdfxml.xmlinput1.FatalParsingErrorException; -import org.apache.jena.rdfxml.xmlinput1.ParseException; -import org.apache.jena.rdfxml.xmlinput1.SAX2RDF; +import org.apache.jena.rdfxml.arp1.FatalParsingErrorException; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.SAX2RDF; import org.apache.jena.shared.JenaException; import org.apache.jena.util.CharEncoding ; import org.apache.jena.util.JenaXMLInput; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/SAX2RDFImpl.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/SAX2RDFImpl.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/SAX2RDFImpl.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/SAX2RDFImpl.java index 76d69fe96f9..212aaf10518 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/SAX2RDFImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/SAX2RDFImpl.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; -import org.apache.jena.rdfxml.xmlinput1.SAX2RDF; +import org.apache.jena.rdfxml.arp1.SAX2RDF; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.ErrorHandler; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Taint.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Taint.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Taint.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Taint.java index 83076f27c8c..371d46c92a3 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/Taint.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/Taint.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; public interface Taint { void taint(); diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/TaintImpl.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/TaintImpl.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/TaintImpl.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/TaintImpl.java index 05103c4eede..fec4ec68d8e 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/TaintImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/TaintImpl.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; /** * Minimal implementation of {@link Taint} */ diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/URIReference.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/URIReference.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/URIReference.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/URIReference.java index e211cd74bd0..f3d45e0c8c7 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/URIReference.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/URIReference.java @@ -22,13 +22,13 @@ * Created on June 25, 2001, 9:58 PM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.apache.jena.irix.IRIException; import org.apache.jena.irix.IRIx; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.ParseException; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.states.Frame; import org.xml.sax.SAXParseException; // TODO: not for 2.3 IRI spec conformance diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/UntaintableURIReference.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/UntaintableURIReference.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/UntaintableURIReference.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/UntaintableURIReference.java index 4ac860e5c08..68381137c04 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/UntaintableURIReference.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/UntaintableURIReference.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; class UntaintableURIReference extends URIReference { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/WrappedException.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/WrappedException.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/WrappedException.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/WrappedException.java index 5ffe478e1cc..9807c7ffcd3 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/WrappedException.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/WrappedException.java @@ -22,7 +22,7 @@ * Created on July 10, 2001, 11:44 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.io.IOException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLBaselessContext.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLBaselessContext.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLBaselessContext.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLBaselessContext.java index 6a3420a12e6..a67db2f0989 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLBaselessContext.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLBaselessContext.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.apache.jena.irix.IRIx; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; import org.xml.sax.SAXParseException; public class XMLBaselessContext extends AbsXMLContext implements ARPErrorNumbers { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLContext.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLContext.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLContext.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLContext.java index 03fd5b68c24..8b9c7198201 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLContext.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLContext.java @@ -22,10 +22,10 @@ * Created on July 10, 2001, 2:35 AM */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import org.apache.jena.irix.IRIx; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; import org.xml.sax.SAXParseException ; /** diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLHandler.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLHandler.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLHandler.java index c2abd5120b4..8b0a8967794 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/impl/XMLHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/impl/XMLHandler.java @@ -21,7 +21,7 @@ * See end of file for BSD-style license. */ -package org.apache.jena.rdfxml.xmlinput1.impl; +package org.apache.jena.rdfxml.arp1.impl; import java.util.HashMap ; import java.util.Map ; @@ -30,11 +30,11 @@ import org.apache.jena.irix.IRIProvider; import org.apache.jena.irix.IRIx; import org.apache.jena.irix.SystemIRIx; -import org.apache.jena.rdfxml.xmlinput1.*; -import org.apache.jena.rdfxml.xmlinput1.states.Frame; -import org.apache.jena.rdfxml.xmlinput1.states.FrameI; -import org.apache.jena.rdfxml.xmlinput1.states.LookingForRDF; -import org.apache.jena.rdfxml.xmlinput1.states.StartStateRDForDescription; +import org.apache.jena.rdfxml.arp1.*; +import org.apache.jena.rdfxml.arp1.states.Frame; +import org.apache.jena.rdfxml.arp1.states.FrameI; +import org.apache.jena.rdfxml.arp1.states.LookingForRDF; +import org.apache.jena.rdfxml.arp1.states.StartStateRDForDescription; import org.xml.sax.Attributes ; import org.xml.sax.Locator ; import org.xml.sax.SAXException ; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/package.html b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/package.html similarity index 100% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/package.html rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/package.html diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsWantLiteralValueOrDescription.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsWantLiteralValueOrDescription.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsWantLiteralValueOrDescription.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsWantLiteralValueOrDescription.java index 64df4e42fb0..3f0ca7b72fc 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsWantLiteralValueOrDescription.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsWantLiteralValueOrDescription.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.AttributeLexer; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.AttributeLexer; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsXMLLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsXMLLiteral.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsXMLLiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsXMLLiteral.java index 0735262a8ad..7b0e953552c 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/AbsXMLLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/AbsXMLLiteral.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; import java.util.Iterator; import java.util.Map; import java.util.TreeMap; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Collection.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Collection.java similarity index 92% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Collection.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Collection.java index 5fda834e90a..75850153992 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Collection.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Collection.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPResource; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.ARPResource; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Frame.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Frame.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Frame.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Frame.java index 1193c882930..3ad6c3d1250 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/Frame.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/Frame.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; import org.apache.jena.irix.IRIException; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.ParseException; -import org.apache.jena.rdfxml.xmlinput1.impl.*; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.impl.*; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/FrameI.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/FrameI.java similarity index 90% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/FrameI.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/FrameI.java index d6702e7ccce..05fb1861ca2 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/FrameI.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/FrameI.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/HasSubjectFrameI.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/HasSubjectFrameI.java similarity index 92% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/HasSubjectFrameI.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/HasSubjectFrameI.java index 6e5ff4e317e..dbb66ea49f3 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/HasSubjectFrameI.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/HasSubjectFrameI.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.ANode; public interface HasSubjectFrameI extends FrameI { void aPredAndObj(ANode p, ANode o); diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/InnerXMLLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/InnerXMLLiteral.java similarity index 96% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/InnerXMLLiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/InnerXMLLiteral.java index 75ea293e4e6..5f28351e063 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/InnerXMLLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/InnerXMLLiteral.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; import java.util.Map; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/LookingForRDF.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/LookingForRDF.java similarity index 87% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/LookingForRDF.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/LookingForRDF.java index 865f53a909b..ad7bffd0513 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/LookingForRDF.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/LookingForRDF.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.AttributeLexer; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.AttributeLexer; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/OuterXMLLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/OuterXMLLiteral.java similarity index 89% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/OuterXMLLiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/OuterXMLLiteral.java index 7fc2b1ee53d..5289cfebd5d 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/OuterXMLLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/OuterXMLLiteral.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPString; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.ARPString; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/RDFCollection.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/RDFCollection.java similarity index 88% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/RDFCollection.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/RDFCollection.java index 2b76b7011be..2638df67eae 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/RDFCollection.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/RDFCollection.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; public class RDFCollection extends Collection { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/StartStateRDForDescription.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/StartStateRDForDescription.java similarity index 91% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/StartStateRDForDescription.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/StartStateRDForDescription.java index 24282ac2881..f3188d85ec4 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/StartStateRDForDescription.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/StartStateRDForDescription.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantDescription.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantDescription.java similarity index 97% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantDescription.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantDescription.java index 99809a82e00..311663a57f7 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantDescription.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantDescription.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.*; +import org.apache.jena.rdfxml.arp1.impl.*; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantEmpty.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantEmpty.java similarity index 93% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantEmpty.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantEmpty.java index d152bf94fbe..86141397314 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantEmpty.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantEmpty.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantLiteralValueOrDescription.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantLiteralValueOrDescription.java similarity index 95% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantLiteralValueOrDescription.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantLiteralValueOrDescription.java index d3305290695..eae841ed667 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantLiteralValueOrDescription.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantLiteralValueOrDescription.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPString; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.ARPString; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantPropertyElement.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantPropertyElement.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantPropertyElement.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantPropertyElement.java index 9408f831a60..04ac5f69ed4 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantPropertyElement.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantPropertyElement.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; import java.util.ArrayList; -import org.apache.jena.rdfxml.xmlinput1.impl.*; +import org.apache.jena.rdfxml.arp1.impl.*; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTopLevelDescription.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTopLevelDescription.java similarity index 86% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTopLevelDescription.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTopLevelDescription.java index 1f68022efc9..271afb55139 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTopLevelDescription.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTopLevelDescription.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.AttributeLexer; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.AttributeLexer; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.xml.sax.SAXParseException; public class WantTopLevelDescription extends WantDescription { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTypedLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTypedLiteral.java similarity index 89% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTypedLiteral.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTypedLiteral.java index a122d2b336a..e380cc09acb 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantTypedLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantTypedLiteral.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPDatatypeLiteral; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.URIReference; +import org.apache.jena.rdfxml.arp1.impl.ARPDatatypeLiteral; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.URIReference; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectFrameI.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectFrameI.java similarity index 94% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectFrameI.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectFrameI.java index 49346cd5c92..c8e1ba2e0b6 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectFrameI.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectFrameI.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; public interface WantsObjectFrameI extends WantsObjectI, FrameI { } diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectI.java b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectI.java similarity index 89% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectI.java rename to jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectI.java index 6add418fbc3..5c20ec07862 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/states/WantsObjectI.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/arp1/states/WantsObjectI.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.ANode; interface WantsObjectI { void theObject(ANode a); diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Abbrev.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Abbrev.java index 138fe9edaa3..1221379b4c3 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Abbrev.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Abbrev.java @@ -28,13 +28,13 @@ import java.io.PrintWriter; -/** Writes out RDF in the abbreviated syntax, for human consumption +/** Writes out RDF in the abbreviated syntax, for human consumption not only machine readable. * It is not normal to call the constructor directly, but to use * the method RDFWriterF.getWriter("RDF/XML-ABBREV"). * Does not support the NSPREFIXPROPBASE system properties. * Use setNsPrefix. - * For best results it is necessary to set the property + * For best results it is necessary to set the property "prettyTypes". See setProperty for information. @see org.apache.jena.rdf.model.RDFWriterF#getWriter(String) */ @@ -43,7 +43,7 @@ public class RDFXML_Abbrev extends BaseXMLWriter implements RDFErrorHandler { private Resource types[] = new Resource[] { OWL.Ontology, - //OWL.DataRange, named or orphaned dataranges unusual. + //OWL.DataRange, named or orphaned dataranges unusual. RDFS.Datatype, RDFS.Class, OWL.Class, @@ -55,10 +55,10 @@ public class RDFXML_Abbrev extends BaseXMLWriter implements RDFErrorHandler { OWL.FunctionalProperty, OWL.InverseFunctionalProperty, }; - + boolean sReification; - - + + boolean sIdAttr; boolean sDamlCollection; boolean sParseTypeCollectionPropertyElt; @@ -69,6 +69,13 @@ public class RDFXML_Abbrev extends BaseXMLWriter implements RDFErrorHandler { boolean sResourcePropertyElt; + /** + * Do not create directly. + * @deprecated The RDFWriter may be replaced, + */ + @Deprecated + public RDFXML_Abbrev() {} + @Override protected void unblockAll() { sDamlCollection = false; @@ -81,12 +88,12 @@ protected void unblockAll() { sPropertyAttr = false; sListExpand = false; } - + { unblockAll(); blockRule(RDFSyntax.propertyAttr); } - + @Override protected void blockRule(Resource r) { if (r.equals(RDFSyntax.sectionReification)) sReification=true; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Basic.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Basic.java index f31cc635ca1..04d1a60c838 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Basic.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Basic.java @@ -28,10 +28,14 @@ /** Writes out an XML serialization of a model. */ -public class RDFXML_Basic extends BaseXMLWriter - { - public RDFXML_Basic() - {} +public class RDFXML_Basic extends BaseXMLWriter { + + /** + * Do not create directly. + * @deprecated The RDFWriter may be replaced, + */ + @Deprecated + public RDFXML_Basic() {} private String space; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/ARPTests.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/ARPTests.java similarity index 81% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/ARPTests.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/ARPTests.java index dc1afbefc56..587f8d11f06 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/ARPTests.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/ARPTests.java @@ -16,19 +16,12 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; /** * Constants for the test suite for ARP. */ public class ARPTests extends java.lang.Object { - /** - * Setting this field to true uses the tests found - * on the W3C web site. - * The default value false uses a cached corrected - * copy of the tests. - */ - static public boolean internet = false; static String wgTestDir = "http://www.w3.org/2000/10/rdf-tests/rdfcore/"; static String arpTestDir = "http://jcarroll.hpl.hp.com/arp-tests/"; } diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputStreamFactoryARP.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputStreamFactoryARP.java new file mode 100644 index 00000000000..4ee0abc05ab --- /dev/null +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputStreamFactoryARP.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.jena.rdfxml.arp1tests; + +import java.io.*; + +import org.apache.jena.irix.IRIx; + +/** 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 InputStreamFactoryARP { + + // Jena6 :: Now greatly simplified. + // URLs are remapped to load as files from testing/ + final String rootURL; + final private String rootDir; + + public InputStreamFactoryARP(String rootURL, String rootDir) { + this.rootURL = rootURL; + this.rootDir = rootDir.endsWith("/") ? rootDir : rootDir + "/"; + } + + public String getBase() { + return rootURL; + } + + public InputStream fullyOpen(String str) throws IOException { + return openForInput(str); + } + + private InputStream openForInput(String uri) { + // Maps URLs starting rootURL to local files as given by baseURL + + IRIx base2 = IRIx.create(rootURL); + IRIx uri2 = IRIx.create(uri); + IRIx relative = base2.relativize(uri2); + + //IRI relative = uri.isAbsolute() ? base.relativize(uri, IRIRelativize.CHILD) : uri; + + if (relative.isAbsolute()) + throw new IllegalArgumentException( + "This TestInputStreamFactory only knows about '" + rootURL + "'."); + + String relPath = relative.toString(); + if ( relPath.length() - relPath.lastIndexOf('.') > 5 ) { + relPath = relPath + ".rdf"; + relative = IRIx.create(relPath); + } + + return getInputStream(rootDir + relPath ); + } + + private static InputStream getInputStream(String prop) { + try { + return new FileInputStream("testing/" + prop); + } catch (FileNotFoundException e) { + throw new IllegalArgumentException("Resource: " + prop + " not found on class path."); + } + } +} diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/InputSupplier.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputSupplier.java similarity index 95% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/InputSupplier.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputSupplier.java index e82910599de..446c1df2062 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/InputSupplier.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputSupplier.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.IOException; import java.io.InputStream; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleARP1.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleARP1.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java index 6db0555bbd6..02728c96570 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleARP1.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java @@ -22,7 +22,7 @@ * Created on July 13, 2001, 10:06 PM */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.File; import java.io.FileInputStream; @@ -35,6 +35,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.jena.rdfxml.arp1.*; import org.xml.sax.ErrorHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; @@ -89,7 +90,8 @@ public class NTripleARP1 implements ARPErrorNumbers { private static StringBuilder line = new StringBuilder(); - private static ARP arp; + @SuppressWarnings("removal") + private static ARP arp; private static String xmlBase = null; private static boolean numbers = false; static StatementHandler andMeToo = null; @@ -101,6 +103,7 @@ public class NTripleARP1 implements ARPErrorNumbers { * @param eh Can be null. * @param ap Can be null. */ + @SuppressWarnings("removal") static public void mainEh(String args[], ErrorHandler eh, ARPEventHandler ap) { boolean doneOne = false; startMem = -1; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleTestSuite.java similarity index 95% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleTestSuite.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleTestSuite.java index 5be1dccc038..674f7e28558 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleTestSuite.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleTestSuite.java @@ -16,17 +16,20 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.*; import java.util.HashSet; import java.util.Set; +import org.junit.Assert; + import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.RDFErrorHandler; -import org.apache.jena.rdfxml.libtest.InputStreamFactoryTests; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPResource; -import org.apache.jena.rdfxml.xmlinput1.impl.ARPSaxErrorHandler; -import org.junit.Assert; +import org.apache.jena.rdfxml.arp1.ALiteral; +import org.apache.jena.rdfxml.arp1.ARPEventHandler; +import org.apache.jena.rdfxml.arp1.AResource; +import org.apache.jena.rdfxml.arp1.impl.ARPResource; +import org.apache.jena.rdfxml.arp1.impl.ARPSaxErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -36,7 +39,7 @@ * Jena N-triple writer. */ class NTripleTestSuite extends WGTestSuite { - NTripleTestSuite(InputStreamFactoryTests fact, String name, boolean b) { + NTripleTestSuite(InputStreamFactoryARP fact, String name, boolean b) { super(fact, name, b); } diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TS3_xmlinput1.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TS3_xmlinput1.java similarity index 67% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TS3_xmlinput1.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TS3_xmlinput1.java index 5a5e244c5ba..60049e0ae8d 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TS3_xmlinput1.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TS3_xmlinput1.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import junit.framework.TestSuite; @@ -30,17 +30,17 @@ static public TestSuite suite() private TS3_xmlinput1() { super("RDF/XML Input ARP1"); - addTest( org.apache.jena.rdfxml.xmlinput1.TestURIs.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestSuiteWG_RDFXML.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestSuiteWG_RDFXML_ARP.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestURIs.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestSuiteWG_RDFXML.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestSuiteWG_RDFXML_ARP.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestsARP.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.states.TestARPStates.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestsARP.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.states.TestARPStates.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestsTainting.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestsSAX2RDF.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestsStAX2Model.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestRDFXML_URI.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestsTainting.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestsSAX2RDF.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestsStAX2Model.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestRDFXML_URI.suite()); } private void addTest(String name, TestSuite tc) { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestErrorMsg.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java similarity index 96% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestErrorMsg.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java index fd704f24f2c..6ea7082818f 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestErrorMsg.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.IOException; @@ -26,6 +26,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.jena.rdfxml.arp1.ARP; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -57,13 +58,13 @@ private void check(String filename, String regex) check(filename, regex, null); } */ - @SuppressWarnings("deprecation") private void check( String filename, String regexPresent, String regexAbsent) throws IOException { final StringBuilder buf = new StringBuilder(); + @SuppressWarnings("removal") ARP arp = new ARP(); arp.getHandlers().setErrorHandler(new ErrorHandler() { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestPropEltErrorMsg.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestPropEltErrorMsg.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestPropEltErrorMsg.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestPropEltErrorMsg.java index 0dbcc9a6f41..fc947cc589d 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestPropEltErrorMsg.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestPropEltErrorMsg.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; import org.apache.jena.vocabulary.RDF; import org.xml.sax.Attributes; import org.xml.sax.ErrorHandler; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestRDFXML_URI.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java similarity index 95% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestRDFXML_URI.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java index 97387302f11..9fe273305a8 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestRDFXML_URI.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -30,6 +30,8 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFErrorHandler; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.shared.JenaException; import org.junit.Test; @@ -70,6 +72,7 @@ private static void test(String file, String base) { try { file = DIR+file; Model m1 = ModelFactory.createDefaultModel(); + @SuppressWarnings("removal") RDFXMLReader xr = new RDFXMLReader(true); xr.setErrorHandler(eh); InputStream in = new FileInputStream(file); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestScope.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestScope.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestScope.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestScope.java index 441f81f4798..7af95e8fe3a 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestScope.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestScope.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.IOException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteException.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java similarity index 95% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteException.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java index 736d75d025b..0beef06c48d 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteException.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -25,11 +25,13 @@ import org.apache.jena.rdf.model.RDFErrorHandler; import org.apache.jena.rdf.model.RDFReaderI; import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.shared.JenaException; -public class TestSuiteException - extends TestCase - implements ARPErrorNumbers { +@SuppressWarnings({"deprecated", "removal"}) +public class TestSuiteException extends TestCase implements ARPErrorNumbers { + static public Test suite() { TestSuite suite = new TestSuite("ARP Exceptions"); @@ -120,7 +122,7 @@ public void testDefaultPromotedError() { RDFDefaultErrorHandler.silent = true; try { Model m = ModelFactory.createDefaultModel(); - RDFReaderI rdr = new RDFXMLReader(); + RDFReaderI rdr = new RDFXMLReader(); rdr.setProperty("ERR_BAD_RDF_ATTRIBUTE","EM_FATAL"); rdr.read(m,"file:testing/wg/rdfms-abouteach/error002.rdf"); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML.java index 14766cefb91..a7a03e12912 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML.java @@ -16,11 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jena.rdfxml.libtest.InputStreamFactoryTests; public class TestSuiteWG_RDFXML { @@ -28,8 +27,8 @@ static public Test suite() { TestSuite testSuite = new TestSuite("WG RDF/XML"); WGTestSuite testSuiteWG = - new org.apache.jena.rdfxml.xmlinput1.WGTestSuite( - new InputStreamFactoryTests("http://www.w3.org/2000/10/rdf-tests/rdfcore/", "wg"), + new org.apache.jena.rdfxml.arp1tests.WGTestSuite( + new InputStreamFactoryARP("http://www.w3.org/2000/10/rdf-tests/rdfcore/", "wg"), "WG Parser Tests", false); TestSuite testSuiteApproved = new TestSuite("APPROVED"); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML_ARP.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML_ARP.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML_ARP.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML_ARP.java index 95403cc7091..b9b95c83aba 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML_ARP.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML_ARP.java @@ -16,10 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import junit.framework.Test; -import org.apache.jena.rdfxml.libtest.InputStreamFactoryTests; public class TestSuiteWG_RDFXML_ARP { @@ -27,8 +26,8 @@ static public Test suite() { String base = "http://jcarroll.hpl.hp.com/arp-tests/"; - WGTestSuite testSuite = new org.apache.jena.rdfxml.xmlinput1.WGTestSuite - (new InputStreamFactoryTests(base, "arp") + WGTestSuite testSuite = new org.apache.jena.rdfxml.arp1tests.WGTestSuite + (new InputStreamFactoryARP(base, "arp") ,"ARP RDF/XML Tests" ,false); Test test177 = testSuite.createPositiveTest("http://jcarroll.hpl.hp.com/arp-tests/xml-literals/reported3", diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestURIs.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestURIs.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestURIs.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestURIs.java index b0abbb5e423..f3f8d409363 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestURIs.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestURIs.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.util.ArrayList; import java.util.List; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsARP.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsARP.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java index 25eaee42bfc..3def6f5b6a6 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsARP.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.*; @@ -28,6 +28,7 @@ import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFErrorHandler; import org.apache.jena.rdf.model.RDFReaderI; +import org.apache.jena.rdfxml.arp1.*; import org.apache.jena.vocabulary.RDF; import org.junit.Assert; import org.slf4j.Logger; @@ -35,7 +36,7 @@ import org.xml.sax.SAXException; /** Additional ARP tests */ -@SuppressWarnings("deprecation") +@SuppressWarnings("removal") public class TestsARP extends TestCase implements RDFErrorHandler, ARPErrorNumbers { static private Logger logger = LoggerFactory.getLogger(TestsARP.class); @@ -338,8 +339,8 @@ public void testEmptyBaseParamOK() throws IOException { checkExpected(); } - /** Create an {@link RDFXMLReader} that does not reolve the initial XML base. */ - private static RDFXMLReader baseTestReader() { + /** Create an {@link RDFXMLReader} that does not resolve the initial XML base. */ + private static RDFXMLReader baseTestReader() { return new RDFXMLReader(false); } @@ -494,7 +495,6 @@ public void testIRIRules_2a() // checkExpected(); // } - @SuppressWarnings("removal") public void testNTripleEscaping() { String data[][] = { { "foo", "foo" }, diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsDOM2RDF.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsDOM2RDF.java similarity index 96% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsDOM2RDF.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsDOM2RDF.java index bd45d6dc2bc..867305c466a 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsDOM2RDF.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsDOM2RDF.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.IOException; import java.io.InputStream; @@ -26,6 +26,7 @@ import javax.xml.parsers.ParserConfigurationException; import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdfxml.arp1.DOM2Model; import org.apache.jena.shared.JenaException; import org.apache.jena.util.JenaXMLInput; import org.w3c.dom.Document; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsMoreDOM2RDF.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsMoreDOM2RDF.java similarity index 91% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsMoreDOM2RDF.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsMoreDOM2RDF.java index 2d31dd873ee..e7d5dca2231 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsMoreDOM2RDF.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsMoreDOM2RDF.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.IOException; @@ -27,6 +27,10 @@ import javax.xml.parsers.ParserConfigurationException; import junit.framework.TestCase; +import org.apache.jena.rdfxml.arp1.ALiteral; +import org.apache.jena.rdfxml.arp1.AResource; +import org.apache.jena.rdfxml.arp1.DOM2Model; +import org.apache.jena.rdfxml.arp1.StatementHandler; import org.apache.jena.shared.JenaException; import org.apache.jena.util.JenaXMLInput; import org.w3c.dom.Document; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDF.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDF.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java index b425f6acab2..bc1f22d83fa 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDF.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.IOException; @@ -33,6 +33,9 @@ import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFErrorHandler; import org.apache.jena.rdf.model.RDFReaderI; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; +import org.apache.jena.rdfxml.arp1.SAX2Model; +import org.apache.jena.rdfxml.arp1.SAX2RDF; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; @@ -1218,6 +1221,7 @@ public void runTest() throws Exception { Model m2 = ModelFactory.createDefaultModel(); RDFEHArray eh = new RDFEHArray(); try ( InputStream in = new FileInputStream(file) ) { + @SuppressWarnings("removal") RDFReaderI r = new RDFXMLReader(); r.setErrorHandler(eh); r.read(m, in, base); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDFMore.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java similarity index 90% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDFMore.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java index 5e1bc9ed184..791131ec9a9 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDFMore.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.InputStream; @@ -28,7 +28,10 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFReaderI; -import org.apache.jena.rdfxml.xmlinput1.TestsSAX2RDF.RDFEHArray; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; +import org.apache.jena.rdfxml.arp1.SAX2Model; +import org.apache.jena.rdfxml.arp1.SAX2RDF; +import org.apache.jena.rdfxml.arp1tests.TestsSAX2RDF.RDFEHArray; import org.xml.sax.InputSource; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; @@ -43,7 +46,8 @@ public void testLang() throws Exception { Model m2 = ModelFactory.createDefaultModel(); RDFEHArray eh = new RDFEHArray(); try ( InputStream in = new FileInputStream("testing/wg/rdfms-xmllang/test004.rdf") ) { - RDFReaderI r = new RDFXMLReader(); + @SuppressWarnings("removal") + RDFReaderI r = new RDFXMLReader(); r.setErrorHandler(eh); r.read(m, in, "http://example.org/"); } diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsStAX2Model.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsStAX2Model.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsStAX2Model.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsStAX2Model.java index 56ef38c4e00..470f528304d 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsStAX2Model.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsStAX2Model.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.InputStream; @@ -28,6 +28,7 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; +import org.apache.jena.rdfxml.arp1.StAX2Model; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsTainting.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsTainting.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsTainting.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsTainting.java index 8acb41b591a..e9758a608cf 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsTainting.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsTainting.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -31,6 +31,8 @@ import org.apache.jena.ontology.OntDocumentManager; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ParseException; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/WGTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java similarity index 95% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/WGTestSuite.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java index cf39420179c..21ef97c0c40 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/WGTestSuite.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileOutputStream; import java.io.IOException; @@ -30,7 +30,9 @@ import org.apache.jena.rdf.model.*; import org.apache.jena.rdf.model.impl.PropertyImpl; import org.apache.jena.rdf.model.impl.ResourceImpl; -import org.apache.jena.rdfxml.libtest.InputStreamFactoryTests; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.ParseException; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Abbrev; import org.apache.jena.reasoner.rulesys.RDFSRuleReasonerFactory; import org.apache.jena.reasoner.test.WGReasonerTester; @@ -81,13 +83,14 @@ static void logResult(Resource test, int type) { private static boolean logging = false; private static String BASE_RESULTS_URI = "https://jena.apache.org/data/rdf-results.rdf"; static public boolean checkMessages = false; - static private boolean doSemanticTests() { - return ARPTests.internet; - } + + static private boolean doSemanticTests() { return false ; } + static private boolean inDevelopment = false; Model loadRDF(InputSupplier in, RDFErrorHandler eh, String base) throws IOException { Model model = ModelFactory.createDefaultModel(); + @SuppressWarnings("removal") RDFXMLReader jr = new RDFXMLReader(); if (eh != null) @@ -117,7 +120,8 @@ static private class DummyTest extends TestCase { @Override public void runTest() throws IOException { if (logging) { - RDFWriterI w = new RDFXML_Abbrev(); + @SuppressWarnings("deprecation") + RDFWriterI w = new RDFXML_Abbrev(); w.setProperty("xmlbase",BASE_RESULTS_URI ); try ( OutputStream out = new FileOutputStream("/tmp/rdf-results.rdf") ) { w.write(testResults,out,BASE_RESULTS_URI); @@ -168,11 +172,9 @@ public void act(Resource r) { } }; - InputStreamFactoryTests factory; + InputStreamFactoryARP inputStreamMgr; - static private Collection misc = - Arrays.asList( - new String[] { "http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfms-uri-substructure/error001" }); + static private Collection misc = List.of("http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfms-uri-substructure/error001"); private Map behaviours = new HashMap<>(); @@ -181,8 +183,6 @@ public void act(Resource r) { .put(new ResourceImpl(testNS + "PositiveParserTest"), new Act() { @Override public void act(Resource r) { - // if (r.getProperty(status).getString().equals(approved)) - // if (r.getURI().endsWith("rdfms-xmllang/test004")) if (r.hasProperty(warning)) { addTest(r, new WarningTest(r)); } else { @@ -194,19 +194,21 @@ public void act(Resource r) { .put(new ResourceImpl(testNS + "NegativeParserTest"), new Act() { @Override public void act(Resource r) { - // if (r.getProperty(status).getString().equals(approved)) addTest(r, new NegativeTest(r)); } }); - behaviours.put(new ResourceImpl(testNS + "False-Document"), noop); + + behaviours.put(new ResourceImpl(testNS + "False-Document"), noop); behaviours.put(new ResourceImpl(testNS + "RDF-XML-Document"), noop); behaviours.put(new ResourceImpl(testNS + "NT-Document"), noop); + behaviours.put( new ResourceImpl(testNS + "PositiveEntailmentTest"), semTest); behaviours.put( new ResourceImpl(testNS + "NegativeEntailmentTest"), semTest); + behaviours .put(new ResourceImpl(testNS + "MiscellaneousTest"), new Act() { @Override @@ -219,17 +221,17 @@ public void act(Resource r) { }); } - private Model loadRDF(final InputStreamFactoryTests fact, + private Model loadRDF(final InputStreamFactoryARP fact, final String file) { Model m = null; String base = fact.getBase().toString(); if (!base.endsWith("/")) base = base + "/"; - try ( InputStream in = fact.fullyOpen(file) ) { + try ( InputStream in = openFileOrURI(fact, file) ) { if (in == null ) return null; - m = loadRDF(()->fact.fullyOpen(file) , null, base + file); + m = loadRDF(()->in , null, base + file); } catch (JenaException e) { // System.out.println(e.getMessage()); throw e; @@ -243,14 +245,18 @@ private Model loadRDF(final InputStreamFactoryTests fact, return m; } + private static InputStream openFileOrURI(InputStreamFactoryARP fact, String fileOrURI) throws IOException { + return fact.fullyOpen(fileOrURI); + } + /** Creates new WGTestSuite This is a private snapshot of the RDF Test Cases Working Draft's data. */ - WGTestSuite(InputStreamFactoryTests fact, String name, boolean dynamic) { + WGTestSuite(InputStreamFactoryARP fact, String name, boolean dynamic) { super(name); - factory = fact; + inputStreamMgr = fact; testDir = fact.getBase(); if (dynamic) try { @@ -286,10 +292,6 @@ private Model loadRDF(final InputStreamFactoryTests fact, action.act(st.getSubject()); } } - if ( ARPTests.internet) { - initResults(); - addTest(new DummyTest()); - } } catch (RuntimeException re) { re.printStackTrace(); throw re; @@ -304,7 +306,7 @@ private Model loadRDF(final InputStreamFactoryTests fact, static TestSuite suite(String testDir, String d, String nm) { return new WGTestSuite( - new InputStreamFactoryTests(testDir, d), + new InputStreamFactoryARP(testDir, d), nm, true); } @@ -407,9 +409,9 @@ Model read(Property p) throws IOException { Resource t = file.getRequiredProperty(RDF.type).getResource(); final String uri = file.getURI(); if (ntriple.equals(t)) { - return loadNT(factory.open(uri),uri); + return loadNT(openFileOrURI(inputStreamMgr, uri),uri); } else if (rdfxml.equals(t)) { - return loadRDF( ()->factory.open(uri), this, uri); + return loadRDF( ()->openFileOrURI(inputStreamMgr, uri), this, uri); } else { fail("Unrecognized file type: " + t); } @@ -679,10 +681,10 @@ class Test2 extends TestCase implements RDFErrorHandler { } Model read(String file, boolean type) throws IOException { if (!type) { - return loadNT(factory.open(file),file); + return loadNT(openFileOrURI(inputStreamMgr, file),file); } final String uri = file; - return loadRDF( ()->factory.open(uri) , this, uri); + return loadRDF(()->openFileOrURI(inputStreamMgr, uri) , this, uri); } @Override diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/AttrEvent.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/AttrEvent.java similarity index 91% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/AttrEvent.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/AttrEvent.java index 0c3717e4f63..01b4c3d3c3c 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/AttrEvent.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/AttrEvent.java @@ -16,9 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; -import org.apache.jena.rdfxml.xmlinput1.impl.Names; +import org.apache.jena.rdfxml.arp1.impl.Names; +import org.apache.jena.rdfxml.arp1.states.FrameI; import org.xml.sax.Attributes; class AttrEvent extends Event { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/ElementEvent.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/ElementEvent.java similarity index 93% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/ElementEvent.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/ElementEvent.java index 24a244fde26..70d4e5679dc 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/ElementEvent.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/ElementEvent.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; +import org.apache.jena.rdfxml.arp1.states.FrameI; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/Event.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/Event.java similarity index 92% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/Event.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/Event.java index f29a8357a41..282875ee90e 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/Event.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/Event.java @@ -16,7 +16,8 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; +import org.apache.jena.rdfxml.arp1.states.FrameI; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventList.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventList.java similarity index 96% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventList.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventList.java index 7511b68a0cd..f2454baceb7 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventList.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventList.java @@ -16,11 +16,13 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; -import org.apache.jena.rdfxml.xmlinput1.impl.TaintImpl; import org.junit.Assert; + +import org.apache.jena.rdfxml.arp1.impl.TaintImpl; +import org.apache.jena.rdfxml.arp1.states.FrameI; import org.xml.sax.Attributes; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventRecord.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventRecord.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventRecord.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventRecord.java index d9ffd3d54f7..599252a6f30 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventRecord.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventRecord.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; class EventRecord { String startEvents[]; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/FullEventRecord.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/FullEventRecord.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/FullEventRecord.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/FullEventRecord.java index 9dd8e75e4a7..aac2902a56d 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/FullEventRecord.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/FullEventRecord.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; class FullEventRecord extends EventRecord { String state; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/InternalEvent.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/InternalEvent.java similarity index 95% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/InternalEvent.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/InternalEvent.java index d65da895f74..c32f732739f 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/InternalEvent.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/InternalEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; abstract class InternalEvent extends Event { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/QName.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/QName.java similarity index 93% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/QName.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/QName.java index 286da9b3fec..fe7e09b12e4 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/QName.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/QName.java @@ -16,8 +16,8 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; -import org.apache.jena.rdfxml.xmlinput1.impl.Names; +package org.apache.jena.rdfxml.arp1tests.states; +import org.apache.jena.rdfxml.arp1.impl.Names; class QName implements Names { final String uri; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestARPStates.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestARPStates.java similarity index 97% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestARPStates.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestARPStates.java index 13430de71d1..e5ded25c249 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestARPStates.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestARPStates.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import java.io.FileReader; import java.io.IOException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestData.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestData.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestData.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestData.java index d5dcfae06f7..5c9b55f4b36 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestData.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestData.java @@ -16,15 +16,16 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import java.io.FileWriter; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.*; -import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; -import org.apache.jena.rdfxml.xmlinput1.impl.*; +import org.apache.jena.rdfxml.arp1.ARPErrorNumbers; +import org.apache.jena.rdfxml.arp1.impl.*; +import org.apache.jena.rdfxml.arp1.states.*; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestEventList.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestEventList.java similarity index 97% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestEventList.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestEventList.java index 74d3904d22c..0009a781f28 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestEventList.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestEventList.java @@ -16,11 +16,12 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.jena.rdfxml.arp1.states.FrameI; public class TestEventList extends TestCase implements Test { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestFrame.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestFrame.java similarity index 84% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestFrame.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestFrame.java index e87e70f632a..54bf05d059b 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestFrame.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestFrame.java @@ -16,14 +16,18 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; -import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; import org.junit.Assert; +import org.apache.jena.rdfxml.arp1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.AbsXMLContext; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; +import org.apache.jena.rdfxml.arp1.states.AbsXMLLiteral; +import org.apache.jena.rdfxml.arp1.states.HasSubjectFrameI; +import org.apache.jena.rdfxml.arp1.states.WantsObjectFrameI; + class TestFrame extends AbsXMLLiteral implements WantsObjectFrameI, HasSubjectFrameI { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestHandler.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestHandler.java similarity index 90% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestHandler.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestHandler.java index 345034fbf85..8b0b5f4372a 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestHandler.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestHandler.java @@ -16,16 +16,17 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import java.util.HashMap; -import org.apache.jena.rdfxml.xmlinput1.impl.ANode; -import org.apache.jena.rdfxml.xmlinput1.impl.Taint; -import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; import org.junit.Assert; +import org.apache.jena.rdfxml.arp1.impl.ANode; +import org.apache.jena.rdfxml.arp1.impl.Taint; +import org.apache.jena.rdfxml.arp1.impl.XMLHandler; + class TestHandler extends XMLHandler { public void wrong(String msg) { wrong = true; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/InputStreamFactoryTests.java b/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/InputStreamFactoryTests.java deleted file mode 100644 index 819d7b4b98f..00000000000 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/InputStreamFactoryTests.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.rdfxml.libtest; - -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.zip.ZipFile; - -import org.apache.jena.irix.IRIx; - -/** 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 InputStreamFactoryTests { - - final String base; - final private ZipFile zip; - final private String property; - private String createMe = "error"; - - public InputStreamFactoryTests(String baseDir, String propDir) { - createMe = "new TestInputStreamFactory(URI.create(\""+baseDir.toString()+"\"),\""+propDir+"\")"; - base = baseDir; - this.zip = null; - property = propDir.endsWith("/") ? propDir : propDir + "/"; - } - - public String getBase() { - return base; - } - - /** - * opens the file, and really does it - not a delayed - * lazy opening. - * @param str the URI to open - * @return null on some failures - * @throws IOException - */ - public InputStream fullyOpen(String str) throws IOException { - InputStream in = open(str); - if (in instanceof LazyInputStream - && !((LazyInputStream) in).connect()) - return null; - return in; - } - /** - * A lazy open. The I/O only starts, and resources - * are only allocated on first read. - * @param uri to be opened. - * @return the opened stream - */ - public InputStream open(String uri) { - return (InputStream) open(uri, true); - - } - - public OutputStream openOutput(String str) { - OutputStream foo = (OutputStream) open(str, false); - // System.out.println(foo.toString()); - return foo; - } - - public String getCreationJava() { - return createMe; - } - private Object open(String uri, boolean in) { - - IRIx base2 = IRIx.create(base); - IRIx uri2 = IRIx.create(uri); - IRIx relative = base2.relativize(uri2); - - //IRI relative = uri.isAbsolute() ? base.relativize(uri, IRIRelativize.CHILD) : uri; - - if (relative.isAbsolute()) - throw new IllegalArgumentException( - "This TestInputStreamFactory only knows about '" + base + "'."); - - String relPath = relative.toString(); - if ( relPath.length() - relPath.lastIndexOf('.') > 5 ) { - relPath = relPath + ".rdf"; - relative = IRIx.create(relPath); - } - - if (!in) - throw new IllegalArgumentException("Can only save to URLs"); - - - if (zip != null) - return new LazyZipEntryInputStream(zip,relPath ); - else - return InputStreamFactoryTests.getInputStream(property + relPath ); - - } - - private static InputStream getInputStream(String prop) { - // System.err.println(prop); - ClassLoader loader = InputStreamFactoryTests.class.getClassLoader(); - if (loader == null) - throw new SecurityException("Cannot access class loader"); - InputStream in = - // loader.getResourceAsStream("com/hp/hpl/jena/rdf/arp/test/data/" + prop); - loader.getResourceAsStream("testing/" + prop); - // System.out.println(prop); - if (in == null) { - try { - in = new FileInputStream("testing/" + prop); - } catch (IOException e) { - } - if (in == null) - throw new IllegalArgumentException( - "Resource: " + prop + " not found on class path."); - } - - return in; - } -} diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyFileInputStream.java b/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyFileInputStream.java deleted file mode 100644 index f1e17da58ae..00000000000 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyFileInputStream.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.rdfxml.libtest; - - -import java.io.*; - -/** - * - * In test cases we cannot open all the input files - * while creating the test suite, but must defer the - * opening until the test is actually run. - */ -class LazyFileInputStream extends LazyInputStream { - - private String name; - /** Creates new LazyZipEntryInputStream */ - LazyFileInputStream(String name) { - // System.err.println(name); - this.name = name; - } - - @Override - InputStream open() throws IOException { - return new FileInputStream(name); - } - - - -} diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyInputStream.java b/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyInputStream.java deleted file mode 100644 index f50ad9b4715..00000000000 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyInputStream.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.rdfxml.libtest; - - -import java.io.*; - -/** - *In test cases we cannot open all the input files - * while creating the test suite, but must defer the - * opening until the test is actually run. - */ -abstract class LazyInputStream extends InputStream { - - private InputStream underlying; - abstract InputStream open() throws IOException; - - boolean connect() throws IOException { - if ( underlying != null ) - return true; - else { - underlying = open(); - } - return underlying != null; - - } - - - @Override - public int read() throws IOException { - if (underlying == null) - underlying = open(); - return underlying.read(); - } - - @Override - public void close() throws IOException { - if (underlying != null) { - underlying.close(); - underlying = null; - } - } - - - -} diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyURLInputStream.java b/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyURLInputStream.java deleted file mode 100644 index 5cc1a3a7e58..00000000000 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyURLInputStream.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.rdfxml.libtest; - - -import java.io.*; -import java.net.*; - -/** - * - * In test cases we cannot open all the input files - * while creating the test suite, but must defer the - * opening until the test is actually run. - */ -class LazyURLInputStream extends LazyInputStream { - - private URL url; - /** Creates new LazyZipEntryInputStream */ - LazyURLInputStream(URL url) { - // System.err.println(name); - this.url = url; - } - - @Override - InputStream open() throws IOException { - URLConnection conn = url.openConnection(); - // System.err.println(conn.getClass().getName()); - - return conn.getInputStream(); - } - - - -} diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyZipEntryInputStream.java b/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyZipEntryInputStream.java deleted file mode 100644 index 7bcb8a60329..00000000000 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/LazyZipEntryInputStream.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.rdfxml.libtest; - - -import java.io.*; -import java.util.zip.*; - -/** - *In test cases we cannot open all the input files - * while creating the test suite, but must defer the - * opening until the test is actually run. - */ -class LazyZipEntryInputStream extends LazyInputStream { - - private ZipEntry entry; - private ZipFile zip; - /** Creates new LazyZipEntryInputStream */ - LazyZipEntryInputStream(ZipFile zip,String name) { - // System.err.println(name); - entry = new ZipEntry(name); - this.zip = zip; - } - - - @Override - InputStream open() throws IOException { - InputStream rslt = zip.getInputStream(entry); - if ( rslt == null ) - throw new IllegalArgumentException(entry.getName()+ " cannot be opened."); - return rslt; - } - - - -} diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestEntityOutput.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestEntityOutput.java index bb1a0fb16be..400330434b9 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestEntityOutput.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestEntityOutput.java @@ -122,6 +122,7 @@ public void testDifficultChars() throws IOException Model m = createMemModel(); m.read("file:testing/abbreviated/entities.rdf"); try ( StringWriter w = new StringWriter() ) { + @SuppressWarnings("deprecation") RDFWriterI wr = new RDFXML_Basic(); wr.setProperty("showDoctypeDeclaration", "true"); wr.write(m, w, "http://example.org/"); @@ -175,6 +176,7 @@ private String checkedModelToString( Model m ) private String modelToString( Model m ) { StringWriter s = new StringWriter(); + @SuppressWarnings("deprecation") RDFWriterI w = new RDFXML_Abbrev(); w.setProperty( "showDoctypeDeclaration", Boolean.TRUE ); w.write( m, s, null ); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java index 4c964df5147..56b8ff40cf6 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java @@ -27,7 +27,7 @@ import org.apache.jena.rdf.model.RDFReaderI; import org.apache.jena.rdf.model.RDFWriterI; import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; -import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.rdfxml.xmloutput.impl.BaseXMLWriter; import org.apache.jena.rdfxml.xmloutput.impl.SimpleLogger; import org.apache.jena.shared.InvalidPropertyURIException; @@ -398,6 +398,7 @@ public void checkPropURI(String s, String p, Object val, int behaviour) throws I } // read back in Model m2 = createMemModel(); + @SuppressWarnings("removal") RDFReaderI rdr = new RDFXMLReader(); rdr.setProperty("error-mode", "lax"); try (StringReader sr = new StringReader(f)) { diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/WebOntTestHarness.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/WebOntTestHarness.java deleted file mode 100644 index d3dd7d6b302..00000000000 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/WebOntTestHarness.java +++ /dev/null @@ -1,618 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.reasoner.rulesys.test; - -import org.apache.jena.ontology.OntModelSpec; -import org.apache.jena.rdf.model.Literal; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.Property; -import org.apache.jena.rdf.model.RDFNode; -import org.apache.jena.rdf.model.RDFWriterI; -import org.apache.jena.rdf.model.Resource; -import org.apache.jena.rdf.model.Statement; -import org.apache.jena.rdf.model.StmtIterator; -import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Abbrev; -import org.apache.jena.reasoner.InfGraph; -import org.apache.jena.reasoner.Reasoner; -import org.apache.jena.reasoner.ReasonerException; -import org.apache.jena.reasoner.ReasonerRegistry; -import org.apache.jena.reasoner.rulesys.FBRuleInfGraph; -import org.apache.jena.reasoner.test.WGReasonerTester; -import org.apache.jena.vocabulary.OWL; -import org.apache.jena.vocabulary.OWLResults; -import org.apache.jena.vocabulary.OWLTest; -import org.apache.jena.vocabulary.RDF; -import org.apache.jena.vocabulary.RDFS; -import org.apache.jena.vocabulary.RDFTest; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.OutputStream; -import java.io.Reader; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Test harness for running the WebOnt working group tests relevant - * to the OWL rule reasoner. See also TestOWLRules which runs the - * core WG tests as part of the routine unit tests. - */ -public class WebOntTestHarness { - -// ======================================================================= -// Variables to control the test operations - - /** Set to true to include modified test versions */ - public static boolean includeModified = false; - - /** Set to true to use approved tests only */ - public static boolean approvedOnly = true; - - /** Set to true to print LP engine profile information */ - public static boolean printProfile = false; - -// ======================================================================= -// Internal state - - /** The reasoner being tested */ - Reasoner reasoner; - - /** The total set of known tests */ - Model testDefinitions; - - /** The number of tests run */ - int testCount = 0; - - /** The time cost in ms of the last test to be run */ - long lastTestDuration = 0; - - /** Number of tests passed */ - int passCount = 0; - - /** The model describing the results of the run */ - Model testResults; - - /** The resource which acts as a description for the Jena instance being tested */ - Resource jena; - -// ======================================================================= -// Internal constants - - /** The base directory for the working group test files to use */ - public static final String BASE_TESTDIR = "testing/wg/"; - - /** The base URI in which the files are purported to reside */ - public static String BASE_URI = "http://www.w3.org/2002/03owlt/"; - - /** The base URI for the results file */ - public static String BASE_RESULTS_URI = "https://jena.apache.org/data/owl-results.rdf"; - - /** The list of subdirectories to process (omits the rdf/rdfs dirs) */ - public static final String[] TEST_DIRS= {"AllDifferent", "AllDistinct", - "AnnotationProperty", "DatatypeProperty", "FunctionalProperty", - "I3.2", "I3.4", "I4.1", "I4.5", "I4.6", "I5.1", "I5.2", "I5.21", "I5.24", - "I5.26", "I5.3", "I5.5", "I5.8", "InverseFunctionalProperty", "Nothing", - "Restriction", "SymmetricProperty", "Thing", "TransitiveProperty", - "allValuesFrom", "amp-in-url", "cardinality", "complementOf", "datatypes", - "differentFrom", "disjointWith", "distinctMembers", - "equivalentClass", "equivalentProperty", "imports", - "intersectionOf", "inverseOf", "localtests", "maxCardinality", "miscellaneous", - "oneOf", "oneOfDistinct", "sameAs", "sameClassAs", "sameIndividualAs", - "samePropertyAs", "someValuesFrom", "statement-entailment", "unionOf", - "xmlbase", - "description-logic", -// "extra-credit", - }; - - /** List of tests that are blocked because they test language features beyond Lite */ - public static final String[] BLOCKED_TESTS = { - // Explicitly testing non-lite features - "http://www.w3.org/2002/03owlt/complementOf/Manifest001#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest901#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest903#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest902#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest904#test", -// "http://www.w3.org/2002/03owlt/oneOf/Manifest002#test", -// "http://www.w3.org/2002/03owlt/oneOf/Manifest003#test", - "http://www.w3.org/2002/03owlt/oneOf/Manifest004#test", - "http://www.w3.org/2002/03owlt/unionOf/Manifest001#test", - "http://www.w3.org/2002/03owlt/unionOf/Manifest002#test", - "http://www.w3.org/2002/03owlt/unionOf/Manifest003#test", - "http://www.w3.org/2002/03owlt/unionOf/Manifest004#test", - "http://www.w3.org/2002/03owlt/equivalentClass/Manifest006#test", - "http://www.w3.org/2002/03owlt/equivalentClass/Manifest007#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest201#test", - "http://www.w3.org/2002/03owlt/I5.8/Manifest004#test", - "http://www.w3.org/2002/03owlt/I5.2/Manifest004#test", - - "http://www.w3.org/2002/03owlt/description-logic/Manifest008#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest011#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest015#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest019#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest023#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest026#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest027#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest029#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest030#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest032#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest033#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest035#test", - - "http://www.w3.org/2002/03owlt/description-logic/Manifest101#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest102#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest103#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest104#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest105#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest106#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest107#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest108#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest109#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest110#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest111#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest502#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest504#test", - - "http://www.w3.org/2002/03owlt/description-logic/Manifest202#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest203#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest204#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest205#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest206#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest207#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest208#test", - - "http://www.w3.org/2002/03owlt/description-logic/Manifest209#test", - - "http://www.w3.org/2002/03owlt/miscellaneous/Manifest010#test", - "http://www.w3.org/2002/03owlt/miscellaneous/Manifest011#test", - "http://www.w3.org/2002/03owlt/SymmetricProperty/Manifest002#test", - - "http://www.w3.org/2002/03owlt/Thing/Manifest005#test", - - // Temporary block - incomplete (OOM eventually in some cases) - "http://www.w3.org/2002/03owlt/TransitiveProperty/Manifest002#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest661#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest662#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest663#test", - - "http://www.w3.org/2002/03owlt/description-logic/Manifest608#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest611#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest615#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest623#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest626#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest627#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest630#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest668#test", - "http://www.w3.org/2002/03owlt/description-logic/Manifest668#test", - - }; - - /** The list of status values to include. If approvedOnly then only the first - * entry is allowed */ - public static final String[] STATUS_FLAGS = { "APPROVED", "PROPOSED" }; - -// ======================================================================= -// Constructor and associated support - - public WebOntTestHarness() { - testDefinitions = loadAllTestDefinitions(); - reasoner = ReasonerRegistry.getOWLReasoner(); - initResults(); - } - - /** Load all of the known manifest files into a single model */ - public static Model loadAllTestDefinitions() { - System.out.print("Loading manifests "); System.out.flush(); - Model testDefs = ModelFactory.createDefaultModel(); - int count = 0; - for ( String TEST_DIR : TEST_DIRS ) - { - File dir = new File( BASE_TESTDIR + TEST_DIR ); - String[] manifests = dir.list( new FilenameFilter() - { - @Override - public boolean accept( File df, String name ) - { - if ( name.startsWith( "Manifest" ) && name.endsWith( ".rdf" ) ) - { - return includeModified || !name.endsWith( "-mod.rdf" ); - } - else - { - return false; - } - } - } ); - for ( String manifest : manifests ) - { - File mf = new File( dir, manifest ); - try - { - testDefs.read( new FileInputStream( mf ), "file:" + mf ); - count++; - if ( count % 8 == 0 ) - { - System.out.print( "." ); - System.out.flush(); - } - } - catch ( FileNotFoundException e ) - { - System.out.println( "File not readable - " + e ); - } - } - } - System.out.println("loaded"); - return testDefs; - } - - /** - * Initialize the result model. - */ - public void initResults() { - testResults = ModelFactory.createDefaultModel(); - jena = testResults.createResource(BASE_RESULTS_URI + "#jena"); - jena.addProperty(RDFS.label, "Jena"); - testResults.setNsPrefix("results", OWLResults.NS); - } - -// ======================================================================= -// Main control methods - - public static void main(String[] args) throws IOException { - String resultFile = "owl-results.rdf"; - if (args.length >= 1) { - resultFile = args[0]; - } - WebOntTestHarness harness = new WebOntTestHarness(); - harness.runTests(); -// harness.runTest("http://www.w3.org/2002/03owlt/AnnotationProperty/Manifest004#test"); -// harness.runTest("http://www.w3.org/2002/03owlt/AnnotationProperty/Manifest003#test"); -// harness.runTest("http://www.w3.org/2002/03owlt/Thing/Manifest001#test"); -// harness.runTest("http://www.w3.org/2002/03owlt/Thing/Manifest002#test"); -// harness.runTest("http://www.w3.org/2002/03owlt/Thing/Manifest003#test"); -// harness.runTest("http://www.w3.org/2002/03owlt/Thing/Manifest004#test"); -// harness.runTest("http://www.w3.org/2002/03owlt/Thing/Manifest005#test"); - RDFWriterI writer = new RDFXML_Abbrev(); - OutputStream stream = new FileOutputStream(resultFile); - writer.setProperty("showXmlDeclaration", "true"); - harness.testResults.setNsPrefix("", "http://www.w3.org/1999/xhtml"); - writer.write(harness.testResults, stream, BASE_RESULTS_URI); - } - - /** - * Run all relevant tests. - */ - public void runTests() { - System.out.println("Testing " + (approvedOnly ? "only APPROVED" : "APPROVED and PROPOSED") ); - System.out.println("Positive entailment: "); - runTests(findTestsOfType(OWLTest.PositiveEntailmentTest)); -// System.out.println("\nNegative entailment: "); -// runTests(findTestsOfType(OWLTest.NegativeEntailmentTest)); - System.out.println("\nTrue tests: "); - runTests(findTestsOfType(OWLTest.TrueTest)); - System.out.println("\nOWL for OWL tests: "); - runTests(findTestsOfType(OWLTest.OWLforOWLTest)); - System.out.println("\nImport entailment tests: "); - runTests(findTestsOfType(OWLTest.ImportEntailmentTest)); - System.out.println("\nInconsistency tests: "); - runTests(findTestsOfType(OWLTest.InconsistencyTest)); - System.out.println("\nPassed " + passCount + " out of " + testCount); - } - - /** - * Run all tests in the given list. - */ - public void runTests(List tests) { - for ( Resource test : tests ) - { - runTest( test ); - } - } - - /** - * Run a single test of any sort, performing any appropriate logging - * and error reporting. - */ - public void runTest(String test) { - runTest(testDefinitions.getResource(test)); - } - - /** - * Run a single test of any sort, performing any appropriate logging - * and error reporting. - */ - public void runTest(Resource test) { - System.out.println("Running " + test); - boolean success = false; - boolean fail = false; - try { - success = doRunTest(test); - } catch (Exception e) { - fail = true; - System.out.print("\nException: " + e); - e.printStackTrace(); - } - testCount++; - if (success) { - System.out.print( (testCount % 40 == 0) ? ".\n" : "."); - System.out.flush(); - passCount++; - } else { - System.out.println("\nFAIL: " + test); - } - Resource resultType = null; - if (fail) { - resultType = OWLResults.FailingRun; - } else { - if (test.hasProperty(RDF.type, OWLTest.NegativeEntailmentTest) - || test.hasProperty(RDF.type, OWLTest.ConsistencyTest)) { - resultType = success ? OWLResults.PassingRun : OWLResults.FailingRun; - } else { - resultType = success ? OWLResults.PassingRun : OWLResults.IncompleteRun; - } - } - // log to the rdf result format - Resource result = testResults.createResource() - .addProperty(RDF.type, OWLResults.TestRun) - .addProperty(RDF.type, resultType) - .addProperty(OWLResults.test, test) - .addProperty(OWLResults.system, jena); - } - - /** - * Run a single test of any sort, return true if the test succeeds. - */ - public boolean doRunTest(Resource test) throws IOException { - if (test.hasProperty(RDF.type, OWLTest.PositiveEntailmentTest) - || test.hasProperty(RDF.type, OWLTest.NegativeEntailmentTest) - || test.hasProperty(RDF.type, OWLTest.OWLforOWLTest) - || test.hasProperty(RDF.type, OWLTest.ImportEntailmentTest) - || test.hasProperty(RDF.type, OWLTest.TrueTest) ) { - // Entailment tests - boolean processImports = test.hasProperty(RDF.type, OWLTest.ImportEntailmentTest); - Model premises = getDoc(test, RDFTest.premiseDocument, processImports); - Model conclusions = getDoc(test, RDFTest.conclusionDocument); - comprehensionAxioms(premises, conclusions); - long t1 = System.currentTimeMillis(); - InfGraph graph = reasoner.bind(premises.getGraph()); - if (printProfile) { - ((FBRuleInfGraph)graph).resetLPProfile(true); - } - Model result = ModelFactory.createModelForGraph(graph); - boolean correct = WGReasonerTester.testConclusions(conclusions.getGraph(), result.getGraph()); - long t2 = System.currentTimeMillis(); - lastTestDuration = t2 - t1; - if (printProfile) { - ((FBRuleInfGraph)graph).printLPProfile(); - } - if (test.hasProperty(RDF.type, OWLTest.NegativeEntailmentTest)) { - correct = !correct; - } - return correct; - } else if (test.hasProperty(RDF.type, OWLTest.InconsistencyTest)) { -// System.out.println("Starting: " + test); - Model input = getDoc(test, RDFTest.inputDocument); - long t1 = System.currentTimeMillis(); - InfGraph graph = reasoner.bind(input.getGraph()); - boolean correct = ! graph.validate().isValid(); - long t2 = System.currentTimeMillis(); - lastTestDuration = t2 - t1; - return correct; - } else if (test.hasProperty(RDF.type, OWLTest.ConsistencyTest)) { - // Not used normally becase we are not complete enough to prove consistency -// System.out.println("Starting: " + test); - Model input = getDoc(test, RDFTest.inputDocument); - long t1 = System.currentTimeMillis(); - InfGraph graph = reasoner.bind(input.getGraph()); - boolean correct = graph.validate().isValid(); - long t2 = System.currentTimeMillis(); - lastTestDuration = t2 - t1; - return correct; - } else { - for (StmtIterator i = test.listProperties(RDF.type); i.hasNext(); ) { - System.out.println("Test type = " + i.nextStatement().getObject()); - } - throw new ReasonerException("Unknown test type"); - } - } - - /** - * Load the premises or conclusions for the test, optional performing - * import processing. - */ - @SuppressWarnings("removal") - public Model getDoc(Resource test, Property docType, boolean processImports) throws IOException { - if (processImports) { - Model result = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, null); - StmtIterator si = test.listProperties(docType); - while ( si.hasNext() ) { - String fname = si.nextStatement().getObject().toString() + ".rdf"; - loadFile(fname, result); - } - return result; - } else { - return getDoc(test, docType); - } - } - - /** - * Load the premises or conclusions for the test. - */ - public Model getDoc(Resource test, Property docType) throws IOException { - Model result = ModelFactory.createDefaultModel(); - StmtIterator si = test.listProperties(docType); - while ( si.hasNext() ) { - String fname = si.nextStatement().getObject().toString() + ".rdf"; - loadFile(fname, result); - } - return result; - } - - /** - * Utility to load a file into a model a Model. - * Files are assumed to be relative to the BASE_URI. - * @param file the file name, relative to baseDir - * @return the loaded Model - */ - public static Model loadFile(String file, Model model) throws IOException { - String langType = "RDF/XML"; - if (file.endsWith(".nt")) { - langType = "N-TRIPLE"; - } else if (file.endsWith("n3")) { - langType = "N3"; - } - String fname = file; - if (fname.startsWith(BASE_URI)) { - fname = fname.substring(BASE_URI.length()); - } - Reader reader = new BufferedReader(new FileReader(BASE_TESTDIR + fname, StandardCharsets.UTF_8)); - model.read(reader, BASE_URI + fname, langType); - return model; - } - - /** - * Example the conclusions graph for introduction of restrictions which - * require a comprehension rewrite and declare new (anon) classes - * for those restrictions. - */ - public void comprehensionAxioms(Model premises, Model conclusions) { - // Comprehend all restriction declarations and note them in a map - Map comprehension = new HashMap<>(); - StmtIterator ri = conclusions.listStatements(null, RDF.type, OWL.Restriction); - while (ri.hasNext()) { - Resource restriction = ri.nextStatement().getSubject(); - StmtIterator pi = restriction.listProperties(OWL.onProperty); - while (pi.hasNext()) { - Resource prop = (Resource)pi.nextStatement().getObject(); - StmtIterator vi = restriction.listProperties(); - while (vi.hasNext()) { - Statement rs = vi.nextStatement(); - if ( ! rs.getPredicate().equals(OWL.onProperty)) { - // Have a restriction on(prop) of type rs in the conclusions - // So assert a premise that such a restriction could exisit - Resource comp = premises.createResource() - .addProperty(RDF.type, OWL.Restriction) - .addProperty(OWL.onProperty, prop) - .addProperty(rs.getPredicate(), rs.getObject()); - comprehension.put(restriction, comp); - } - } - } - } - // Comprehend any intersectionOf lists. Introduce anon class which has the form - // of the intersection expression. - // Rewrite queries of the form (X intersectionOf Y) to the form - // (X equivalentClass ?CC) (?CC intersectionOf Y) - StmtIterator ii = conclusions.listStatements(null, OWL.intersectionOf, (RDFNode)null); - List intersections = new ArrayList<>(); - while (ii.hasNext()) { - intersections.add(ii.nextStatement()); - } - for ( Statement is : intersections ) - { - // Declare in the premises that such an intersection exists - Resource comp = - premises.createResource().addProperty( RDF.type, OWL.Class ).addProperty( OWL.intersectionOf, - mapList( premises, - (Resource) is.getObject(), - comprehension ) ); - // Rewrite the conclusions to be a test for equivalence between the class being - // queried and the comprehended interesection - conclusions.remove( is ); - conclusions.add( is.getSubject(), OWL.equivalentClass, comp ); - } - // Comprehend any oneOf lists - StmtIterator io = conclusions.listStatements(null, OWL.oneOf, (RDFNode)null); - while (io.hasNext()) { - Statement s = io.nextStatement(); - Resource comp = premises.createResource() - .addProperty(OWL.oneOf, s.getObject()); - } - } - - /** - * Helper. Adds to the target model a translation of the given RDF list - * with each element replaced according to the map. - */ - private Resource mapList(Model target, Resource list, Map map) { - if (list.equals(RDF.nil)) { - return RDF.nil; - } else { - Resource head = (Resource) list.getRequiredProperty(RDF.first).getObject(); - Resource rest = (Resource) list.getRequiredProperty(RDF.rest).getObject(); - Resource mapElt = target.createResource(); - Resource mapHead = map.get(head); - if (mapHead == null) mapHead = head; - mapElt.addProperty(RDF.first, mapHead); - mapElt.addProperty(RDF.rest, mapList(target, rest, map)); - return mapElt; - } - } - -// ======================================================================= -// Internal helper functions - - /** Return a list of all tests of the given type, according to the current filters */ - public List findTestsOfType(Resource testType) { - ArrayList result = new ArrayList<>(); - StmtIterator si = testDefinitions.listStatements(null, RDF.type, testType); - while (si.hasNext()) { - Resource test = si.nextStatement().getSubject(); - boolean accept = true; - // Check test status - Literal status = (Literal) test.getProperty(RDFTest.status).getObject(); - if (approvedOnly) { - accept = status.getString().equals(STATUS_FLAGS[0]); - } else { - accept = false; - for ( String STATUS_FLAG : STATUS_FLAGS ) - { - if ( status.getString().equals( STATUS_FLAG ) ) - { - accept = true; - break; - } - } - } - // Check for blocked tests - for ( String BLOCKED_TEST : BLOCKED_TESTS ) - { - if ( BLOCKED_TEST.equals( test.toString() ) ) - { - accept = false; - } - } - // End of filter tests - if (accept) { - result.add(test); - } - } - return result; - } -} diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/WGReasonerTester.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/WGReasonerTester.java index 6bf57d6fc1d..50e15d697ad 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/test/WGReasonerTester.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/test/WGReasonerTester.java @@ -35,7 +35,6 @@ import org.apache.jena.rdf.model.*; import org.apache.jena.rdf.model.impl.PropertyImpl; import org.apache.jena.rdf.model.impl.ResourceImpl; -import org.apache.jena.rdfxml.xmlinput1.ARPTests; import org.apache.jena.reasoner.InfGraph; import org.apache.jena.reasoner.Reasoner; import org.apache.jena.reasoner.ReasonerFactory; @@ -326,8 +325,7 @@ public int runTestDetailedResponse(String uri, ReasonerFactory reasonerF, TestCa // Check the results against the official conclusions boolean correct = true; int goodResult = PASS; - boolean noisy = !(baseDir.equals(DEFAULT_BASE_DIR) - || ARPTests.internet ); + boolean noisy = ! baseDir.equals(DEFAULT_BASE_DIR); if (testType.equals(PositiveEntailmentTest)) { if (conclusions == null) { // Check that the result is flagged as semantically invalid diff --git a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll.java b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll.java index 3c9764e96ae..ea1f02e72a1 100644 --- a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll.java +++ b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll.java @@ -18,8 +18,12 @@ package org.apache.jena.test; -import junit.framework.*; +import junit.framework.JUnit4TestAdapter; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; import org.apache.jena.rdf.model.impl.RDFReaderFImpl; +import org.apache.jena.rdf.model.impl.RDFWriterFImpl; import org.apache.jena.sys.JenaSystem; /** @@ -29,8 +33,10 @@ public class JenaCoreTestAll extends TestCase { static public TestSuite suite() { JenaSystem.init(); - // Include old Turtle parser - not up-to-date but enough to read test input files + // Include parsers and writers needed for the tests. + // These are not up-to-date but enough to work with the test suite. RDFReaderFImpl.alternative(new X_RDFReaderF()); + RDFWriterFImpl.alternative(new X_RDFWriterF()); TestSuite ts = new TestSuite(); ts.setName("Jena Core"); @@ -58,7 +64,7 @@ static public TestSuite suite() { addTest(ts, "Model2", org.apache.jena.rdf.model.test.TS3_StandardModels.suite() ); // Test suite building - addTest(ts, "XML Input [ARP1]", org.apache.jena.rdfxml.xmlinput1.TS3_xmlinput1.suite()); + addTest(ts, "XML Input [ARP1]", org.apache.jena.rdfxml.arp1tests.TS3_xmlinput1.suite()); addTest(ts, "XML Output", org.apache.jena.rdfxml.xmloutput.TS3_xmloutput.suite()); addTest(ts, "Util", adaptJUnit4(org.apache.jena.util.TS3_coreutil.class)); diff --git a/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java b/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java index 87b5cd69f0e..7d40538b37d 100644 --- a/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java +++ b/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java @@ -21,15 +21,19 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.apache.jena.rdf.model.RDFReaderI; +import org.apache.jena.atlas.lib.Creator; import org.apache.jena.rdf.model.RDFReaderF; +import org.apache.jena.rdf.model.RDFReaderI; +import org.apache.jena.rdf.model.impl.NTripleReader; +import org.apache.jena.rdfxml.arp1.RDFXMLReader; import org.apache.jena.shared.JenaException; import org.apache.jena.shared.NoReaderForLangException; +import org.apache.jena.ttl_test.turtle.TurtleReader; /** * For jena-core tests only. *

- * The RDFReaderF provides the languages needed by the jena-core test suite. + * This RDFReaderF provides the languages needed by the jena-core test suite. *

    *
  • RDF/XML
    • *
  • test-only Turtle (not fully RDF 1.1 compliant)
  • @@ -37,41 +41,39 @@ *
*/ public class X_RDFReaderF extends Object implements RDFReaderF { - public static final String DEFAULTLANG = "RDF/XML"; - private static Map> custom = new LinkedHashMap<>(); + public static final String DEFAULTLANG = "RDF/XML" ; + private static Map> custom = new LinkedHashMap<>(); + private static RDFReaderF rewiredAlternative = null ; + static { reset(); } - /** Creates new RDFReaderFImpl */ public X_RDFReaderF() {} @Override public RDFReaderI getReader(String lang) { // Jena model.read rule for defaulting. if (lang==null || lang.equals("")) - lang = DEFAULTLANG; - Class c = custom.get(lang); + lang = DEFAULTLANG ; + // if RIOT -> + if ( rewiredAlternative != null ) + return rewiredAlternative.getReader(lang) ; + Creator c = custom.get(lang); if ( c == null ) throw new NoReaderForLangException("Reader not found: " + lang); try { - return c.getConstructor().newInstance(); + return c.create(); } - catch (Exception e) { + catch (RuntimeException e) { throw new JenaException(e); } } - static { - // static initializer - set default readers - reset(); - } private static void reset() { - Class rdfxmlReader = org.apache.jena.rdfxml.xmlinput1.RDFXMLReader.class; - - // test use only - Class ntReader = org.apache.jena.rdf.model.impl.NTripleReader.class; - // test use only - Class turtleReader = org.apache.jena.ttl_test.turtle.TurtleReader.class; + @SuppressWarnings("removal") + Creator rdfxmlReader = RDFXMLReader::new; + Creator ntReader = NTripleReader::new; + Creator turtleReader = TurtleReader::new; custom.put("RDF", rdfxmlReader); custom.put("RDF/XML", rdfxmlReader); @@ -86,12 +88,4 @@ private static void reset() { custom.put("Turtle", turtleReader); custom.put("TTL", turtleReader); } - - private static String currentEntry(String lang) { - Class oldClass = custom.get(lang); - if ( oldClass != null ) - return oldClass.getName(); - else - return null; - } } diff --git a/jena-core/src/test/java/org/apache/jena/test/X_RDFWriterF.java b/jena-core/src/test/java/org/apache/jena/test/X_RDFWriterF.java index bb8cf89dd25..403cfd64f11 100644 --- a/jena-core/src/test/java/org/apache/jena/test/X_RDFWriterF.java +++ b/jena-core/src/test/java/org/apache/jena/test/X_RDFWriterF.java @@ -21,16 +21,29 @@ import java.util.LinkedHashMap; import java.util.Map; +import org.apache.jena.atlas.lib.Creator; import org.apache.jena.rdf.model.RDFWriterF; import org.apache.jena.rdf.model.RDFWriterI; +import org.apache.jena.rdf.model.impl.NTripleWriter; +import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Abbrev; +import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Basic; import org.apache.jena.shared.JenaException; import org.apache.jena.shared.NoWriterForLangException; + /** + * For jena-core tests only. + *

+ * This RDFWriterF provides the languages needed by the jena-core test suite. + *

    + *
  • RDF/XML
    • + *
  • An N-triples reader
  • + *
*/ public class X_RDFWriterF extends Object implements RDFWriterF { public static final String DEFAULTLANG = "RDF/XML"; - private static Map> custom = new LinkedHashMap<>(); + private static Map> custom = new LinkedHashMap<>(); + static { reset(); } /** Creates new RDFReaderFImpl */ public X_RDFWriterF() {} @@ -39,25 +52,23 @@ public X_RDFWriterF() {} public RDFWriterI getWriter(String lang) { if (lang==null || lang.equals("")) lang = DEFAULTLANG; - Class c = custom.get(lang); + Creator c = custom.get(lang); if ( c == null ) throw new NoWriterForLangException("Writer not found: " + lang); try { - return c.getConstructor().newInstance(); + return c.create(); } - catch (Exception e) { + catch (RuntimeException e) { throw new JenaException(e); } } - static { - reset(); - } - private static void reset() { - Class rdfxmlWriter = org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Basic.class; - Class rdfxmlAbbrevWriter = org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Abbrev.class; - Class ntWriter = org.apache.jena.rdf.model.impl.NTripleWriter.class; + @SuppressWarnings("deprecation") + Creator rdfxmlWriter = RDFXML_Basic::new; + @SuppressWarnings("deprecation") + Creator rdfxmlAbbrevWriter = RDFXML_Abbrev::new; + Creator ntWriter = NTripleWriter::new; custom.put("RDF/XML", rdfxmlWriter); custom.put("RDF/XML-ABBREV", rdfxmlAbbrevWriter); @@ -66,12 +77,4 @@ private static void reset() { custom.put("N-TRIPLES", ntWriter); custom.put("N-Triples", ntWriter); } - - private static String currentEntry(String lang) { - Class oldClass = custom.get(lang); - if ( oldClass != null ) - return oldClass.getName(); - else - return null; - } }