Apply review comments

Author: lukasz-antoniak

Jenkinsfile

@@ -157,7 +157,7 @@ def executeTests() {
       -Dmaven.test.failure.ignore=true \
       -Dmaven.javadoc.skip=${SKIP_JAVADOCS} \
       -Dccm.version=${CCM_CASSANDRA_VERSION} \
-      -Dccm.${CCM_SERVER_TYPE:cassandra}=true \
+      -Dccm.distribution=${CCM_SERVER_TYPE:cassandra} \
       -Dproxy.path=${HOME}/proxy \
       ${SERIAL_ITS_ARGUMENT} \
       ${ISOLATED_ITS_ARGUMENT} \

integration-tests/src/test/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousPagingIT.java

@@ -281,9 +281,7 @@ public void prepared_statement_paging_should_be_resilient_to_schema_change() {
       // dropped.
       Row row = it.next();
       assertThat(row.getString("k")).isNotNull();
-      assertThat(ccmRule.isDistributionOf(BackendType.DSE)).isTrue();
-      if (ccmRule.getDistributionVersion().compareTo(Objects.requireNonNull(Version.parse("6.0.0")))
-          >= 0) {
+      if (ccmRule.isDistributionAtMinimalVersion(BackendType.DSE, Version.parse("6.0.0"))) {
         // DSE 6 only, v should be null here since dropped.
         // Not reliable for 5.1 since we may have gotten page queued before schema changed.
         assertThat(row.isNull("v")).isTrue();

integration-tests/src/test/java/com/datastax/dse/driver/api/core/graph/statement/GraphTraversalITBase.java

@@ -36,7 +36,9 @@
 import com.datastax.oss.driver.api.core.Version;
 import com.datastax.oss.driver.api.core.servererrors.InvalidQueryException;
 import com.datastax.oss.driver.api.core.type.reflect.GenericType;
+import com.datastax.oss.driver.api.testinfra.ccm.CcmBridge;
 import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
 import com.datastax.oss.driver.shaded.guava.common.collect.Lists;
 import java.util.List;
@@ -598,7 +600,8 @@ public void should_allow_use_of_dsl_graph_binary() throws Exception {
   @Test
   public void should_return_correct_results_when_bulked() {
     Assumptions.assumeThat(
-            ccmRule().getCcmBridge().getDistributionVersion().compareTo(Version.parse("5.1.2")) > 0)
+            CcmBridge.isDistributionOf(BackendType.DSE)
+                && CcmBridge.getDistributionVersion().compareTo(Version.parse("5.1.2")) > 0)
         .isTrue();
 
     GraphResultSet rs =

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/SchemaIT.java

@@ -335,10 +335,8 @@ public void should_exclude_virtual_keyspaces_from_token_map() {
 
   private void skipIfDse60() {
     // Special case: DSE 6.0 reports C* 4.0 but does not support virtual tables
-    if (ccmRule.isDistributionOf(BackendType.DSE)) {
-      if (ccmRule.getDistributionVersion().compareTo(DSE_MIN_VIRTUAL_TABLES) < 0) {
-        throw new AssumptionViolatedException("DSE 6.0 does not support virtual tables");
-      }
+    if (!ccmRule.isDistributionAtMinimalVersion(BackendType.DSE, DSE_MIN_VIRTUAL_TABLES)) {
+      throw new AssumptionViolatedException("DSE 6.0 does not support virtual tables");
     }
   }
 }

integration-tests/src/test/java/com/datastax/oss/driver/mapper/InventoryITBase.java

@@ -94,8 +94,7 @@ protected static List<String> createStatements(BaseCcmRule ccmRule) {
 
   protected static boolean isSasiBroken(BaseCcmRule ccmRule) {
     // creating SASI indexes is broken in DSE 6.8.0
-    return ccmRule.isDistributionOf(BackendType.DSE)
-        && ccmRule.getDistributionVersion().compareTo(BROKEN_SASI_VERSION) == 0;
+    return ccmRule.isDistributionAtVersion(BackendType.DSE, BROKEN_SASI_VERSION);
   }
 
   protected static boolean supportsSASI(BaseCcmRule ccmRule) {

osgi-tests/README.md

@@ -52,9 +52,9 @@ OSGi ones, you can do so as follows:
 
 You can pass the following system properties to your tests:
 
-1. `ccm.version=[version]`: the CCM version to use
-2. `ccm.[dse|hcd]=true`: choose target backend type (e.g. DSE, HCD)
-3. `osgi.debug=[true|false]`: whether to enable remote debugging of the OSGi container (see
+1. `ccm.version`: the CCM version to use
+2. `ccm.distribution`: choose target backend type (e.g. DSE, HCD)
+3. `osgi.debug`: whether to enable remote debugging of the OSGi container (see
    below).
 
 ## Debugging OSGi tests

osgi-tests/src/test/java/com/datastax/oss/driver/internal/osgi/support/CcmStagedReactor.java

@@ -39,7 +39,7 @@ public class CcmStagedReactor extends AllConfinedStagedReactor {
 
   static {
     CcmBridge.Builder builder = CcmBridge.builder().withNodes(1);
-    if (CcmBridge.isDistributionOf(BackendType.DSE) && CcmBridge.VERSION.compareTo(DSE_5_0) >= 0) {
+    if (CcmBridge.isDistributionAtMinimalVersion(BackendType.DSE, DSE_5_0)) {
       builder.withDseWorkloads("graph");
     }
     CCM_BRIDGE = builder.build();
@@ -57,7 +57,7 @@ public synchronized void beforeSuite() {
     if (!running) {
       LOGGER.info(
           "Starting CCM, running {} version {}",
-          CcmBridge.distribution,
+          CcmBridge.DISTRIBUTION,
           CcmBridge.getDistributionVersion());
       CCM_BRIDGE.create();
       CCM_BRIDGE.start();

test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/BaseCcmRule.java

@@ -73,13 +73,21 @@ public void evaluate() {
   }
 
   public BackendType getDistribution() {
-    return CcmBridge.distribution;
+    return CcmBridge.DISTRIBUTION;
   }
 
   public boolean isDistributionOf(BackendType type) {
     return CcmBridge.isDistributionOf(type);
   }
 
+  public boolean isDistributionAtVersion(BackendType type, Version version) {
+    return CcmBridge.isDistributionAtVersion(type, version);
+  }
+
+  public boolean isDistributionAtMinimalVersion(BackendType type, Version version) {
+    return CcmBridge.isDistributionAtMinimalVersion(type, version);
+  }
+
   public Version getDistributionVersion() {
     return CcmBridge.getDistributionVersion();
   }

test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java

@@ -55,15 +55,16 @@ public class CcmBridge implements AutoCloseable {
 
   private static final Logger LOG = LoggerFactory.getLogger(CcmBridge.class);
 
+  public static BackendType DISTRIBUTION =
+      BackendType.valueOf(
+          System.getProperty("ccm.distribution", BackendType.CASSANDRA.name()).toUpperCase());
   public static final Version VERSION =
       Objects.requireNonNull(Version.parse(System.getProperty("ccm.version", "4.0.0")));
 
   public static final String INSTALL_DIRECTORY = System.getProperty("ccm.directory");
 
   public static final String BRANCH = System.getProperty("ccm.branch");
 
-  public static BackendType distribution = null;
-
   public static final String CLUSTER_NAME = "ccm_1";
 
   public static final String DEFAULT_CLIENT_TRUSTSTORE_PASSWORD = "fakePasswordForTests";
@@ -116,16 +117,7 @@ public class CcmBridge implements AutoCloseable {
   public static final Version V4_0_11 = Version.parse("4.0.11");
 
   static {
-    distribution = BackendType.CASSANDRA; // default distribution
-    for (BackendType backendType : BackendType.values()) {
-      String enableFlag = "ccm." + backendType.name().toLowerCase();
-      // look for system properties like 'ccm.dse', 'ccm.hcd' etc.
-      if (Boolean.parseBoolean(System.getProperty(enableFlag, "false"))) {
-        distribution = backendType;
-        break;
-      }
-    }
-    LOG.info("CCM Bridge configured with {} version {}", distribution.getFriendlyName(), VERSION);
+    LOG.info("CCM Bridge configured with {} version {}", DISTRIBUTION.getFriendlyName(), VERSION);
   }
 
   private final int[] nodes;
@@ -185,7 +177,15 @@ private static boolean isWindows() {
   }
 
   public static boolean isDistributionOf(BackendType type) {
-    return distribution == type;
+    return DISTRIBUTION == type;
+  }
+
+  public static boolean isDistributionAtVersion(BackendType type, Version version) {
+    return isDistributionOf(type) && getDistributionVersion().compareTo(version) == 0;
+  }
+
+  public static boolean isDistributionAtMinimalVersion(BackendType type, Version version) {
+    return isDistributionOf(type) && getDistributionVersion().compareTo(version) >= 0;
   }
 
   public static Version getDistributionVersion() {
@@ -196,7 +196,7 @@ public static Version getCassandraVersion() {
     if (isDistributionOf(BackendType.CASSANDRA)) {
       return VERSION;
     }
-    return DistributionCassandraVersions.getCassandraVersion(distribution, VERSION);
+    return DistributionCassandraVersions.getCassandraVersion(DISTRIBUTION, VERSION);
   }
 
   private String getCcmVersionString(Version version) {
@@ -228,7 +228,7 @@ public void create() {
       } else {
         createOptions.add("-v " + getCcmVersionString(VERSION));
       }
-      createOptions.addAll(Arrays.asList(distribution.getCcmOptions()));
+      createOptions.addAll(Arrays.asList(DISTRIBUTION.getCcmOptions()));
       execute(
           "create",
           CLUSTER_NAME,
@@ -341,7 +341,7 @@ public void stop(int n) {
   public void add(int n, String dc) {
     List<String> addOptions = new ArrayList<>();
     addOptions.addAll(Arrays.asList("add", "-i", ipPrefix + n, "-d", dc, "node" + n));
-    addOptions.addAll(Arrays.asList(distribution.getCcmOptions()));
+    addOptions.addAll(Arrays.asList(DISTRIBUTION.getCcmOptions()));
     execute(addOptions.toArray(new String[0]));
     start(n);
   }

test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/DistributionCassandraVersions.java

@@ -19,34 +19,36 @@
 
 import com.datastax.oss.driver.api.core.Version;
 import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
+import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSortedMap;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.TreeMap;
 
 /** Defines mapping of various distributions to shipped Apache Cassandra version. */
 public abstract class DistributionCassandraVersions {
-  private static final Map<BackendType, TreeMap<Version, Version>> mappings = new HashMap<>();
+  private static final Map<BackendType, ImmutableSortedMap<Version, Version>> mappings =
+      new HashMap<>();
 
   static {
     {
       // DSE
-      TreeMap<Version, Version> dse = new TreeMap<>();
-      dse.put(Version.V1_0_0, CcmBridge.V2_1_19);
-      dse.put(Version.V5_0_0, CcmBridge.V3_0_15);
-      dse.put(CcmBridge.V5_1_0, CcmBridge.V3_10);
-      dse.put(CcmBridge.V6_0_0, CcmBridge.V4_0_0);
+      ImmutableSortedMap<Version, Version> dse =
+          ImmutableSortedMap.of(
+              Version.V1_0_0, CcmBridge.V2_1_19,
+              Version.V5_0_0, CcmBridge.V3_0_15,
+              CcmBridge.V5_1_0, CcmBridge.V3_10,
+              CcmBridge.V6_0_0, CcmBridge.V4_0_0);
       mappings.put(BackendType.DSE, dse);
     }
     {
       // HCD
-      TreeMap<Version, Version> hcd = new TreeMap<>();
-      hcd.put(Version.V1_0_0, CcmBridge.V4_0_11);
+      ImmutableSortedMap<Version, Version> hcd =
+          ImmutableSortedMap.of(Version.V1_0_0, CcmBridge.V4_0_11);
       mappings.put(BackendType.HCD, hcd);
     }
   }
 
   public static Version getCassandraVersion(BackendType type, Version version) {
-    TreeMap<Version, Version> mapping = mappings.get(type);
+    ImmutableSortedMap<Version, Version> mapping = mappings.get(type);
     if (mapping == null) {
       return null;
     }