Formatted the check that assigns AE version to correctly assign versi…

…on to protocol (#1805)

* Potential fix for bamboo issues

* Changed SQLServerConnection to fix all protocols being assigned to AEV1

* Changed SQLServerConnection::5682 back to working state

* Added a missing pair of parantheses

* Added version change (already committed to main) to prevent pipeline errors

* Formatting plus an explanation comment

* More formatting

* hopefully the final formatting change

* Simplified the AE Version check

* Removed check for if protocol is empty, since it can never be that

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

@@ -8,7 +8,7 @@
 final class SQLJdbcVersion {
     static final int major = 11;
     static final int minor = 1;
-    static final int patch = 0;
+    static final int patch = 1;
     static final int build = 0;
     /*
      * Used to load mssql-jdbc_auth DLL.

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

@@ -4554,8 +4554,11 @@ int writeAEFeatureRequest(boolean write, /* if false just calculates the length
         if (write) {
             tdsWriter.writeByte(TDS.TDS_FEATURE_EXT_AE); // FEATUREEXT_TC
             tdsWriter.writeInt(1); // length of version
-            if (null == enclaveAttestationUrl || enclaveAttestationUrl.isEmpty() || (enclaveAttestationProtocol != null
-                    && !enclaveAttestationProtocol.equalsIgnoreCase(AttestationProtocol.NONE.toString()))) {
+
+            // For protocol = HGS,AAS, at this point it can only have a valid URL, therefore is V2
+            // For protocol = NONE, it is V2 regardless
+            // For protocol = null, we always want V1
+            if (null == enclaveAttestationProtocol) {
                 tdsWriter.writeByte(TDS.COLUMNENCRYPTION_VERSION1);
             } else {
                 tdsWriter.writeByte(TDS.COLUMNENCRYPTION_VERSION2);