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 d90f86f6e8bb73920b1601d65d51ed7b4140e183 Author: Andy Seaborne <[email protected]> AuthorDate: Fri Feb 7 20:57:36 2025 +0000 GH-2997: Move ARP's internal NTriples reader to tests, and rename --- .../java/org/apache/jena/rdfxml/xmlinput0/ARPTests2.java | 3 ++- .../java/org/apache/jena/rdfxml/xmlinput0/NTripleARP0.java} | 6 +++--- .../org/apache/jena/rdfxml/xmlinput0/NTripleTestSuite.java | 4 ++-- .../org/apache/jena/rdfxml/xmlinput0/TaintingTests.java | 4 ++-- .../java/org/apache/jena/rdfxml/xmlinput1/NTripleARP1.java} | 13 ++++--------- .../org/apache/jena/rdfxml/xmlinput1/NTripleTestSuite.java | 3 ++- .../java/org/apache/jena/rdfxml/xmlinput1/TestsARP.java | 3 ++- .../org/apache/jena/rdfxml/xmlinput1/TestsTainting.java | 3 ++- 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/ARPTests2.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/ARPTests2.java index dfb86f3ce8..9aecef2887 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/ARPTests2.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/ARPTests2.java @@ -545,6 +545,7 @@ public class ARPTests2 extends TestCase implements RDFErrorHandler, ARPErrorNumb // checkExpected() ; // } + @SuppressWarnings("removal") public void testNTripleEscaping() { String data[][] = { { "foo", "foo" }, @@ -555,7 +556,7 @@ public class ARPTests2 extends TestCase implements RDFErrorHandler, ARPErrorNumb }; for (String p[] : data ) { // System.err.println(NTriple.escapeNTriple(p[0])); - Assert.assertEquals("NTriple escaping", p[1],NTriple.escapeNTriple(p[0]) ); + Assert.assertEquals("NTriple escaping", p[1],NTripleARP0.escapeNTriple(p[0]) ); } diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput0/NTriple.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/NTripleARP0.java similarity index 99% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput0/NTriple.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/NTripleARP0.java index 22f9a64bdc..6b3f0d7740 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput0/NTriple.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/NTripleARP0.java @@ -85,8 +85,8 @@ import org.xml.sax.SAXParseException; * </dl> * @deprecated Legacy. To be removed. */ -@Deprecated -public class NTriple implements ARPErrorNumbers { +@Deprecated(forRemoval = true) +public class NTripleARP0 implements ARPErrorNumbers { private static StringBuilder line = new StringBuilder(); private static ARP0 arp; @@ -198,7 +198,7 @@ public class NTriple implements ARPErrorNumbers { static void usage() { System.err.println( "java <class-path> " - + NTriple.class.getName() + + NTripleARP0.class.getName() + " ( [ -[xstfurR]][ -b xmlBase -[eiw] NNN[,NNN...] ] [ file ] [ url ] )... "); System.err.println( " All options, files and URLs can be intemingled in any order."); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/NTripleTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/NTripleTestSuite.java index ca23ed1902..9f489d37a9 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/NTripleTestSuite.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/NTripleTestSuite.java @@ -242,7 +242,7 @@ class NTripleTestSuite extends WGTestSuite { return loadRDFx(in, eh, base, true, 0); } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") static Model loadRDFx( InFactoryX in, RDFErrorHandler eh, @@ -274,7 +274,7 @@ class NTripleTestSuite extends WGTestSuite { System.setIn(in.open()); System.setOut(out); try { - NTriple.mainEh(new String[] { "-b", base, "-s" }, th, th); + NTripleARP0.mainEh(new String[] { "-b", base, "-s" }, th, th); } catch (SimulatedException e) { if (wantModel) throw e; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/TaintingTests.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/TaintingTests.java index 20ce16401c..e8b31bd39e 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/TaintingTests.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/TaintingTests.java @@ -178,7 +178,7 @@ public class TaintingTests extends TestCase implements ErrorHandler, } @Override - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public void runTest() throws IOException { ByteArrayOutputStream goodBytes = new ByteArrayOutputStream(); ByteArrayOutputStream badBytes = new ByteArrayOutputStream(); @@ -187,7 +187,7 @@ public class TaintingTests extends TestCase implements ErrorHandler, try (PrintStream out = new PrintStream(goodBytes); PrintStream err = new PrintStream(badBytes); ) { System.setOut(out); System.setErr(err); - NTriple.mainEh(new String[]{"-e","102,136,105,103,108,107,116,106,004,131", + NTripleARP0.mainEh(new String[]{"-e","102,136,105,103,108,107,116,106,004,131", "-E","-b",base,fileName},this,null); } finally { diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/NTriple.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleARP1.java similarity index 98% rename from jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/NTriple.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleARP1.java index f15e283b81..3b57f89355 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/NTriple.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleARP1.java @@ -83,20 +83,15 @@ import org.xml.sax.SAXParseException; * </dt><dd> * Ignores numbered error/warning conditions. * </dl> + * @deprecated Internaluse only To be removed. */ -@SuppressWarnings("deprecation") -public class NTriple implements ARPErrorNumbers { +@Deprecated(forRemoval = true) +public class NTripleARP1 implements ARPErrorNumbers { private static StringBuilder line = new StringBuilder(); private static ARP arp; private static String xmlBase = null; private static boolean numbers = false; - /** Starts an RDF/XML to NTriple converter. - * @param args The command-line arguments. - */ - static public void main(String args[]) { - mainEh(args, null, null); - } static StatementHandler andMeToo = null; /** Starts an RDF/XML to NTriple converter, * using an error handler, and an ARPHandler. @@ -197,7 +192,7 @@ public class NTriple implements ARPErrorNumbers { static void usage() { System.err.println( "java <class-path> " - + NTriple.class.getName() + + NTripleARP1.class.getName() + " ( [ -[xstfurR]][ -b xmlBase -[eiw] NNN[,NNN...] ] [ file ] [ url ] )... "); System.err.println( " All options, files and URLs can be intemingled in any order."); 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/xmlinput1/NTripleTestSuite.java index 7f73ba0049..1675c804e5 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleTestSuite.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleTestSuite.java @@ -226,6 +226,7 @@ class NTripleTestSuite extends WGTestSuite { return loadRDFx(in, eh, base, true, 0); } + @SuppressWarnings("removal") static Model loadRDFx( InputSupplier in, RDFErrorHandler eh, @@ -257,7 +258,7 @@ class NTripleTestSuite extends WGTestSuite { System.setIn(in.open()); System.setOut(out); try { - NTriple.mainEh(new String[] { "-b", base, "-s" }, th, th); + NTripleARP1.mainEh(new String[] { "-b", base, "-s" }, th, th); } catch (SimulatedException e) { if (wantModel) throw e; 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/xmlinput1/TestsARP.java index cdd10d6ff9..e99533e721 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsARP.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsARP.java @@ -495,6 +495,7 @@ public class TestsARP extends TestCase implements RDFErrorHandler, ARPErrorNumbe // checkExpected() ; // } + @SuppressWarnings("removal") public void testNTripleEscaping() { String data[][] = { { "foo", "foo" }, @@ -505,7 +506,7 @@ public class TestsARP extends TestCase implements RDFErrorHandler, ARPErrorNumbe }; for (String p[] : data ) { // System.err.println(NTriple.escapeNTriple(p[0])); - Assert.assertEquals("NTriple escaping", p[1],NTriple.escapeNTriple(p[0]) ); + Assert.assertEquals("NTriple escaping", p[1],NTripleARP1.escapeNTriple(p[0]) ); } 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/xmlinput1/TestsTainting.java index b51e4e0b86..ba472f50cb 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsTainting.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsTainting.java @@ -183,6 +183,7 @@ public class TestsTainting extends TestCase implements ErrorHandler, OntDocumentManager.getInstance().reset(true); } + @SuppressWarnings("removal") @Override public void runTest() throws IOException { ByteArrayOutputStream goodBytes = new ByteArrayOutputStream(); @@ -192,7 +193,7 @@ public class TestsTainting extends TestCase implements ErrorHandler, try (PrintStream out = new PrintStream(goodBytes); PrintStream err = new PrintStream(badBytes); ) { System.setOut(out); System.setErr(err); - NTriple.mainEh(new String[]{"-e","102,136,105,103,108,107,116,106,004,131", + NTripleARP1.mainEh(new String[]{"-e","102,136,105,103,108,107,116,106,004,131", "-E","-b",base,fileName},this,null); } finally {
