Merge pull request #2 from slloyd-src/jakarta

Jakarta Pt2

Author: pahjbo

ADQLLib/test/adql/translator/TestPgSphereTranslator.java

@@ -288,7 +288,7 @@ public void testTranslateGeometryFromDB() {
 
 		// OTHER
 		try {
-			translator.translateGeometryFromDB(new Double(12.3));
+			translator.translateGeometryFromDB(12.3);
 			fail("The translation of a Double as a geometry is not supported!");
 		} catch(Throwable t) {
 			assertTrue(t instanceof ParseException);

TAPLib/test/tap/config/TestConfigurableTAPFactory.java

@@ -27,9 +27,9 @@
 import java.util.Map;
 import java.util.Properties;
 
-import jakarta.naming.Context;
-import jakarta.naming.InitialContext;
-import jakarta.naming.NamingException;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 import jakarta.servlet.http.HttpServletRequest;
 
 import org.h2.jdbc.JdbcSQLException;

TAPLib/test/tap/config/TestTAPConfiguration.java

@@ -301,7 +301,7 @@ public void testNewInstance() {
 
 		// NO MATCHING CONSTRUCTOR:
 		try {
-			newInstance("{tap.metadata.TAPSchema}", "schema", TAPSchema.class, new Class<?>[]{ Integer.class }, new Object[]{ new Integer(123) });
+			newInstance("{tap.metadata.TAPSchema}", "schema", TAPSchema.class, new Class<?>[]{ Integer.class }, new Object[]{123});
 			fail("This MUST have failed because the specified class does not have any expected constructor!");
 		} catch(Exception ex) {
 			assertEquals(TAPException.class, ex.getClass());
@@ -314,7 +314,7 @@ public void testNewInstance() {
 			assertNotNull(colRef);
 			assertEquals(ColumnReference.class, colRef.getClass());
 			assertEquals(123, colRef.getColumnIndex());
-			colRef = newInstance("{adql.query.ColumnReference}", "colRef", ColumnReference.class, new Class<?>[]{ int.class }, new Object[]{ new Integer(123) });
+			colRef = newInstance("{adql.query.ColumnReference}", "colRef", ColumnReference.class, new Class<?>[]{ int.class }, new Object[]{123});
 			assertNotNull(colRef);
 			assertEquals(ColumnReference.class, colRef.getClass());
 			assertEquals(123, colRef.getColumnIndex());
@@ -325,7 +325,7 @@ public void testNewInstance() {
 
 		// WRONG CONSTRUCTOR with primitive type:
 		try {
-			newInstance("{adql.query.ColumnReference}", "colRef", ColumnReference.class, new Class<?>[]{ Integer.class }, new Object[]{ new Integer(123) });
+			newInstance("{adql.query.ColumnReference}", "colRef", ColumnReference.class, new Class<?>[]{ Integer.class }, new Object[]{123});
 			fail("This MUST have failed because the constructor of the specified class expects an int, not an java.lang.Integer!");
 		} catch(Exception ex) {
 			assertEquals(TAPException.class, ex.getClass());

TAPLib/test/tap/metadata/TestTableSetParser.java

@@ -10,10 +10,10 @@
 import java.io.StringBufferInputStream;
 import java.util.ArrayList;
 
-import jakarta.xml.stream.XMLInputFactory;
-import jakarta.xml.stream.XMLStreamConstants;
-import jakarta.xml.stream.XMLStreamException;
-import jakarta.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
 
 import org.junit.After;
 import org.junit.AfterClass;