GH-2997: Move ARP's internal NTriples reader to tests, and rename

Author: afs

jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/ARPTests2.java

@@ -545,6 +545,7 @@ public void warning(SAXParseException exception) throws SAXException {
 //        checkExpected() ;
 //    }
 
+    @SuppressWarnings("removal")
     public void testNTripleEscaping() {
     	String data[][] = {
     			{ "foo", "foo" },
@@ -555,7 +556,7 @@ public void testNTripleEscaping() {
     	};
     	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]) );
     	}
 
 

jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput0/NTriple.java jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/NTripleARP0.java

@@ -85,8 +85,8 @@
  * </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 @@ static private void lineNumber() {
 	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.");

jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/NTripleTestSuite.java

@@ -242,7 +242,7 @@ Model loadRDF(InFactoryX in, RDFErrorHandler eh, String base)
 		return loadRDFx(in, eh, base, true, 0);
 	}
 
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings("removal")
     static Model loadRDFx(
 		InFactoryX in,
 		RDFErrorHandler eh,
@@ -274,7 +274,7 @@ public void write(int b) throws IOException {
 			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;

jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput0/TaintingTests.java

@@ -178,7 +178,7 @@ public void setUp() {
 	}
 
     @Override
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings("removal")
     public void runTest() throws IOException {
         ByteArrayOutputStream goodBytes = new ByteArrayOutputStream();
         ByteArrayOutputStream badBytes = new ByteArrayOutputStream();
@@ -187,7 +187,7 @@ public void runTest() throws IOException {
         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 {

jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/NTriple.java jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleARP1.java

@@ -83,20 +83,15 @@
  * </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 @@ static private void lineNumber() {
 	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.");

jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleTestSuite.java

@@ -226,6 +226,7 @@ Model loadRDF(InputSupplier in, RDFErrorHandler eh, String base)
 		return loadRDFx(in, eh, base, true, 0);
 	}
 
+    @SuppressWarnings("removal")
     static Model loadRDFx(
 		InputSupplier in,
 		RDFErrorHandler eh,
@@ -257,7 +258,7 @@ public void write(int b) throws IOException {
 			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;

jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsARP.java

@@ -495,6 +495,7 @@ public void testIRIRules_2a()
 //        checkExpected() ;
 //    }
 
+    @SuppressWarnings("removal")
     public void testNTripleEscaping() {
     	String data[][] = {
     			{ "foo", "foo" },
@@ -505,7 +506,7 @@ public void testNTripleEscaping() {
     	};
     	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]) );
     	}
 
 

jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsTainting.java

@@ -183,6 +183,7 @@ public void setUp() {
 		OntDocumentManager.getInstance().reset(true);
 	}
 
+    @SuppressWarnings("removal")
     @Override
     public void runTest() throws IOException {
         ByteArrayOutputStream goodBytes = new ByteArrayOutputStream();
@@ -192,7 +193,7 @@ public void runTest() throws IOException {
         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 {