Merge pull request #479 from Microsoft/dev

merge dev to master for 6.3.2

CHANGELOG.md

@@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 
+## [6.3.2] Preview Release
+### Added
+- Added new connection property: sslProtocol [#422](https://github.com/Microsoft/mssql-jdbc/pull/422)
+- Added "slow" tag to long running tests [#461](https://github.com/Microsoft/mssql-jdbc/pull/461)
+
+### Fixed Issues 
+- Fixed some error messages [#452](https://github.com/Microsoft/mssql-jdbc/pull/452) & [#459](https://github.com/Microsoft/mssql-jdbc/pull/459)
+- Fixed statement leaks [#455](https://github.com/Microsoft/mssql-jdbc/pull/455)
+- Fixed an issue regarding to loginTimeout with TLS [#456](https://github.com/Microsoft/mssql-jdbc/pull/456)
+- Fixed sql_variant issue with String type [#442](https://github.com/Microsoft/mssql-jdbc/pull/442)
+- Fixed issue with throwing error message for unsupported datatype [#450](https://github.com/Microsoft/mssql-jdbc/pull/450)
+- Fixed issue that initial batchException was not thrown [#458](https://github.com/Microsoft/mssql-jdbc/pull/458)
+
+### Changed
+- Changed sendStringParameterAsUnicode to impact set/update null [#445](https://github.com/Microsoft/mssql-jdbc/pull/445)
+- Removed connection property: fipsProvider [#460](https://github.com/Microsoft/mssql-jdbc/pull/460)
+- Replaced for and while loops with foeach loops [#421](https://github.com/Microsoft/mssql-jdbc/pull/421)
+- Replaced explicit types with the diamond operator [#468](https://github.com/Microsoft/mssql-jdbc/pull/468) & [#420](https://github.com/Microsoft/mssql-jdbc/pull/420)
+
 ## [6.3.1] Preview Release
 ### Added
 - Added support for datetime/smallDatetime in TVP [#435](https://github.com/Microsoft/mssql-jdbc/pull/435)

README.md

@@ -90,7 +90,7 @@ To get the latest preview version of the driver, add the following to your POM f
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.3.1.jre8-preview-v2</version>
+	<version>6.3.2.jre8-preview</version>
 </dependency>
 ```
 
@@ -120,7 +120,7 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.3.1.jre8-preview-v2</version>
+	<version>6.3.2.jre8-preview</version>
 	<scope>compile</scope>
 </dependency>
 

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.3.2-SNAPSHOT</version>
+	<version>6.3.2</version>
 
 	<packaging>jar</packaging>
 

src/main/java/com/microsoft/sqlserver/jdbc/AE.java

@@ -88,7 +88,7 @@ byte[] getCekMdVersion() {
         cekId = 0;
         cekVersion = 0;
         cekMdVersion = null;
-        columnEncryptionKeyValues = new ArrayList<EncryptionKeyInfo>();
+        columnEncryptionKeyValues = new ArrayList<>();
     }
 
     int getSize() {

src/main/java/com/microsoft/sqlserver/jdbc/Column.java

@@ -337,7 +337,7 @@ else if (jdbcType.isBinary()) {
         // to the server as Unicode rather than MBCS. This is accomplished here by re-tagging
         // the value with the appropriate corresponding Unicode type.
         if ((null != cryptoMetadata) && (con.sendStringParametersAsUnicode())
-                && (JavaType.STRING == javaType || JavaType.READER == javaType || JavaType.CLOB == javaType)) {
+                && (JavaType.STRING == javaType || JavaType.READER == javaType || JavaType.CLOB == javaType || JavaType.OBJECT == javaType)) {
             jdbcType = getSSPAUJDBCType(jdbcType);
         }
 

src/main/java/com/microsoft/sqlserver/jdbc/DDC.java

@@ -922,7 +922,8 @@ static final Object convertTemporalToObject(JDBCType jdbcType,
         }
         // Convert the calendar value (in local time) to the desired Java object type.
         switch (jdbcType.category) {
-            case BINARY: {
+            case BINARY:
+            case SQL_VARIANT: {
                 switch (ssType) {
                     case DATE: {
                         // Per JDBC spec, the time part of java.sql.Date values is initialized to midnight

src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java

@@ -382,7 +382,7 @@ private GetterConversion(SSType.Category from,
             this.to = to;
         }
 
-        private static final EnumMap<SSType.Category, EnumSet<JDBCType.Category>> conversionMap = new EnumMap<SSType.Category, EnumSet<JDBCType.Category>>(
+        private static final EnumMap<SSType.Category, EnumSet<JDBCType.Category>> conversionMap = new EnumMap<>(
                 SSType.Category.class);
 
         static {
@@ -776,7 +776,7 @@ private SetterConversionAE(JavaType from,
             this.to = to;
         }
 
-        private static final EnumMap<JavaType, EnumSet<JDBCType>> setterConversionAEMap = new EnumMap<JavaType, EnumSet<JDBCType>>(JavaType.class);
+        private static final EnumMap<JavaType, EnumSet<JDBCType>> setterConversionAEMap = new EnumMap<>(JavaType.class);
 
         static {
             for (JavaType javaType : JavaType.values())
@@ -1086,7 +1086,7 @@ private SetterConversion(JDBCType.Category from,
             this.to = to;
         }
 
-        private static final EnumMap<JDBCType.Category, EnumSet<JDBCType.Category>> conversionMap = new EnumMap<JDBCType.Category, EnumSet<JDBCType.Category>>(
+        private static final EnumMap<JDBCType.Category, EnumSet<JDBCType.Category>> conversionMap = new EnumMap<>(
                 JDBCType.Category.class);
 
         static {
@@ -1305,7 +1305,7 @@ private UpdaterConversion(JDBCType.Category from,
             this.to = to;
         }
 
-        private static final EnumMap<JDBCType.Category, EnumSet<SSType.Category>> conversionMap = new EnumMap<JDBCType.Category, EnumSet<SSType.Category>>(
+        private static final EnumMap<JDBCType.Category, EnumSet<SSType.Category>> conversionMap = new EnumMap<>(
                 JDBCType.Category.class);
 
         static {
@@ -1616,7 +1616,7 @@ private NormalizationAE(JDBCType from,
             this.to = to;
         }
 
-        private static final EnumMap<JDBCType, EnumSet<SSType>> normalizationMapAE = new EnumMap<JDBCType, EnumSet<SSType>>(JDBCType.class);
+        private static final EnumMap<JDBCType, EnumSet<SSType>> normalizationMapAE = new EnumMap<>(JDBCType.class);
 
         static {
             for (JDBCType jdbcType : JDBCType.values())

src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java

@@ -13,7 +13,7 @@
 
 final class FailoverMapSingleton {
     private static int INITIALHASHMAPSIZE = 5;
-    private static HashMap<String, FailoverInfo> failoverMap = new HashMap<String, FailoverInfo>(INITIALHASHMAPSIZE);
+    private static HashMap<String, FailoverInfo> failoverMap = new HashMap<>(INITIALHASHMAPSIZE);
 
     private FailoverMapSingleton() {
         /* hide the constructor to stop the instantiation of this class. */}

src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java

@@ -1579,7 +1579,7 @@ void enableSSL(String host,
 
         boolean isFips = false;
         String trustStoreType = null;
-        String fipsProvider = null;
+        String sslProtocol = null;
 
         // If anything in here fails, terminate the connection and throw an exception
         try {
@@ -1597,11 +1597,11 @@ void enableSSL(String host,
                 trustStoreType = SQLServerDriverStringProperty.TRUST_STORE_TYPE.getDefaultValue();
             }
 
-            fipsProvider = con.activeConnectionProperties.getProperty(SQLServerDriverStringProperty.FIPS_PROVIDER.toString());
             isFips = Boolean.valueOf(con.activeConnectionProperties.getProperty(SQLServerDriverBooleanProperty.FIPS.toString())); 
+            sslProtocol = con.activeConnectionProperties.getProperty(SQLServerDriverStringProperty.SSL_PROTOCOL.toString());
 
             if (isFips) {
-                validateFips(fipsProvider, trustStoreType, trustStoreFileName);
+                validateFips(trustStoreType, trustStoreFileName);
             }
 
             assert TDS.ENCRYPT_OFF == con.getRequestedEncryptionLevel() || // Login only SSL
@@ -1647,12 +1647,8 @@ void enableSSL(String host,
                     if (logger.isLoggable(Level.FINEST))
                         logger.finest(toString() + " Finding key store interface");
 
-                    if (isFips) {
-                        ks = KeyStore.getInstance(trustStoreType, fipsProvider);
-                    }
-                    else {
-                        ks = KeyStore.getInstance(trustStoreType);
-                    }
+
+                    ks = KeyStore.getInstance(trustStoreType);
                     ksProvider = ks.getProvider();
 
                     // Next, load up the trust store file from the specified location.
@@ -1728,7 +1724,7 @@ void enableSSL(String host,
             if (logger.isLoggable(Level.FINEST))
                 logger.finest(toString() + " Getting TLS or better SSL context");
 
-            sslContext = SSLContext.getInstance("TLS");
+            sslContext = SSLContext.getInstance(sslProtocol);
             sslContextProvider = sslContext.getProvider();
 
             if (logger.isLoggable(Level.FINEST))
@@ -1745,8 +1741,7 @@ void enableSSL(String host,
                 logger.finest(toString() + " Creating SSL socket");
 
             sslSocket = (SSLSocket) sslContext.getSocketFactory().createSocket(proxySocket, host, port, false); // don't close proxy when SSL socket
-                                                                                                                // is closed
-
+                                                                                                                // is closed     
             // At long last, start the SSL handshake ...
             if (logger.isLoggable(Level.FINER))
                 logger.finer(toString() + " Starting SSL handshake");
@@ -1827,57 +1822,40 @@ void enableSSL(String host,
      * Valid FIPS settings:
      * <LI>Encrypt should be true
      * <LI>trustServerCertificate should be false
-     * <LI>if certificate is not installed FIPSProvider & TrustStoreType should be present.
+     * <LI>if certificate is not installed TrustStoreType should be present.
      * 
-     * @param fipsProvider
-     *            FIPS Provider
      * @param trustStoreType
      * @param trustStoreFileName
      * @throws SQLServerException
      * @since 6.1.4
      */
-    private void validateFips(final String fipsProvider,
-            final String trustStoreType,
+    private void validateFips(final String trustStoreType,
             final String trustStoreFileName) throws SQLServerException {
         boolean isValid = false;
         boolean isEncryptOn;
         boolean isValidTrustStoreType;
         boolean isValidTrustStore;
         boolean isTrustServerCertificate;
-        boolean isValidFipsProvider;
 
         String strError = SQLServerException.getErrString("R_invalidFipsConfig");
 
         isEncryptOn = (TDS.ENCRYPT_ON == con.getRequestedEncryptionLevel());
 
-        // Here different FIPS provider supports different KeyStore type along with different JVM Implementation.
-        isValidFipsProvider = !StringUtils.isEmpty(fipsProvider);
         isValidTrustStoreType = !StringUtils.isEmpty(trustStoreType);
         isValidTrustStore = !StringUtils.isEmpty(trustStoreFileName);
         isTrustServerCertificate = con.trustServerCertificate();
 
-        if (isEncryptOn && !isTrustServerCertificate) {
-            if (logger.isLoggable(Level.FINER))
-                logger.finer(toString() + " Found parameters are encrypt is true & trustServerCertificate false");
-
+        if (isEncryptOn && !isTrustServerCertificate) {          
             isValid = true;
-
             if (isValidTrustStore) {
-                // In case of valid trust store we need to check fipsProvider and TrustStoreType.
-                if (!isValidFipsProvider || !isValidTrustStoreType) {
-                    isValid = false;
-                    strError = SQLServerException.getErrString("R_invalidFipsProviderConfig");
-
+                // In case of valid trust store we need to check TrustStoreType.
+                if (!isValidTrustStoreType) {
+                    isValid = false;               
                     if (logger.isLoggable(Level.FINER))
-                        logger.finer(toString() + " FIPS provider & TrustStoreType should pass with TrustStore.");
+                        logger.finer(toString() + "TrustStoreType is required alongside with TrustStore.");
                 }
-                if (logger.isLoggable(Level.FINER))
-                    logger.finer(toString() + " Found FIPS parameters seems to be valid.");
             }
         }
-        else {
-            strError = SQLServerException.getErrString("R_invalidFipsEncryptConfig");
-        }
 
         if (!isValid) {
             throw new SQLServerException(strError, null, 0, null);
@@ -2338,8 +2316,8 @@ else if (!useTnir) {
                 findSocketUsingJavaNIO(inetAddrs, portNumber, timeoutInMilliSeconds);
             }
             else {
-                LinkedList<Inet4Address> inet4Addrs = new LinkedList<Inet4Address>();
-                LinkedList<Inet6Address> inet6Addrs = new LinkedList<Inet6Address>();
+                LinkedList<Inet4Address> inet4Addrs = new LinkedList<>();
+                LinkedList<Inet6Address> inet6Addrs = new LinkedList<>();
 
                 for (InetAddress inetAddr : inetAddrs) {
                     if (inetAddr instanceof Inet4Address) {
@@ -2467,13 +2445,13 @@ private void findSocketUsingJavaNIO(InetAddress[] inetAddrs,
         assert inetAddrs.length != 0 : "Number of inetAddresses should not be zero in this function";
 
         Selector selector = null;
-        LinkedList<SocketChannel> socketChannels = new LinkedList<SocketChannel>();
+        LinkedList<SocketChannel> socketChannels = new LinkedList<>();
         SocketChannel selectedChannel = null;
 
         try {
             selector = Selector.open();
 
-            for (int i = 0; i < inetAddrs.length; i++) {
+            for (InetAddress inetAddr : inetAddrs) {
                 SocketChannel sChannel = SocketChannel.open();
                 socketChannels.add(sChannel);
 
@@ -2484,10 +2462,10 @@ private void findSocketUsingJavaNIO(InetAddress[] inetAddrs,
                 int ops = SelectionKey.OP_CONNECT;
                 SelectionKey key = sChannel.register(selector, ops);
 
-                sChannel.connect(new InetSocketAddress(inetAddrs[i], portNumber));
+                sChannel.connect(new InetSocketAddress(inetAddr, portNumber));
 
                 if (logger.isLoggable(Level.FINER))
-                    logger.finer(this.toString() + " initiated connection to address: " + inetAddrs[i] + ", portNumber: " + portNumber);
+                    logger.finer(this.toString() + " initiated connection to address: " + inetAddr + ", portNumber: " + portNumber);
             }
 
             long timerNow = System.currentTimeMillis();
@@ -2646,8 +2624,8 @@ private void findSocketUsingThreading(LinkedList<Inet6Address> inetAddrs,
 
         assert inetAddrs.isEmpty() == false : "Number of inetAddresses should not be zero in this function";
 
-        LinkedList<Socket> sockets = new LinkedList<Socket>();
-        LinkedList<SocketConnector> socketConnectors = new LinkedList<SocketConnector>();
+        LinkedList<Socket> sockets = new LinkedList<>();
+        LinkedList<SocketConnector> socketConnectors = new LinkedList<>();
 
         try {
 
@@ -5037,13 +5015,11 @@ void writeTVPColumnMetaData(TVP value) throws SQLServerException {
         writeShort((short) value.getTVPColumnCount());
 
         Map<Integer, SQLServerMetaData> columnMetadata = value.getColumnMetadata();
-        Iterator<Entry<Integer, SQLServerMetaData>> columnsIterator = columnMetadata.entrySet().iterator();
         /*
          * TypeColumnMetaData = UserType Flags TYPE_INFO ColName ;
          */
 
-        while (columnsIterator.hasNext()) {
-            Map.Entry<Integer, SQLServerMetaData> pair = columnsIterator.next();
+        for (Entry<Integer, SQLServerMetaData> pair : columnMetadata.entrySet()) {
             JDBCType jdbcType = JDBCType.of(pair.getValue().javaSqlType);
             boolean useServerDefault = pair.getValue().useServerDefault;
             // ULONG ; UserType of column
@@ -5118,13 +5094,12 @@ void writeTVPColumnMetaData(TVP value) throws SQLServerException {
                     writeByte(TDSType.NVARCHAR.byteValue());
                     isShortValue = (2L * pair.getValue().precision) <= DataTypes.SHORT_VARTYPE_MAX_BYTES;
                     // Use PLP encoding on Yukon and later with long values
-                    if (!isShortValue)	// PLP
+                    if (!isShortValue)    // PLP
                     {
                         // Handle Yukon v*max type header here.
                         writeShort((short) 0xFFFF);
                         con.getDatabaseCollation().writeCollation(this);
-                    }
-                    else	// non PLP
+                    } else    // non PLP
                     {
                         writeShort((short) DataTypes.SHORT_VARTYPE_MAX_BYTES);
                         con.getDatabaseCollation().writeCollation(this);
@@ -5138,16 +5113,16 @@ void writeTVPColumnMetaData(TVP value) throws SQLServerException {
                     writeByte(TDSType.BIGVARBINARY.byteValue());
                     isShortValue = pair.getValue().precision <= DataTypes.SHORT_VARTYPE_MAX_BYTES;
                     // Use PLP encoding on Yukon and later with long values
-                    if (!isShortValue)	// PLP
+                    if (!isShortValue)    // PLP
                         // Handle Yukon v*max type header here.
                         writeShort((short) 0xFFFF);
-                    else	// non PLP
+                    else    // non PLP
                         writeShort((short) DataTypes.SHORT_VARTYPE_MAX_BYTES);
                     break;
                 case SQL_VARIANT:
                     writeByte(TDSType.SQL_VARIANT.byteValue());
                     writeInt(TDS.SQL_VARIANT_LENGTH);// write length of sql variant 8009
-                    
+
                     break;
 
                 default:
@@ -5168,7 +5143,7 @@ void writeTvpOrderUnique(TVP value) throws SQLServerException {
 
         Map<Integer, SQLServerMetaData> columnMetadata = value.getColumnMetadata();
         Iterator<Entry<Integer, SQLServerMetaData>> columnsIterator = columnMetadata.entrySet().iterator();
-        LinkedList<TdsOrderUnique> columnList = new LinkedList<TdsOrderUnique>();
+        LinkedList<TdsOrderUnique> columnList = new LinkedList<>();
 
         while (columnsIterator.hasNext()) {
             byte flags = 0;

src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java

@@ -23,9 +23,9 @@ public class JaasConfiguration extends Configuration {
 
     private static AppConfigurationEntry[] generateDefaultConfiguration() {
         if (Util.isIBM()) {
-            Map<String, String> confDetailsWithoutPassword = new HashMap<String, String>();
+            Map<String, String> confDetailsWithoutPassword = new HashMap<>();
             confDetailsWithoutPassword.put("useDefaultCcache", "true");
-            Map<String, String> confDetailsWithPassword = new HashMap<String, String>();
+            Map<String, String> confDetailsWithPassword = new HashMap<>();
             // We generated a two configurations fallback that is suitable for password and password-less authentication
             // See https://www.ibm.com/support/knowledgecenter/SSYKE2_8.0.0/com.ibm.java.security.component.80.doc/security-component/jgssDocs/jaas_login_user.html
             final String ibmLoginModule = "com.ibm.security.auth.module.Krb5LoginModule";
@@ -34,7 +34,7 @@ private static AppConfigurationEntry[] generateDefaultConfiguration() {
                     new AppConfigurationEntry(ibmLoginModule, AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT, confDetailsWithPassword)};
         }
         else {
-            Map<String, String> confDetails = new HashMap<String, String>();
+            Map<String, String> confDetails = new HashMap<>();
             confDetails.put("useTicketCache", "true");
             return new AppConfigurationEntry[] {new AppConfigurationEntry("com.sun.security.auth.module.Krb5LoginModule",
                     AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, confDetails)};