Added a reference to enclave retry to variables added in SQLServerConnection, for better clarity.

Author: Jeffery-Wasty

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

@@ -855,9 +855,9 @@ boolean getServerSupportsColumnEncryption() {
     ColumnEncryptionVersion getServerColumnEncryptionVersion() {
         return serverColumnEncryptionVersion;
     }
-    
-    /** whether the server supports retrying a connection on failure */
-    private boolean serverSupportsRetry = false;
+
+    /** whether the server supports retrying an invalid enclave connection */
+    private boolean serverSupportsEnclaveRetry = false;
 
     /** whether server supports data classification */
     private boolean serverSupportsDataClassification = false;
@@ -5711,11 +5711,11 @@ private void onFeatureExtAck(byte featureId, byte[] data) throws SQLServerExcept
                     if (aeVersion < TDS.COLUMNENCRYPTION_VERSION2) {
                         throw new SQLServerException(SQLServerException.getErrString("R_enclaveNotSupported"), null);
                     } else {
-                        serverColumnEncryptionVersion = aeVersion == TDS.COLUMNENCRYPTION_VERSION3 
-                            ? ColumnEncryptionVersion.AE_V3 : ColumnEncryptionVersion.AE_V2;
+                        serverColumnEncryptionVersion = aeVersion == TDS.COLUMNENCRYPTION_VERSION3 ? ColumnEncryptionVersion.AE_V3
+                                                                                                   : ColumnEncryptionVersion.AE_V2;
                         enclaveType = new String(data, 2, data.length - 2, UTF_16LE);
                     }
-                    serverSupportsRetry = aeVersion == TDS.COLUMNENCRYPTION_VERSION3;
+                    serverSupportsEnclaveRetry = aeVersion == TDS.COLUMNENCRYPTION_VERSION3;
 
                     if (!EnclaveType.isValidEnclaveType(enclaveType)) {
                         MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_enclaveTypeInvalid"));
@@ -7678,9 +7678,9 @@ final synchronized void removeOpenStatement(ISQLServerStatement st) {
     boolean isAEv2() {
         return (aeVersion >= TDS.COLUMNENCRYPTION_VERSION2);
     }
-    
-    boolean isRetrySupported() {
-        return serverSupportsRetry;
+
+    boolean doesServerSupportEnclaveRetry() {
+        return serverSupportsEnclaveRetry;
     }
 
     /** Enclave provider */

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

@@ -621,7 +621,7 @@ final void doExecutePreparedStatement(PrepStmtExecCmd command) throws SQLServerE
             } catch (SQLException e) {
                 if (retryBasedOnFailedReuseOfCachedHandle(e, attempt, needsPrepare, false)) {
                     continue;
-                } else if (!inRetry && connection.isRetrySupported()) {
+                } else if (!inRetry && connection.doesServerSupportEnclaveRetry()) {
                     // We only want to retry once, so no retrying if we're already in the second pass.
                     // If we are AE_v3, remove the failed entry and try again.
                     ParameterMetaDataCache.removeCacheEntry(this, connection, preparedSQL);

src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java

@@ -135,7 +135,7 @@ public void testRetryWithSecureCache() throws Exception {
             TestUtils.dropTableIfExists(CHAR_TABLE_AE, stmt);
             createTable(CHAR_TABLE_AE, cekAkv, charTable);
             populateCharNormalCase(values);
-            if (TestUtils.isRetrySupported(con)) {
+            if (TestUtils.doesServerSupportEnclaveRetry(con)) {
                 testAlterColumnEncryption((SQLServerStatement) stmt, CHAR_TABLE_AE, charTable, cekAkv);
             }
             populateCharNormalCase(values);

src/test/java/com/microsoft/sqlserver/jdbc/TestUtils.java

@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
+
 import com.microsoft.sqlserver.testframework.AbstractSQLGenerator;
 import com.microsoft.sqlserver.testframework.PrepUtil;
 import com.microsoft.sqlserver.testframework.sqlType.SqlBigInt;
@@ -134,14 +135,14 @@ public static boolean isAzureMI(Connection con) {
     public static boolean isAEv2(Connection con) {
         return ((SQLServerConnection) con).isAEv2();
     }
-    
+
     /**
-    * Returns whether the server supports retrying a connection on failure
-    * 
-    * @see com.microsoft.sqlserver.jdbc.SQLServerConnection#isRetrySupported()
-    */
-    public static boolean isRetrySupported(Connection con) {
-        return ((SQLServerConnection) con).isRetrySupported();
+     * Returns whether the server supports retrying a connection on failure
+     * 
+     * @see com.microsoft.sqlserver.jdbc.SQLServerConnection#doesServerSupportEnclaveRetry()
+     */
+    public static boolean doesServerSupportEnclaveRetry(Connection con) {
+        return ((SQLServerConnection) con).doesServerSupportEnclaveRetry();
     }
 
     /**