You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2025/12/23 14:29:14 UTC
(jena) 04/06: GH-3664: Deprecate old RDF/XML reader and writer code (jena-core)
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 dd55ab89181f1df3ae10185c76f081eedfebee7b
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sun Dec 21 11:09:08 2025 +0000
GH-3664: Deprecate old RDF/XML reader and writer code (jena-core)
---
.../java/org/apache/jena/riot/lang/rdfxml/RRX.java | 5 ++++-
.../jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java | 5 +++--
.../jena/riot/writer/RDFXMLAbbrevWriter.java | 1 +
.../apache/jena/riot/writer/RDFXMLPlainWriter.java | 1 +
.../jena/riot/lang/rdfxml/Scripts_ARP1_RDFXML.java | 4 +++-
.../jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java | 1 +
.../apache/jena/rdf/model/impl/RDFReaderFImpl.java | 1 +
.../apache/jena/rdf/model/impl/RDFWriterFImpl.java | 3 +++
.../java/org/apache/jena/rdfxml/xmlinput1/ARP.java | 6 +++---
.../apache/jena/rdfxml/xmlinput1/RDFXMLReader.java | 9 +++++----
.../jena/rdfxml/xmloutput/impl/RDFXML_Abbrev.java | 23 ++++++++++++++--------
.../jena/rdfxml/xmloutput/impl/RDFXML_Basic.java | 12 +++++++----
.../apache/jena/rdfxml/arp1tests/NTripleARP1.java | 4 +++-
.../apache/jena/rdfxml/arp1tests/TestErrorMsg.java | 2 +-
.../jena/rdfxml/arp1tests/TestRDFXML_URI.java | 1 +
.../jena/rdfxml/arp1tests/TestSuiteException.java | 8 ++++----
.../org/apache/jena/rdfxml/arp1tests/TestsARP.java | 5 ++---
.../apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java | 1 +
.../jena/rdfxml/arp1tests/TestsSAX2RDFMore.java | 3 ++-
.../apache/jena/rdfxml/arp1tests/WGTestSuite.java | 4 +++-
.../jena/rdfxml/xmloutput/TestEntityOutput.java | 2 ++
.../jena/rdfxml/xmloutput/TestXMLFeatures.java | 1 +
.../java/org/apache/jena/test/X_RDFReaderF.java | 1 +
.../java/org/apache/jena/test/X_RDFWriterF.java | 2 ++
24 files changed, 71 insertions(+), 34 deletions(-)
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 7ceb8ef862..2307f674a8 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 class RRX {
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 8151ee9a14..8b27d35647 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
@@ -48,12 +48,13 @@ import org.xml.sax.SAXParseException ;
* <p>
* <b>LEGACY</b>
* <p>
- * Uses xmlinput1 - the version of ARP from Jena 4.7.0 to Jena 4.10.0.
+ * Uses ARQ1 - the version of ARP from Jena 4.7.0 to Jena 4.10.0.
* <p>
* Replaced at Jena 5 by RRX.
*
* @see <a href="http://www.w3.org/TR/rdf-syntax-grammar/">http://www.w3.org/TR/rdf-syntax-grammar/</a>
*/
+@Deprecated(forRemoval = true)
public class ReaderRDFXML_ARP1 implements ReaderRIOT
{
public static ReaderRIOTFactory factory = (Lang language, ParserProfile parserProfile) -> {
@@ -133,13 +134,13 @@ public class ReaderRDFXML_ARP1 implements ReaderRIOT
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 9a3af3130b..b8242d2a1e 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 2a7c670439..aecd49f5b4 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 @@ import org.apache.jena.riot.adapters.AdapterRDFWriter;
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 e14e2caefe..2a265858db 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<DynamicNode> 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 919cef8cee..dafcb83c0e 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 @@ import org.apache.jena.sparql.graph.GraphFactory;
/** Ways to run tests on parsers. */
public class RunTestRDFXML {
+ @SuppressWarnings("removal")
static ReaderRIOTFactory arpFactory = ReaderRDFXML_ARP1.factory;
/**
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 a44206c657..0a6919ad5a 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
@@ -91,6 +91,7 @@ public class RDFReaderFImpl extends Object implements RDFReaderF {
custom.put("N-Triples", ntReader);
if ( includeRDFXML ) {
+ @SuppressWarnings("removal")
Creator<RDFReaderI> rdfxmlReader = RDFXMLReader::new;
custom.put("RDF", rdfxmlReader);
custom.put("RDF/XML", 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 3ea7cce774..2153aab850 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
@@ -93,8 +93,11 @@ public class RDFWriterFImpl extends Object implements RDFWriterF {
if ( includeRDFXML ) {
// Jena6: RDF/XML writing not installed except for tests.
+ @SuppressWarnings("deprecation")
Creator<RDFWriterI> rdfxmlWriterBasic = RDFXML_Basic::new;
+ @SuppressWarnings("deprecation")
Creator<RDFWriterI> rdfxmlWriterAbbrev = RDFXML_Abbrev::new;
+
custom.put("RDF/XML", rdfxmlWriterBasic);
custom.put("RDF/XML-ABBREV", rdfxmlWriterAbbrev);
}
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/xmlinput1/ARP.java
index 2564ecbcd9..23bc0d2d9d 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARP.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/ARP.java
@@ -65,7 +65,7 @@ import org.xml.sax.SAXException;
* 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();
}
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/xmlinput1/RDFXMLReader.java
index c0cad01e7b..8b14eda001 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java
@@ -70,7 +70,9 @@ public class RDFXMLReader implements RDFReaderI, ARPErrorNumbers {
/**
* Creates new JenaReader (used by {@link RDFReaderFImpl})
+ * Modern RDF/XML support is available from RIOT in jena-arq.
*/
+ @Deprecated(forRemoval = true)
public RDFXMLReader() {
this(true);
}
@@ -81,6 +83,7 @@ public class RDFXMLReader implements RDFReaderI, ARPErrorNumbers {
* 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;
@@ -94,10 +97,8 @@ public class RDFXMLReader implements RDFReaderI, ARPErrorNumbers {
* 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/xmloutput/impl/RDFXML_Abbrev.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Abbrev.java
index 138fe9edaa..1221379b4c 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 org.apache.jena.vocabulary.RDFSyntax;
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 <code>NSPREFIXPROPBASE</code> system properties.
* Use <code>setNsPrefix</code>.
- * For best results it is necessary to set the property
+ * For best results it is necessary to set the property
<code>"prettyTypes"</code>. 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 @@ public class RDFXML_Abbrev extends BaseXMLWriter implements RDFErrorHandler {
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 f31cc635ca..04d1a60c83 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 @@ import org.apache.jena.vocabulary.RDFSyntax ;
/** 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/arp1tests/NTripleARP1.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java
index 548fbf0e9b..654e4e8ed8 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java
@@ -90,7 +90,8 @@ import org.xml.sax.SAXParseException;
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;
@@ -102,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/arp1tests/TestErrorMsg.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java
index 5478a2dbdc..61b6a37fa2 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java
@@ -58,13 +58,13 @@ public class TestErrorMsg extends TestCase {
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/arp1tests/TestRDFXML_URI.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java
index e183562fea..c3a7a40006 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java
@@ -72,6 +72,7 @@ public class TestRDFXML_URI {
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/arp1tests/TestSuiteException.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java
index bdc074a0eb..1f3ec76cf7 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java
@@ -29,9 +29,9 @@ import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers;
import org.apache.jena.rdfxml.xmlinput1.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");
@@ -122,7 +122,7 @@ public class TestSuiteException
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/arp1tests/TestsARP.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java
index 4e8cd776bd..db5efc209e 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
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);
@@ -340,7 +340,7 @@ public class TestsARP extends TestCase implements RDFErrorHandler, ARPErrorNumbe
}
/** Create an {@link RDFXMLReader} that does not resolve the initial XML base. */
- private static RDFXMLReader baseTestReader() {
+ private static RDFXMLReader baseTestReader() {
return new RDFXMLReader(false);
}
@@ -495,7 +495,6 @@ public class TestsARP extends TestCase implements RDFErrorHandler, ARPErrorNumbe
// checkExpected();
// }
- @SuppressWarnings("removal")
public void testNTripleEscaping() {
String data[][] = {
{ "foo", "foo" },
diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java
index 6b4bc53000..cd043620b7 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java
@@ -1221,6 +1221,7 @@ public class TestsSAX2RDF extends TestCase {
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/arp1tests/TestsSAX2RDFMore.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java
index be15c376b5..486e2d0571 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java
@@ -46,7 +46,8 @@ public class TestsSAX2RDFMore extends TestCase {
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/arp1tests/WGTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java
index 1ca160853f..3b65303a8d 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java
@@ -90,6 +90,7 @@ class WGTestSuite extends TestSuite implements ARPErrorNumbers {
Model loadRDF(InputSupplier in, RDFErrorHandler eh, String base)
throws IOException {
Model model = ModelFactory.createDefaultModel();
+ @SuppressWarnings("removal")
RDFXMLReader jr = new RDFXMLReader();
if (eh != null)
@@ -119,7 +120,8 @@ class WGTestSuite extends TestSuite implements ARPErrorNumbers {
@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);
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 bb1a0fb16b..400330434b 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 class TestEntityOutput extends ModelTestBase
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 @@ public class TestEntityOutput extends ModelTestBase
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 4c964df514..218d88c8d6 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
@@ -398,6 +398,7 @@ public class TestXMLFeatures extends XMLOutputTestBase {
}
// 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/test/X_RDFReaderF.java b/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java
index 1674517c9c..2030d6ccbc 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
@@ -70,6 +70,7 @@ public class X_RDFReaderF extends Object implements RDFReaderF {
private static void reset() {
+ @SuppressWarnings("removal")
Creator<RDFReaderI> rdfxmlReader = RDFXMLReader::new;
Creator<RDFReaderI> ntReader = NTripleReader::new;
Creator<RDFReaderI> turtleReader = TurtleReader::new;
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 767594d15d..403cfd64f1 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
@@ -64,7 +64,9 @@ public class X_RDFWriterF extends Object implements RDFWriterF {
}
private static void reset() {
+ @SuppressWarnings("deprecation")
Creator<RDFWriterI> rdfxmlWriter = RDFXML_Basic::new;
+ @SuppressWarnings("deprecation")
Creator<RDFWriterI> rdfxmlAbbrevWriter = RDFXML_Abbrev::new;
Creator<RDFWriterI> ntWriter = NTripleWriter::new;