SCBC-469: Scala incorrectly declaring support for transactions protocol 2.1

Declare support for protocol 2.1 or 2.0 based on
the provided extensions.

Change-Id: I45da0bb1e294d9232ee6c0244776ec578c208445
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/213605
Reviewed-by: Aaliya Haque <[email protected]>
Tested-by: Build Bot <[email protected]>

Author: programmatix

core-io/src/main/java/com/couchbase/client/core/transaction/forwards/CoreTransactionsSupportedExtensions.java

@@ -16,6 +16,7 @@
 package com.couchbase.client.core.transaction.forwards;
 
 import com.couchbase.client.core.annotation.Stability;
+import com.couchbase.client.core.util.CbCollections;
 
 import java.util.Arrays;
 import java.util.Set;
@@ -31,12 +32,27 @@
 public class CoreTransactionsSupportedExtensions {
     public static final CoreTransactionsSupportedExtensions NONE = from();
     public static final CoreTransactionsSupportedExtensions ALL = from(CoreTransactionsExtension.values());
+    private static final Set<CoreTransactionsExtension> ALL_2_1 = CbCollections.setOf(CoreTransactionsExtension.EXT_TRANSACTION_ID,
+            CoreTransactionsExtension.EXT_TIME_OPT_UNSTAGING,
+            CoreTransactionsExtension.EXT_BINARY_METADATA,
+            CoreTransactionsExtension.EXT_CUSTOM_METADATA_COLLECTION,
+            CoreTransactionsExtension.EXT_QUERY,
+            CoreTransactionsExtension.EXT_STORE_DURABILITY,
+            CoreTransactionsExtension.BF_CBD_3838,
+            CoreTransactionsExtension.BF_CBD_3787,
+            CoreTransactionsExtension.BF_CBD_3705,
+            CoreTransactionsExtension.BF_CBD_3794,
+            CoreTransactionsExtension.EXT_REMOVE_COMPLETED,
+            CoreTransactionsExtension.EXT_ALL_KV_COMBINATIONS,
+            CoreTransactionsExtension.EXT_UNKNOWN_ATR_STATES,
+            CoreTransactionsExtension.BF_CBD_3791,
+            CoreTransactionsExtension.EXT_SINGLE_QUERY);
 
     public final Set<CoreTransactionsExtension> extensions;
     private final Set<String> extensionIds;
 
-    public final int protocolMajor = 2;
-    public final int protocolMinor = 1;
+    private final int protocolMajor = 2;
+    private final int protocolMinor;
 
     private CoreTransactionsSupportedExtensions(Iterable<CoreTransactionsExtension> extensions) {
         this.extensions = unmodifiableSet(newEnumSet(CoreTransactionsExtension.class, extensions));
@@ -45,6 +61,15 @@ private CoreTransactionsSupportedExtensions(Iterable<CoreTransactionsExtension>
                         .map(CoreTransactionsExtension::value)
                         .collect(toSet())
         );
+        this.protocolMinor = this.extensions.equals(ALL_2_1) ? 1 : 0;
+    }
+
+    public int protocolMajor() {
+        return protocolMajor;
+    }
+
+    public int protocolMinor() {
+        return protocolMinor;
     }
 
     public static CoreTransactionsSupportedExtensions from(CoreTransactionsExtension... extensions) {

core-io/src/main/java/com/couchbase/client/core/transaction/forwards/ForwardCompatRequirement.java

@@ -67,13 +67,13 @@ class ForwardCompatProtocolRequirement extends ForwardCompatRequirement {
     }
 
     public ForwardCompatBehaviourFull behaviour(CoreTransactionsSupportedExtensions supported) {
-        if (supported.protocolMajor > minProtocolMajor) {
+        if (supported.protocolMajor() > minProtocolMajor) {
             return ForwardCompatBehaviourFull.CONTINUE;
         }
-        if (supported.protocolMajor < minProtocolMajor) {
+        if (supported.protocolMajor() < minProtocolMajor) {
             return behaviour;
         }
-        if (supported.protocolMinor < minProtocolMinor) {
+        if (supported.protocolMinor() < minProtocolMinor) {
             return behaviour;
         }
         return ForwardCompatBehaviourFull.CONTINUE;

java-fit-performer/src/main/java/com/couchbase/JavaPerformer.java

@@ -159,7 +159,7 @@ protected void customisePerformerCaps(PerformerCapsFetchResponse.Builder respons
         }
 
         var supported = CoreTransactionsSupportedExtensions.ALL;
-        var protocolVersion = supported.protocolMajor + "." + supported.protocolMinor;
+        var protocolVersion = supported.protocolMajor() + "." + supported.protocolMinor();
 
         response.setTransactionsProtocolVersion(protocolVersion);
 

scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/ScalaPerformer.scala

@@ -99,7 +99,7 @@ class ScalaPerformer extends CorePerformer {
     // [if:1.7.2]
     response.addPerformerCaps(Caps.TRANSACTIONS_SUPPORT_1)
     val supported = Supported
-    val protocolVersion = supported.protocolMajor + "." + supported.protocolMinor
+    val protocolVersion = supported.protocolMajor() + "." + supported.protocolMinor()
     response.setTransactionsProtocolVersion(protocolVersion)
     val sdkVersionRaw = VersionUtil.introspectSDKVersionScala
     val sdkVersion = if (sdkVersionRaw == null) {