Merge pull request #577 from v-afrafi/Java9

Removal of deprecated APIs and update travic script with jdk 9
microsoft · Dec 11, 2017 · 7a2bbef · 7a2bbef
2 parents b1dbacc + 47ddc43
commit 7a2bbef
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,8 @@
 sudo: required
 
 language: java
-sudo: false
-dist: trusty
-jdk: oraclejdk9
+jdk:
+  - oraclejdk9
 
 addons:
  apt:
@@ -35,7 +34,7 @@ install:
   - keytool -importkeystore -destkeystore clientcert.jks -deststorepass password -srckeystore identity.p12 -srcstoretype PKCS12 -srcstorepass password
   - keytool -list -v -keystore clientcert.jks -storepass "password" > JavaKeyStore.txt
   - cd ..
-  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild41
+  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild43
   - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild42
 
 before_script:
@@ -45,6 +44,6 @@ before_script:
 script: 
   - docker ps -a
 
-##Test for JDBC Specification 41 & 42 and submit coverage report.
-  - mvn test -B -Pbuild41 jacoco:report && bash <(curl -s https://codecov.io/bash) -cF JDBC41
+##Test for JDBC Specification 43 & 42 and submit coverage report.
+  - mvn test -B -Pbuild41 jacoco:report && bash <(curl -s https://codecov.io/bash) -cF JDBC43
   - mvn test -B -Pbuild42 jacoco:report && bash <(curl -s https://codecov.io/bash) -cF JDBC42
diff --git a/README.md b/README.md
@@ -36,19 +36,19 @@ What's coming next?  We will look into adding a more comprehensive set of tests,
 
 ## Build
 ### Prerequisites
-* Java 8
+* Java 9
 * [Maven](http://maven.apache.org/download.cgi)
 * An instance of SQL Server or Azure SQL Database that you can connect to. 
 
 ### Build the JAR files
 Maven builds automatically trigger a set of verification tests to run.  For these tests to pass, you will first need to add an environment variable in your system called `mssql_jdbc_test_connection_properties` to provide the [correct connection properties](https://msdn.microsoft.com/en-us/library/ms378428(v=sql.110).aspx) for your SQL Server or Azure SQL Database instance.
 
-To build the jar files, you must use Java 8 with Maven.  You can choose to build a JDBC 4.1 compliant jar file (for use with JRE 7) and/or a JDBC 4.2 compliant jar file (for use with JRE 8).
+To build the jar files, you must use Java 9 with Maven.  You can choose to build a JDBC 4.3 compliant jar file (for use with JRE 9) and/or a JDBC 4.2 compliant jar file (for use with JRE 8).
 
 * Maven:
 	1. If you have not already done so, add the environment variable `mssql_jdbc_test_connection_properties` in your system with the connection properties for your SQL Server or SQL DB instance.
-	2. Run one of the commands below to build a JDBC 4.1 compliant jar or JDBC 4.2 compliant jar in the \target directory. 
-    	* Run `mvn install -Pbuild41`. This creates JDBC 4.1 compliant jar in \target directory
+	2. Run one of the commands below to build a JDBC 4.3 compliant jar or JDBC 4.2 compliant jar in the \target directory. 
+    	* Run `mvn install -Pbuild43`. This creates JDBC 4.3 compliant jar in \target directory
     	* Run `mvn install -Pbuild42`. This creates JDBC 4.2 compliant jar in \target directory
 
 **NOTE**: Beginning release v6.1.7, we will no longer be maintaining the existing [Gradle build script](build.gradle) and it will be left in the repository for reference. Please refer to issue [#62](https://github.com/Microsoft/mssql-jdbc/issues/62) for this decision.

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/DDC.java b/src/main/java/com/microsoft/sqlserver/jdbc/DDC.java
@@ -232,7 +232,7 @@ static final Object convertFloatToObject(float floatVal,
                 return new BigDecimal(Float.toString(floatVal));
             case FLOAT:
             case DOUBLE:
-                return (new Float(floatVal)).doubleValue();
+                return (Float.valueOf(floatVal)).doubleValue();
             case BINARY:
                 return convertIntToBytes(Float.floatToRawIntBits(floatVal), 4);
             default:
@@ -275,7 +275,7 @@ static final Object convertDoubleToObject(double doubleVal,
             case DOUBLE:
                 return doubleVal;
             case REAL:
-                return (new Double(doubleVal)).floatValue();
+                return (Double.valueOf(doubleVal)).floatValue();
             case INTEGER:
                 return (int) doubleVal;
             case SMALLINT: // small and tinyint returned as short

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/FailOverInfo.java b/src/main/java/com/microsoft/sqlserver/jdbc/FailOverInfo.java
@@ -71,7 +71,7 @@ private void setupInfo(SQLServerConnection con) throws SQLServerException {
                 instancePort = con.getInstancePort(failoverPartner, instanceValue);
 
                 try {
-                    portNumber = new Integer(instancePort);
+                    portNumber = Integer.parseInt(instancePort);
                 }
                 catch (NumberFormatException e) {
                     // Should not get here as the server should give a proper port number anyway.

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java
@@ -575,7 +575,7 @@ public Object[] getRowData() throws SQLServerException {
                         case Types.BIGINT: {
                             BigDecimal bd = new BigDecimal(data[pair.getKey() - 1].trim());
                             try {
-                                dataRow[pair.getKey() - 1] = bd.setScale(0, BigDecimal.ROUND_DOWN).longValueExact();
+                                dataRow[pair.getKey() - 1] = bd.setScale(0, RoundingMode.DOWN).longValueExact();
                             } catch (ArithmeticException ex) {
                                 String value = "'" + data[pair.getKey() - 1] + "'";
                                 MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_errorConvertingValue"));

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -1422,7 +1422,7 @@ Connection connectInternal(Properties propsIn,
             sPropKey = SQLServerDriverIntProperty.STATEMENT_POOLING_CACHE_SIZE.toString();
             if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0) {
                 try {
-                    int n = new Integer(activeConnectionProperties.getProperty(sPropKey));
+                    int n = Integer.parseInt(activeConnectionProperties.getProperty(sPropKey));
                     this.setStatementPoolingCacheSize(n);
                 }
                 catch (NumberFormatException e) {
@@ -1559,7 +1559,7 @@ Connection connectInternal(Properties propsIn,
             try {
                 String strPort = activeConnectionProperties.getProperty(sPropKey);
                 if (null != strPort) {
-                    nPort = new Integer(strPort);
+                    nPort = Integer.parseInt(strPort);
 
                     if ((nPort < 0) || (nPort > 65535)) {
                         MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPortNumber"));
@@ -1639,7 +1639,7 @@ else if (0 == requestedPacketSize)
             nLockTimeout = defaultLockTimeOut; // Wait forever
             if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0) {
                 try {
-                    int n = new Integer(activeConnectionProperties.getProperty(sPropKey));
+                    int n = Integer.parseInt(activeConnectionProperties.getProperty(sPropKey));
                     if (n >= defaultLockTimeOut)
                         nLockTimeout = n;
                     else {
@@ -1660,7 +1660,7 @@ else if (0 == requestedPacketSize)
             queryTimeoutSeconds = defaultQueryTimeout; // Wait forever
             if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0) {
                 try {
-                    int n = new Integer(activeConnectionProperties.getProperty(sPropKey));
+                    int n = Integer.parseInt(activeConnectionProperties.getProperty(sPropKey));
                     if (n >= defaultQueryTimeout) {
                         queryTimeoutSeconds = n;
                     }
@@ -1682,7 +1682,7 @@ else if (0 == requestedPacketSize)
             socketTimeoutMilliseconds = defaultSocketTimeout; // Wait forever
             if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0) {
                 try {
-                    int n = new Integer(activeConnectionProperties.getProperty(sPropKey));
+                    int n = Integer.parseInt(activeConnectionProperties.getProperty(sPropKey));
                     if (n >= defaultSocketTimeout) {
                         socketTimeoutMilliseconds = n;
                     }
@@ -1702,7 +1702,7 @@ else if (0 == requestedPacketSize)
             sPropKey = SQLServerDriverIntProperty.SERVER_PREPARED_STATEMENT_DISCARD_THRESHOLD.toString();
             if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0) {
                 try {
-                    int n = new Integer(activeConnectionProperties.getProperty(sPropKey));
+                    int n = Integer.parseInt(activeConnectionProperties.getProperty(sPropKey));
                     setServerPreparedStatementDiscardThreshold(n);
                 }
                 catch (NumberFormatException e) {
@@ -2163,7 +2163,7 @@ ServerPortPlaceHolder primaryPermissionCheck(String primary,
                     connectionlogger.fine(toString() + " SQL Server port returned by SQL Browser: " + instancePort);
                 try {
                     if (null != instancePort) {
-                        primaryPortNumber = new Integer(instancePort);
+                        primaryPortNumber = Integer.parseInt(instancePort);
 
                         if ((primaryPortNumber < 0) || (primaryPortNumber > 65535)) {
                             MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPortNumber"));

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSource.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSource.java
@@ -866,7 +866,7 @@ private void setIntProperty(Properties props,
             int propValue) {
         if (loggerExternal.isLoggable(java.util.logging.Level.FINER))
             loggerExternal.entering(getClassNameLogging(), "set" + propKey, propValue);
-        props.setProperty(propKey, new Integer(propValue).toString());
+        props.setProperty(propKey, Integer.valueOf(propValue).toString());
         loggerExternal.exiting(getClassNameLogging(), "set" + propKey);
     }
 

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSourceObjectFactory.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSourceObjectFactory.java
@@ -8,6 +8,7 @@
 
 package com.microsoft.sqlserver.jdbc;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Hashtable;
 
 import javax.naming.Context;
@@ -59,7 +60,7 @@ public Object getObjectInstance(Object ref,
 
                 // Create class instance and initialize using reference.
                 Class<?> dataSourceClass = Class.forName(className);
-                Object dataSourceClassInstance = dataSourceClass.newInstance();
+                Object dataSourceClassInstance = dataSourceClass.getDeclaredConstructor().newInstance();
 
                 // If this class we created does not cast to SQLServerDataSource, then caller
                 // passed in the wrong reference to our factory.
@@ -79,6 +80,18 @@ public Object getObjectInstance(Object ref,
         catch (IllegalAccessException e) {
             SQLServerException.makeFromDriverError(null, null, SQLServerException.getErrString("R_invalidDataSourceReference"), null, true);
         }
+        catch (IllegalArgumentException e) {
+            SQLServerException.makeFromDriverError(null, null, SQLServerException.getErrString("R_invalidDataSourceReference"), null, true);
+        }
+        catch (InvocationTargetException e) {
+            SQLServerException.makeFromDriverError(null, null, SQLServerException.getErrString("R_invalidDataSourceReference"), null, true);
+        }
+        catch (NoSuchMethodException e) {
+            SQLServerException.makeFromDriverError(null, null, SQLServerException.getErrString("R_invalidDataSourceReference"), null, true);
+        }
+        catch (SecurityException e) {
+            SQLServerException.makeFromDriverError(null, null, SQLServerException.getErrString("R_invalidDataSourceReference"), null, true);
+        }
         // no chance of getting here but to keep the compiler happy
         return null;
 

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java
@@ -632,7 +632,7 @@ private Properties parseAndMergeProperties(String Url,
         // put the user properties into the connect properties
         int nTimeout = DriverManager.getLoginTimeout();
         if (nTimeout > 0) {
-            connectProperties.put(SQLServerDriverIntProperty.LOGIN_TIMEOUT.toString(), new Integer(nTimeout).toString());
+            connectProperties.put(SQLServerDriverIntProperty.LOGIN_TIMEOUT.toString(), Integer.valueOf(nTimeout).toString());
         }
 
         // Merge connectProperties (from URL) and supplied properties from user.

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSQLXML.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSQLXML.java
@@ -23,6 +23,8 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
@@ -48,8 +50,6 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
 /**
  * SQLServerSQLXML represents an XML object and implements a java.sql.SQLXML.
  */
@@ -405,12 +405,14 @@ private DOMSource getDOMSource() throws SQLException {
     private SAXSource getSAXSource() throws SQLException {
         try {
             InputSource src = new InputSource(contents);
-            XMLReader reader = XMLReaderFactory.createXMLReader();
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            SAXParser parser = factory.newSAXParser();
+            XMLReader reader = parser.getXMLReader();
             SAXSource saxSource = new SAXSource(reader, src);
             return saxSource;
 
         }
-        catch (SAXException e) {
+        catch (SAXException | ParserConfigurationException e) {
             MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_failedToParseXML"));
             Object[] msgArgs = {e.toString()};
             SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true);

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SqlVariant.java b/src/main/java/com/microsoft/sqlserver/jdbc/SqlVariant.java
@@ -62,7 +62,7 @@ static sqlVariantProbBytes valueOf(int intValue) {
 
         if (!(0 <= intValue && intValue < valuesTypes.length) || null == (tdsType = valuesTypes[intValue])) {
             MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_unknownSSType"));
-            Object[] msgArgs = {new Integer(intValue)};
+            Object[] msgArgs = {Integer.valueOf(intValue)};
             throw new IllegalArgumentException(form.format(msgArgs));
         }
 

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java
@@ -2208,7 +2208,7 @@ void execute(DTV dtv,
             if (null != bigDecimalValue) {
                 Integer inScale = dtv.getScale();
                 if (null != inScale && inScale != bigDecimalValue.scale())
-                    bigDecimalValue = bigDecimalValue.setScale(inScale, BigDecimal.ROUND_DOWN);
+                    bigDecimalValue = bigDecimalValue.setScale(inScale, RoundingMode.DOWN);
             }
 
             dtv.setValue(bigDecimalValue, JavaType.BIGDECIMAL);