Update master with latest changes

CHANGELOG.md

@@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 
+## [7.1.0] Preview Release
+### Added
+- Added support for LocalDate, LocalTime and LocalDateTime to be passed as 'type' in ResultSet.getObject() [#749](https://github.com/Microsoft/mssql-jdbc/pull/749)
+- Added support to read SQL Warnings after ResultSet is read completely [#785](https://github.com/Microsoft/mssql-jdbc/pull/785)
+
+### Fixed Issues
+- Fixed Javadoc warnings and removed obselete HTML tags from Javadocs [#786](https://github.com/Microsoft/mssql-jdbc/pull/786)
+- Fixed random JUnit failures in framework tests [#762](https://github.com/Microsoft/mssql-jdbc/pull/762)
+
+### Changed
+- Improved performance of readLong() function by unrolling loop and using bitwise operators instead of additions [#763](https://github.com/Microsoft/mssql-jdbc/pull/763)
+- Removed logging logic which caused performance degradation in AE [#773](https://github.com/Microsoft/mssql-jdbc/pull/773)
+
 ## [7.0.0] Stable Release
 ### Added
 - Added 'Automatic-Module-Name' manifest entry to jre10 Jar, allowing JDK 10 users to access driver module 'com.microsoft.sqlserver.jdbc' [#732](https://github.com/Microsoft/mssql-jdbc/pull/732)

README.md

@@ -88,7 +88,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.5.4.jre10-preview</version>
+	<version>7.1.0.jre10-preview</version>
 </dependency>
 ```
 ### Using driver as Java Module
@@ -119,7 +119,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>7.0.0.jre10</version>
+	<version>7.1.0.jre10-preview</version>
 	<scope>compile</scope>
 </dependency>
 
@@ -135,7 +135,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>7.0.0.jre10</version>
+	<version>7.1.0.jre10-preview</version>
 	<scope>compile</scope>
 </dependency>
 
@@ -183,7 +183,7 @@ Preview releases happen approximately monthly between stable releases. This give
 You can see what is going into a future release by monitoring [Milestones](https://github.com/Microsoft/mssql-jdbc/milestones) in the repository.
 
 ### Versioning convention
-Starting with 6.0, stable versions have an even minor version. For example, 6.0, 6.2, 6.4. Preview versions have an odd minor version. For example, 6.1, 6.3, 6.5.
+Starting with 6.0, stable versions have an even minor version. For example, 6.0, 6.2, 6.4, 7.0. Preview versions have an odd minor version. For example, 6.1, 6.3, 6.5, 7.1.
 
 ## Contributors 
 Special thanks to everyone who has contributed to the project.

build.gradle

@@ -10,7 +10,7 @@
 
 apply plugin: 'java'
 
-version = '7.0.0'
+version = '7.1.0'
 def jreVersion = ""
 def testOutputDir = file("build/classes/java/test")
 def archivesBaseName = 'mssql-jdbc'
@@ -27,7 +27,7 @@ allprojects {
 
 if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "build43")){
 
-	jreVersion = "jre10"
+	jreVersion = "jre10-preview"
 	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
 	jar {
 		manifest {
@@ -40,7 +40,7 @@ if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile
 
 if((hasProperty('buildProfile') && buildProfile == "build42")) {
 
-	jreVersion = "jre8"
+	jreVersion = "jre8-preview"
 	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java'
 
 	sourceCompatibility = 1.8
@@ -84,15 +84,14 @@ repositories {
 dependencies {
 	compileOnly 'com.microsoft.azure:azure-keyvault:1.0.0',
 	'com.microsoft.azure:adal4j:1.6.0'
-	testCompile 'junit:junit:4.12',
-	'org.junit.platform:junit-platform-console:1.2.0',
+	testCompile 'org.junit.platform:junit-platform-console:1.2.0',
 	'org.junit.platform:junit-platform-commons:1.2.0',
 	'org.junit.platform:junit-platform-engine:1.2.0',
 	'org.junit.platform:junit-platform-launcher:1.2.0',
 	'org.junit.platform:junit-platform-runner:1.2.0',
 	'org.junit.platform:junit-platform-surefire-provider:1.2.0',
 	'org.junit.jupiter:junit-jupiter-api:5.2.0',
 	'org.junit.jupiter:junit-jupiter-engine:5.2.0',
-	'com.zaxxer:HikariCP:3.1.0',
-	'org.apache.commons:commons-dbcp2:2.0'
-}
+	'com.zaxxer:HikariCP:3.2.0',
+	'org.apache.commons:commons-dbcp2:5.0'
+}

issue_template.md

@@ -1,23 +1,27 @@
-## Driver version or jar name
-Please tell us what the JDBC driver version or jar name is.
-
-## SQL Server version
-Please tell us what the SQL Server version is.
-
-## Client operating system
-Please tell us what oprating system the client program is running on.
-
-## Java/JVM version
-Example: java version "1.8.0", IBM J9 VM
-
-## Table schema
-Please tell us the table schema
-
-## Problem description
-Please share more details with us.
-
-## Expected behavior and actual behavior
-Please tell us what should happen and what happened instead
-
-## Repro code
-Please share repro code with us, or tell us how to reproduce the issue.
+## Driver version
+<!--- Provide the JDBC driver version (e.g. 7.0.0). -->
+
+## SQL Server version
+<!--- Provide the output of executing `SELECT @@VERSION` on your target SQL Server. -->
+
+## Client Operating System
+<!--- Provide the Operating System the client application is running on. -->
+
+## JAVA/JVM version
+<!--- Provide the JAVA/JVM version (e.g. java version "1.8.0", IBM J9 VM). -->
+
+## Table schema
+<!--- Provide the table schema. -->
+
+## Problem description
+<!--- Provide full details of the problem. -->
+1. Expected behaviour:
+2. Actual behaviour:
+3. Error message/stack trace:
+4. Any other details that can be helpful:
+
+## JDBC trace logs
+<!--- Provide the JDBC trace logs. Instructions can be found here: https://docs.microsoft.com/en-us/sql/connect/jdbc/tracing-driver-operation?view=sql-server-2017 -->
+
+## Reproduction code
+<!--- Provide standalone JAVA code that reproduces the issue, preferably raw JDBC code. -->

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>7.0.0</version>
+	<version>7.1.0</version>
 	<packaging>jar</packaging>
 
 	<name>Microsoft JDBC Driver for SQL Server</name>
@@ -59,12 +59,6 @@
 		</dependency>
 
 		<!-- dependencies for running tests -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-console</artifactId>
@@ -116,13 +110,13 @@
 		<dependency>
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
-			<version>3.1.0</version>
+			<version>3.2.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-dbcp2 </artifactId>
-			<version>2.2.0</version>
+			<version>2.5.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -131,7 +125,7 @@
 		<profile>
 			<id>build42</id>
 			<build>
-				<finalName>${project.artifactId}-${project.version}.jre8</finalName>
+				<finalName>${project.artifactId}-${project.version}.jre8-preview</finalName>
 				<plugins>
 					<plugin>
 						<artifactId>maven-compiler-plugin</artifactId>
@@ -164,7 +158,7 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<build>
-				<finalName>${project.artifactId}-${project.version}.jre10</finalName>
+				<finalName>${project.artifactId}-${project.version}.jre10-preview</finalName>
 				<plugins>
 					<plugin>
 						<artifactId>maven-compiler-plugin</artifactId>

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

@@ -3629,14 +3629,7 @@ void writeLong(long value) throws SQLServerException {
                     ((Buffer) logBuffer).position(((Buffer) logBuffer).position() + 8);
             }
         } else {
-            valueBytes[0] = (byte) ((value >> 0) & 0xFF);
-            valueBytes[1] = (byte) ((value >> 8) & 0xFF);
-            valueBytes[2] = (byte) ((value >> 16) & 0xFF);
-            valueBytes[3] = (byte) ((value >> 24) & 0xFF);
-            valueBytes[4] = (byte) ((value >> 32) & 0xFF);
-            valueBytes[5] = (byte) ((value >> 40) & 0xFF);
-            valueBytes[6] = (byte) ((value >> 48) & 0xFF);
-            valueBytes[7] = (byte) ((value >> 56) & 0xFF);
+            Util.writeLong(value, valueBytes, 0);
             writeWrappedBytes(valueBytes, 8);
         }
     }

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

@@ -7,7 +7,7 @@
 
 final class SQLJdbcVersion {
     static final int major = 7;
-    static final int minor = 0;
+    static final int minor = 1;
     static final int patch = 0;
     static final int build = 0;
 }

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

@@ -99,8 +99,7 @@ byte[] encryptData(byte[] plainText) throws SQLServerException {
      * @throws SQLServerException
      */
     protected byte[] encryptData(byte[] plainText, boolean hasAuthenticationTag) throws SQLServerException {
-        aeLogger.entering(SQLServerAeadAes256CbcHmac256Algorithm.class.getName(),
-                Thread.currentThread().getStackTrace()[1].getMethodName(), "Encrypting data.");
+        aeLogger.entering(SQLServerAeadAes256CbcHmac256Algorithm.class.getName(), "encryptData", "Encrypting data.");
         // we will generate this initialization vector based whether
         // this encryption type is deterministic
         assert (plainText != null);
@@ -181,16 +180,14 @@ protected byte[] encryptData(byte[] plainText, boolean hasAuthenticationTag) thr
             throw new SQLServerException(this, form.format(msgArgs), null, 0, false);
         }
 
-        aeLogger.exiting(SQLServerAeadAes256CbcHmac256Algorithm.class.getName(),
-                Thread.currentThread().getStackTrace()[1].getMethodName(), "Data encrypted.");
+        aeLogger.exiting(SQLServerAeadAes256CbcHmac256Algorithm.class.getName(), "encryptData", "Data encrypted.");
         return outBuffer;
 
     }
 
     @Override
     byte[] decryptData(byte[] cipherText) throws SQLServerException {
         return decryptData(cipherText, true);
-
     }
 
     /**
@@ -289,8 +286,7 @@ private byte[] decryptData(byte[] cipherText, boolean hasAuthenticationTag) thro
      * @throws SQLServerException
      */
     private byte[] decryptData(byte[] iv, byte[] cipherText, int offset, int count) throws SQLServerException {
-        aeLogger.entering(SQLServerAeadAes256CbcHmac256Algorithm.class.getName(),
-                Thread.currentThread().getStackTrace()[1].getMethodName(), "Decrypting data.");
+        aeLogger.entering(SQLServerAeadAes256CbcHmac256Algorithm.class.getName(), "decryptData", "Decrypting data.");
         assert (cipherText != null);
         assert (iv != null);
         byte[] plainText = null;
@@ -299,7 +295,6 @@ private byte[] decryptData(byte[] iv, byte[] cipherText, int offset, int count)
         IvParameterSpec ivector = new IvParameterSpec(iv);
         Cipher decryptCipher;
         try {
-            // AES encryption CBC mode and PKCS5 padding
             decryptCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
             decryptCipher.init(Cipher.DECRYPT_MODE, skeySpec, ivector);
             plainText = decryptCipher.doFinal(cipherText, offset, count);
@@ -311,8 +306,7 @@ private byte[] decryptData(byte[] iv, byte[] cipherText, int offset, int count)
             throw new SQLServerException(this, form.format(msgArgs), null, 0, false);
         }
 
-        aeLogger.exiting(SQLServerAeadAes256CbcHmac256Algorithm.class.getName(),
-                Thread.currentThread().getStackTrace()[1].getMethodName(), "Data decrypted.");
+        aeLogger.exiting(SQLServerAeadAes256CbcHmac256Algorithm.class.getName(), "decryptData", "Data decrypted.");
         return plainText;
 
     }

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

@@ -191,7 +191,7 @@ private CertificateDetails getCertificateDetailsByAlias(KeyStore keyStore, Strin
     public byte[] encryptColumnEncryptionKey(String masterKeyPath, String encryptionAlgorithm,
             byte[] plainTextColumnEncryptionKey) throws SQLServerException {
         javaKeyStoreLogger.entering(SQLServerColumnEncryptionJavaKeyStoreProvider.class.getName(),
-                Thread.currentThread().getStackTrace()[1].getMethodName(), "Encrypting Column Encryption Key.");
+                "encryptColumnEncryptionKey", "Encrypting Column Encryption Key.");
 
         byte[] version = KeyStoreProviderCommon.version;
         KeyStoreProviderCommon.validateNonEmptyMasterKeyPath(masterKeyPath);
@@ -257,8 +257,7 @@ public byte[] encryptColumnEncryptionKey(String masterKeyPath, String encryption
         System.arraycopy(signedHash, 0, encryptedColumnEncryptionKey, currentIndex, signedHash.length);
 
         javaKeyStoreLogger.exiting(SQLServerColumnEncryptionJavaKeyStoreProvider.class.getName(),
-                Thread.currentThread().getStackTrace()[1].getMethodName(),
-                "Finished encrypting Column Encryption Key.");
+                "encryptColumnEncryptionKey", "Finished encrypting Column Encryption Key.");
         return encryptedColumnEncryptionKey;
 
     }

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

@@ -575,7 +575,7 @@ final void doExecutePreparedStatement(PrepStmtExecCmd command) throws SQLServerE
 
                 ensureExecuteResultsReader(command.startResponse(getIsResponseBufferingAdaptive()));
                 startResults();
-                getNextResult();
+                getNextResult(true);
             } catch (SQLException e) {
                 if (retryBasedOnFailedReuseOfCachedHandle(e, attempt, needsPrepare, false))
                     continue;
@@ -2763,7 +2763,7 @@ final void doExecutePreparedStatementBatch(PrepStmtBatchExecCmd batchCommand) th
                                 // Get the first result from the batch. If there is no result for this batch
                                 // then bail, leaving EXECUTE_FAILED in the current and remaining slots of
                                 // the update count array.
-                                if (!getNextResult())
+                                if (!getNextResult(true))
                                     return;
 
                                 // If the result is a ResultSet (rather than an update count) then throw an

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

@@ -1057,6 +1057,12 @@ public boolean next() throws SQLServerException {
         if (UNKNOWN_ROW_COUNT == rowCount)
             rowCount = currentRow;
 
+        // Read SQL Warnings at the end of ResultSet
+        if (stmt.resultsReader().peekTokenType() == TDS.TDS_MSG) {
+            stmt.startResults();
+            stmt.getNextResult(false);
+        }
+
         currentRow = AFTER_LAST_ROW;
         loggerExternal.exiting(getClassNameLogging(), "next", false);
         return false;
@@ -2375,6 +2381,23 @@ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
             returnValue = getTime(columnIndex);
         } else if (type == java.sql.Timestamp.class) {
             returnValue = getTimestamp(columnIndex);
+        } else if (type == java.time.LocalDateTime.class || type == java.time.LocalDate.class
+                || type == java.time.LocalTime.class) {
+            java.sql.Timestamp ts = getTimestamp(columnIndex,
+                    Calendar.getInstance(java.util.TimeZone.getTimeZone("UTC")));
+            if (ts == null) {
+                returnValue = null;
+            } else {
+                java.time.LocalDateTime ldt = java.time.LocalDateTime.ofInstant(ts.toInstant(),
+                        java.time.ZoneId.of("UTC"));
+                if (type == java.time.LocalDateTime.class) {
+                    returnValue = ldt;
+                } else if (type == java.time.LocalDate.class) {
+                    returnValue = ldt.toLocalDate();
+                } else {
+                    returnValue = ldt.toLocalTime();
+                }
+            }
         } else if (type == microsoft.sql.DateTimeOffset.class) {
             returnValue = getDateTimeOffset(columnIndex);
         } else if (type == UUID.class) {

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

@@ -96,6 +96,8 @@ abstract class SQLServerSpatialDatatype {
      * 
      * @param noZM
      *        flag to indicate if Z and M coordinates should be included
+     * @param type
+     *        Type of Spatial Datatype (Geometry/Geography)
      */
     protected void serializeToWkb(boolean noZM, SQLServerSpatialDatatype type) {
         ByteBuffer buf = ByteBuffer.allocate(determineWkbCapacity());
@@ -172,6 +174,10 @@ protected void serializeToWkb(boolean noZM, SQLServerSpatialDatatype type) {
      * Deserializes the buffer (that contains WKB representation of Geometry/Geography data), and stores it into
      * multiple corresponding data structures.
      * 
+     * @param type
+     *        Type of Spatial Datatype (Geography/Geometry)
+     * @throws SQLServerException
+     *         if an Exception occurs
      */
     protected void parseWkb(SQLServerSpatialDatatype type) throws SQLServerException {
         srid = readInt();