This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit f44cc5eab443c0988985c387bd19b50b2a950482 Author: Andy Seaborne <[email protected]> AuthorDate: Fri May 16 10:12:12 2025 +0100 GH-3199: Remove ARP0 from RIOT --- .../src/main/java/org/apache/jena/riot/RIOT.java | 11 - .../java/org/apache/jena/riot/lang/rdfxml/RRX.java | 14 +- .../jena/riot/lang/rdfxml/ReaderRDFXML_ARP0.java | 310 --------------------- .../jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java | 13 +- .../apache/jena/riot/lang/rdfxml/package-info.java | 17 +- .../jena/riot/lang/rdfxml/rrx/ParserRRX_SAX.java | 4 - .../lang/rdfxml/rrx_stax_ev/ParserRRX_StAX_EV.java | 2 - .../lang/rdfxml/rrx_stax_sr/ParserRRX_StAX_SR.java | 2 - .../riot/lang/TestRDFXML_ReaderProperties.java | 7 +- .../jena/riot/lang/rdfxml/TC_RIOT_RDFXML.java | 3 - .../rdfxml/manifest_rdf11/Scripts_RRX_RDFXML.java | 2 - .../manifest_rdf11/TestManifest_RDF11_ARP0.java | 54 ---- .../apache/jena/riot/lang/rdfxml/rrx/TestRRX.java | 2 - .../riot/lang/rdfxml/rrx/Test_RRX_Local_SAX.java | 2 - .../lang/rdfxml/rrx/Test_RRX_Local_StAXev.java | 2 - .../lang/rdfxml/rrx/Test_RRX_Local_StAXsr.java | 2 - .../riot/lang/rdfxml/rrx/Test_RRX_W3C_SAX.java | 2 - .../riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXev.java | 2 - .../riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXsr.java | 2 - 19 files changed, 5 insertions(+), 448 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java b/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java index f69d6aa453..df82426b2e 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java @@ -19,7 +19,6 @@ package org.apache.jena.riot ; import org.apache.jena.atlas.lib.Version; -import org.apache.jena.riot.lang.rdfxml.RRX; import org.apache.jena.riot.resultset.ResultSetLang; import org.apache.jena.riot.system.StreamRDF; import org.apache.jena.riot.writer.DirectiveStyle; @@ -115,16 +114,6 @@ public class RIOT { private static String TURTLE_SYMBOL_BASE = "http://jena.apache.org/riot/turtle#";; private static String RDFXML_SYMBOL_BASE = "http://jena.apache.org/riot/rdfxml#";; - /** - * Legacy access to the original legacy RDF/XML parser. - * The original ARP parser will be removed. - * Use {@link Lang} constant {@link RRX#RDFXML_ARP1} or {@link RRX#RDFXML_ARP0} - * to access ARP v1 (RIOT integration) or ARP v0 (the original ARP parser). - * @deprecated Do not use this symbol! This will be removed. - */ - @Deprecated(forRemoval = true) - public static Symbol symRDFXML0 = SystemARQ.allocSymbol(RDFXML_SYMBOL_BASE, "rdfxml0"); - /** * Printing style - {@code PREFIX} or {@code @prefix} * - {@link DirectiveStyle}, one of {@code AT} or {@code KEYWORD}. 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 9a3295246d..7ceb8ef862 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 @@ -58,16 +58,6 @@ public class RRX { .addFileExtensions("arp1", "arp") .build(); - /** - * <a href="http://www.w3.org/TR/rdf-syntax-grammar/";>RDF/XML</a> implemented by ARP0. - * @deprecated To be removed. Transition only. - */ - @Deprecated(forRemoval = true) - public static final Lang RDFXML_ARP0 = LangBuilder.create("RDFXML-ARP0", "application/rdf+arp0") - .addAltNames("arp0") - .addFileExtensions("arp0") - .build(); - /** * Register direct Lang constants for RDF/XML parsers. */ @@ -77,9 +67,8 @@ public class RRX { register(RDFXML_StAX_ev, ReaderRDFXML_StAX_EV.factory); register(RDFXML_StAX_sr, ReaderRDFXML_StAX_SR.factory); - // Names for ARP + // ARP using IRIx register(RDFXML_ARP1, ReaderRDFXML_ARP1.factory); - register(RDFXML_ARP0, ReaderRDFXML_ARP0.factory); } private static void register(Lang lang, ReaderRIOTFactory factory) { @@ -95,7 +84,6 @@ public class RRX { unregister(RDFXML_StAX_ev); unregister(RDFXML_StAX_sr); unregister(RDFXML_ARP1); - unregister(RDFXML_ARP0); } private static void unregister(Lang lang) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP0.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP0.java deleted file mode 100644 index b93139f252..0000000000 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP0.java +++ /dev/null @@ -1,310 +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.riot.lang.rdfxml; - -import java.io.IOException ; -import java.io.InputStream ; -import java.io.Reader ; -import java.util.Map; - -import org.apache.jena.atlas.lib.Pair ; -import org.apache.jena.atlas.logging.Log; -import org.apache.jena.atlas.web.ContentType; -import org.apache.jena.datatypes.RDFDatatype ; -import org.apache.jena.datatypes.TypeMapper ; -import org.apache.jena.datatypes.xsd.impl.XMLLiteralType; -import org.apache.jena.graph.Node ; -import org.apache.jena.graph.NodeFactory ; -import org.apache.jena.graph.Triple ; -import org.apache.jena.irix.IRIs; -import org.apache.jena.rdf.model.RDFErrorHandler ; -import org.apache.jena.rdfxml.xmlinput0.* ; -import org.apache.jena.rdfxml.xmlinput0.impl.ARPSaxErrorHandler ; -import org.apache.jena.riot.*; -import org.apache.jena.riot.system.Checker; -import org.apache.jena.riot.system.ErrorHandler; -import org.apache.jena.riot.system.ParserProfile; -import org.apache.jena.riot.system.StreamRDF; -import org.apache.jena.sparql.util.Context; -import org.xml.sax.SAXException ; -import org.xml.sax.SAXParseException ; - -/** RDF/XML. - * <p> - * <b>LEGACY</b> - * <p> - * Uses ARP0 in org.apache.jena.rdfxml.xmlinput0 - the version of ARP used up to jena 4.6.2 - * before the conversion to IRIx. - * - * @see <a href="http://www.w3.org/TR/rdf-syntax-grammar/";>http://www.w3.org/TR/rdf-syntax-grammar/</a> - */ -@SuppressWarnings("deprecation") -public class ReaderRDFXML_ARP0 implements ReaderRIOT -{ - public static ReaderRIOTFactory factory = (Lang language, ParserProfile parserProfile) -> - // Ignore the provided ParserProfile - // ARP predates RIOT and does many things internally already. - // This includes IRI resolution. - new ReaderRDFXML_ARP0(parserProfile.getErrorHandler()) - ; - - private ErrorHandler errorHandler; - - private Context context; - - public ReaderRDFXML_ARP0(ErrorHandler errorHandler) { - this.errorHandler = errorHandler; - } - - @Override - public void read(InputStream in, String baseURI, ContentType ct, StreamRDF output, Context context) { - parse(in, null, baseURI, ct, output, context); - } - - @Override - public void read(Reader reader, String baseURI, ContentType ct, StreamRDF output, Context context) { - parse(null, reader, baseURI, ct, output, context); - } - - // RDF 1.1 is based on URIs/IRIs, where space are not allowed. - // RDF 1.0 (and RDF/XML) was based on "RDF URI References" which did allow spaces. - - // Use with TDB requires this to be "true" - it is set by InitTDB. - public static boolean RiotUniformCompatibility = true ; - // Warnings in ARP that should be errors to be compatible with - // non-XML-based languages. e.g. language tags should be - // syntactically valid. - private static int[] additionalErrors = new int[] { - ARPErrorNumbers.WARN_MALFORMED_XMLLANG - //, ARPErrorNumbers.WARN_MALFORMED_URI - //, ARPErrorNumbers.WARN_STRING_NOT_NORMAL_FORM_C - } ; - - // Special case of space in URI is handled in HandlerSink (below). - // This is instead of ARPErrorNumbers.WARN_MALFORMED_URI in additionalErrors[]. - // which causes a WARN (from ARP, with line+column numbers) then a ERROR from RIOT. - // It's a pragmatic compromise. - private static boolean errorForSpaceInURI = true; - - // Extracted from org.apache.jena.rdfxml.xmlinput.JenaReader - private void oneProperty(ARPOptions options, String pName, Object value) { - if (! pName.startsWith("ERR_") && ! pName.startsWith("IGN_") && ! pName.startsWith("WARN_")) - return ; - int cond = ParseException.errorCode(pName); - if (cond == -1) - throw new RiotException("No such ARP property: '"+pName+"'"); - int val; - if (value instanceof String) { - if (!((String) value).startsWith("EM_")) - throw new RiotException("Value for ARP property does not start EM_: '"+pName+"' = '"+value+"'" ); - val = ParseException.errorCode((String) value); - if (val == -1 ) - throw new RiotException("Illegal value for ARP property: '"+pName+"' = '"+value+"'" ); - } else if (value instanceof Integer) { - val = ((Integer) value).intValue(); - switch (val) { - case ARPErrorNumbers.EM_IGNORE: - case ARPErrorNumbers.EM_WARNING: - case ARPErrorNumbers.EM_ERROR: - case ARPErrorNumbers.EM_FATAL: - break; - default: - throw new RiotException("Illegal value for ARP property: '"+pName+"' = '"+value+"'" ); - } - } else { - throw new RiotException("Property \"" + pName + "\" cannot have value: " + value.toString()); - } - options.setErrorMode(cond, val); - } - - /*package*/ void parse(InputStream input, Reader reader, String xmlBase, ContentType ct, StreamRDF sink, Context context) { - // One of input and reader is null. - - // 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, errorHandler) ; - ARP0 arp = new ARP0() ; - arp.getHandlers().setStatementHandler(rslt) ; - arp.getHandlers().setErrorHandler(rslt) ; - arp.getHandlers().setNamespaceHandler(rslt) ; - - // ARPOptions. - ARPOptions arpOptions = arp.getOptions() ; - if ( RiotUniformCompatibility ) { - // Convert some warnings to errors for compatible behaviour for all parsers. - for ( int code : additionalErrors ) - arpOptions.setErrorMode(code, ARPErrorNumbers.EM_ERROR) ; - } - - if ( context != null ) { - Map<String, Object> properties = null; - try { - @SuppressWarnings("unchecked") - Map<String, Object> p = (Map<String, Object>)(context.get(SysRIOT.sysRdfReaderProperties)) ; - properties = p; - } catch(Throwable ex) { - Log.warn(this, "Problem accessing the RDF/XML reader properties: properties ignored", ex); - } - if ( properties != null ) - properties.forEach((k,v) -> oneProperty(arpOptions, k, v)) ; - } - arp.setOptionsWith(arpOptions) ; - - String filename = xmlBase; - - try { - if ( reader != null ) - arp.load(reader, xmlBase) ; - else - arp.load(input, xmlBase) ; - } - catch (IOException e) { - errorHandler.error(filename + ": " + ParseException.formatMessage(e), -1, -1) ; - } - catch (SAXParseException e) { - // already reported. - } - catch (SAXException sax) { - errorHandler.error(filename + ": " + ParseException.formatMessage(sax), -1, -1) ; - } - sink.finish() ; - } - - /** Sort out the base URI for RDF/XML parsing. */ - private static String baseURI_RDFXML(String baseIRI) { - if ( baseIRI == null ) - return IRIs.getBaseStr(); - // RDFParserBuidler resolved the baseIRI - return baseIRI; - } - - private static class HandlerSink extends ARPSaxErrorHandler implements StatementHandler, NamespaceHandler { - private StreamRDF output ; - private ErrorHandler riotErrorHandler ; - - HandlerSink(StreamRDF output, ErrorHandler errHandler) { - super(new ErrorHandlerBridge(errHandler)) ; - this.output = output ; - this.riotErrorHandler = errHandler ; - } - - @Override - public void statement(AResource subj, AResource pred, AResource obj) - { output.triple(convert(subj, pred, obj)); } - - @Override - public void statement(AResource subj, AResource pred, ALiteral lit) - { output.triple(convert(subj, pred, lit)) ; } - - // From JenaReader - private static Node convert(ALiteral lit) { - String dtURI = lit.getDatatypeURI(); - if (dtURI == null) - return NodeFactory.createLiteralLang(lit.toString(), lit.getLang()); - - if (lit.isWellFormedXML()) { - return NodeFactory.createLiteral(lit.toString(), null, XMLLiteralType.rdfXMLLiteral); - } - - RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI); - return NodeFactory.createLiteralDT(lit.toString(), dt); - } - - private Node convert(AResource r) { - if (!r.isAnonymous()) { - // URI. - String uriStr = r.getURI() ; - if ( errorForSpaceInURI ) { - // Special check for spaces in a URI. - // Convert to an error like TokernizerText. - if ( uriStr.contains(" ") ) { - int i = uriStr.indexOf(' '); - String s = uriStr.substring(0,i); - String msg = String.format("Bad character in IRI (space): <%s[space]...>", s); - riotErrorHandler.error(msg, -1, -1); - throw new RiotParseException(msg, -1, -1); - } - } - return NodeFactory.createURI(uriStr); - } - - // String id = r.getAnonymousID(); - Node rr = (Node) r.getUserData(); - if (rr == null) { - rr = NodeFactory.createBlankNode(); - r.setUserData(rr); - } - return rr; - } - - private Triple convert(AResource s, AResource p, AResource o) { - return Triple.create(convert(s), convert(p), convert(o)) ; - } - - private Triple convert(AResource s, AResource p, ALiteral o) { - Node literal = convert(o) ; - Checker.checkLiteral(literal, riotErrorHandler, -1, -1); - return Triple.create(convert(s), convert(p), literal) ; - } - - @Override - public void startPrefixMapping(String prefix, String uri) { - output.prefix(prefix, uri) ; - } - - @Override - public void endPrefixMapping(String prefix) {} - } - - private static class ErrorHandlerBridge implements RDFErrorHandler { - private ErrorHandler errorHandler ; - - ErrorHandlerBridge(ErrorHandler hander) { - this.errorHandler = hander ; - } - - @Override - public void warning(Exception e) { - Pair<Integer, Integer> p = getLineCol(e) ; - errorHandler.warning(e.getMessage(), p.getLeft(), p.getRight()) ; - } - - @Override - public void error(Exception e) { - Pair<Integer, Integer> p = getLineCol(e) ; - errorHandler.error(e.getMessage(), p.getLeft(), p.getRight()) ; - } - - @Override - public void fatalError(Exception e) { - Pair<Integer, Integer> p = getLineCol(e) ; - errorHandler.fatal(e.getMessage(), p.getLeft(), p.getRight()) ; - } - - private static Pair<Integer, Integer> getLineCol(Exception e) { - if ( e instanceof SAXParseException ) { - SAXParseException esax = (SAXParseException)e ; - return Pair.create(esax.getLineNumber(), esax.getColumnNumber()) ; - } else { - return Pair.create(-1, -1) ; - } - } - } -} 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 e6c0837352..7dc869976c 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 @@ -133,19 +133,8 @@ public class ReaderRDFXML_ARP1 implements ReaderRIOT options.setErrorMode(cond, val); } - @SuppressWarnings({"deprecation", "removal"}) + @SuppressWarnings({"deprecation"}) private void parse(InputStream input, Reader reader, String xmlBase, ContentType ct, StreamRDF sink, Context context) { - // One of input and reader is null. - boolean legacySwitch = context.isTrue(RIOT.symRDFXML0); - if ( legacySwitch ) { - Log.warnOnce(SysRIOT.getLogger(), - "Do not use rdfxml:rdfxml0 - use Lang RRX#RDFXML_ARP0 or \"--syntax arp0\"", - ReaderRDFXML_ARP0.class); - ReaderRDFXML_ARP0 other = new ReaderRDFXML_ARP0(parserProfile.getErrorHandler()); - other.parse(input, reader, xmlBase, ct, sink, context); - return; - } - // Hacked out of ARP because of all the "private" methods // JenaReader has reset the options since new ARP() was called. sink.start() ; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/package-info.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/package-info.java index 348641f1be..5482f348e3 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/package-info.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/package-info.java @@ -27,16 +27,7 @@ * <li>A StAX-based parser using {@link javax.xml.stream.XMLStreamReader XMLStreamReader}. * <li>A StAX-based parser using {@link javax.xml.stream.XMLEventReader XMLEventReader}. * </ul> - * In addition, Jena (in jena-core) has the original ARP parser. - * <p> - * "ARP0" in package {@code org.apach.jena-rdfxml.rdfxml0} - * This was the RDF/XML parser up to Jena 4.6.1. It handled IRIs directly using jena-iri. - * <p> - * "ARP1" is in package {@code org.apach.jena-rdfxml.rdfxml1} is derived from ARP0. - * It uses the {@link org.apache.jena.irix.IRIx IRIx} abstraction to handle IRIs. - * It has error reporting aligned with RIOT. - * <br/> - * </p> + * * <table border=1 style="border-width: 2px ; border-style: solid; border-collapse: collapse"> * <thead> * <tr> @@ -77,12 +68,6 @@ * <td><code>arp1</code></td> * <td></td> * </tr> - * <tr> - * <td>ARP0</td> - * <td><code>RRX.RDFXML_ARP0</code></td> - * <td><code>arp0</code></td> - * <td></td> - * </tr> * </tbody> * </table> * diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRRX_SAX.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRRX_SAX.java index 6225282a89..46a46f3ae0 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRRX_SAX.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRRX_SAX.java @@ -953,8 +953,6 @@ class ParserRRX_SAX // If there is an attribute a with a.URI == rdf:about then e.subject := // uri(identifier := resolve(e, a.string-value)). // - // Text quoted is implicitly "latter overrides former" but it seems ARP generate an error. - // This will be resolved and checked for a valid IRI later. String iriStr = attributes.getValue(rdfNS, rdfAbout); // Checked when the blank node is created. @@ -1764,7 +1762,6 @@ class ParserRRX_SAX /** * Escape text used in an XML content. - * Escapes aligned to ARP. */ private String xmlLiteralEscapeText(CharSequence stringAcc) { StringBuilder sBuff = new StringBuilder(); @@ -1789,7 +1786,6 @@ class ParserRRX_SAX /** * Escape text used in an XML attribute value. - * Escapes aligned to ARP. */ private String xmlLiteralEscapeAttr(CharSequence stringAcc) { StringBuilder sBuff = new StringBuilder(); diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_ev/ParserRRX_StAX_EV.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_ev/ParserRRX_StAX_EV.java index e30fe31b77..66c6720e7b 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_ev/ParserRRX_StAX_EV.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_ev/ParserRRX_StAX_EV.java @@ -1018,7 +1018,6 @@ class ParserRRX_StAX_EV { /** * Escape text used in an XML content. - * Escapes aligned to ARP. */ private String xmlLiteralEscapeText(CharSequence stringAcc) { StringBuilder sBuff = new StringBuilder(); @@ -1043,7 +1042,6 @@ class ParserRRX_StAX_EV { /** * Escape text used in an XML attribute value. - * Escapes aligned to ARP. */ private String xmlLiteralEscapeAttr(CharSequence stringAcc) { StringBuilder sBuff = new StringBuilder(); diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_sr/ParserRRX_StAX_SR.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_sr/ParserRRX_StAX_SR.java index f021a8e1c4..6c46da0af3 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_sr/ParserRRX_StAX_SR.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_sr/ParserRRX_StAX_SR.java @@ -985,7 +985,6 @@ class ParserRRX_StAX_SR { /** * Escape text used in an XML content. - * Escapes aligned to ARP. */ private String xmlLiteralEscapeText(CharSequence stringAcc) { StringBuilder sBuff = new StringBuilder(); @@ -1010,7 +1009,6 @@ class ParserRRX_StAX_SR { /** * Escape text used in an XML attribute value. - * Escapes aligned to ARP. */ private String xmlLiteralEscapeAttr(CharSequence stringAcc) { StringBuilder sBuff = new StringBuilder(); diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestRDFXML_ReaderProperties.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestRDFXML_ReaderProperties.java index 4baab11164..c553d8cf72 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestRDFXML_ReaderProperties.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestRDFXML_ReaderProperties.java @@ -35,16 +35,13 @@ import org.apache.jena.riot.system.ErrorHandlerFactory; import org.junit.Test; /** - * Tests for setting reader properties - specific to ARP0 and ARP1. + * Tests for setting reader properties - specific to ARP1. */ @SuppressWarnings("removal") public class TestRDFXML_ReaderProperties { - @Test public void rdfxmlreaderProperties_arp0() { - execTest(RRX.RDFXML_ARP0); - } @Test public void rdfxmlreaderProperties_arp1() { - execTest(RRX.RDFXML_ARP0); + execTest(RRX.RDFXML_ARP1); } private void execTest(Lang parserLang) { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TC_RIOT_RDFXML.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TC_RIOT_RDFXML.java index 230105e600..d0538006d7 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TC_RIOT_RDFXML.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TC_RIOT_RDFXML.java @@ -51,8 +51,5 @@ import org.junit.runners.Suite; * test suite. These are RDF1.1 and RDF 1.2 tests. * <p> * ARP1 is ARP is the RDFXML parser using IRIx in Jena4 from Jena 4.7.0. - * <p> - * ARP0 is ARP before conversion to IRIx and used in Jena up and including to 4.6.1. - * It is unlikely to be maintained. */ public class TC_RIOT_RDFXML {} diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/Scripts_RRX_RDFXML.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/Scripts_RRX_RDFXML.java index afe97d071b..4d45c78e69 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/Scripts_RRX_RDFXML.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/Scripts_RRX_RDFXML.java @@ -28,8 +28,6 @@ import org.junit.runners.Suite.SuiteClasses; */ @RunWith(Suite.class) @SuiteClasses( { - // ARP0 is unlikely to be maintained. - TestManifest_RDF11_ARP0.class, TestManifest_RDF11_ARP1.class, TestManifest_RDF11_RRX_SAX.class, TestManifest_RDF11_RRX_StAXsr.class, diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/TestManifest_RDF11_ARP0.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/TestManifest_RDF11_ARP0.java deleted file mode 100644 index 47b2bb7e9e..0000000000 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/TestManifest_RDF11_ARP0.java +++ /dev/null @@ -1,54 +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.riot.lang.rdfxml.manifest_rdf11; - -import org.apache.jena.arq.junit.manifest.Manifests; -import org.apache.jena.arq.junit.runners.Label; -import org.apache.jena.arq.junit.runners.RunnerRIOT; -import org.apache.jena.riot.Lang; -import org.apache.jena.riot.RDFParserRegistry; -import org.apache.jena.riot.ReaderRIOTFactory; -import org.apache.jena.riot.lang.rdfxml.ReaderRDFXML_ARP0; -import org.apache.jena.sys.JenaSystem; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; - -@RunWith(RunnerRIOT.class) -@Label("ARP0 RDF 1.1 rdf11-xml") // Original ARP. -@Manifests({ - "testing/RIOT/rdf11-xml/manifest.ttl" -}) - -public class TestManifest_RDF11_ARP0 { - private static ReaderRIOTFactory systemReaderfactory; - - @BeforeClass - public static void beforeClass() { - JenaSystem.init();; - systemReaderfactory = RDFParserRegistry.getFactory(Lang.RDFXML); - RDFParserRegistry.registerLangTriples(Lang.RDFXML, ReaderRDFXML_ARP0.factory); - } - - @AfterClass - public static void afterClass() { - if ( systemReaderfactory != null ) - RDFParserRegistry.registerLangTriples(Lang.RDFXML, systemReaderfactory); - } -} diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestRRX.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestRRX.java index 032c6e1743..a859075de2 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestRRX.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestRRX.java @@ -114,14 +114,12 @@ public class TestRRX { // rdf:parserType= @Test public void error_parseType_unknown() { - // This is only a warning in ARP. checkForError("parseType-unknown.rdf", false); } @Test public void warn_parseType_extension_1() { // Now valid. parseType="literal" -> parseType="Literal" // because ARP behaved that way. - // Warning issued. warningTest("parseType-warn.rdf", 1); } diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_SAX.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_SAX.java index 837f1adf47..b2a97c5274 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_SAX.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_SAX.java @@ -27,8 +27,6 @@ import org.junit.runners.Parameterized.Parameters; /** * Local basic testing to make sure the general parsing is OK in addition to running the W3C Test Suite. - * - * These test assume that ARP is correct! */ @RunWith(Parameterized.class) public class Test_RRX_Local_SAX extends AbstractTestRDFXML_RRX { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXev.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXev.java index 4bad6b9971..553b3bb96b 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXev.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXev.java @@ -28,8 +28,6 @@ import org.junit.runners.Parameterized.Parameters; /** * Local basic testing to make sure the general parsing is OK in addition to running the W3C Test Suite. - * - * These test assume that ARP is correct! */ @RunWith(Parameterized.class) diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXsr.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXsr.java index 43fc15dafe..2821e25aca 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXsr.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXsr.java @@ -28,8 +28,6 @@ import org.junit.runners.Parameterized.Parameters; /** * Local basic testing to make sure the general parsing is OK in addition to running the W3C Test Suite. - * - * These test assume that ARP is correct! */ @RunWith(Parameterized.class) diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_SAX.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_SAX.java index df3bc53aed..d3599d2653 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_SAX.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_SAX.java @@ -27,8 +27,6 @@ import org.junit.runners.Parameterized.Parameters; /** * Run over all files found by a deep walk of the directory tree. - * Test for an error if ARP generates an error. - * These test assume that ARP is correct! */ @RunWith(Parameterized.class) diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXev.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXev.java index 619d98b2a4..09ae5e4fd8 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXev.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXev.java @@ -28,8 +28,6 @@ import org.junit.runners.Parameterized.Parameters; /** * Run over all files found by a deep walk of the directory tree. - * Test for an error if ARP generates an error. - * These test assume that ARP is correct! */ @RunWith(Parameterized.class) diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXsr.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXsr.java index debd5aad91..7b5a618a33 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXsr.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXsr.java @@ -28,8 +28,6 @@ import org.junit.runners.Parameterized.Parameters; /** * Run over all files found by a deep walk of the directory tree. - * Test for an error if ARP generates an error. - * These test assume that ARP is correct! */ @RunWith(Parameterized.class) public class Test_RRX_W3C_StAXsr extends AbstractTestRDFXML_RRX {
