address review comments

testcontainers · Feb 8, 2021 · 728dcdd · 728dcdd
1 parent fe6b846
commit 728dcdd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 35 deletions.
diff --git a/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java b/modules/cassandra/src/main/java/org/testcontainers/containers/CassandraContainer.java
@@ -33,15 +33,14 @@ public class CassandraContainer<SELF extends CassandraContainer<SELF>> extends G
     public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
 
     public static final Integer CQL_PORT = 9042;
-    public static final String DEFAULT_LOCAL_DATACENTER = "datacenter1";
+    private static final String DEFAULT_LOCAL_DATACENTER = "datacenter1";
     private static final String CONTAINER_CONFIG_LOCATION = "/etc/cassandra";
     private static final String USERNAME = "cassandra";
     private static final String PASSWORD = "cassandra";
 
     private String configLocation;
     private String initScriptPath;
     private boolean enableJmxReporting;
-    private String localDatacenter;
 
     /**
      * @deprecated use {@link #CassandraContainer(DockerImageName)} instead
@@ -63,7 +62,6 @@ public CassandraContainer(DockerImageName dockerImageName) {
         addExposedPort(CQL_PORT);
         setStartupAttempts(3);
         this.enableJmxReporting = false;
-        this.localDatacenter = DEFAULT_LOCAL_DATACENTER;
     }
 
     @Override
@@ -147,14 +145,6 @@ public SELF withJmxReporting(boolean enableJmxReporting) {
         return self();
     }
 
-    /**
-     * Override the default Cassandra local Datacenter name
-     */
-    public SELF withLocalDatacenter(String localDatacenter) {
-      this.localDatacenter = localDatacenter;
-      return self();
-    }
-
     /**
      * Get username
      *
@@ -180,7 +170,7 @@ public String getPassword() {
     }
 
     /**
-     * Get configured Session
+     * Get configured Cluster
      *
      * Can be used to obtain connections to Cassandra in the container
      *
@@ -225,10 +215,9 @@ public InetSocketAddress getContactPoint() {
      * Retrieve the Local Datacenter for connecting to the Cassandra container via the driver.
      *
      * @return The configured local Datacenter name.
-     * @see #withLocalDatacenter(java.lang.String)
      */
     public String getLocalDatacenter() {
-      return localDatacenter;
+      return DEFAULT_LOCAL_DATACENTER;
     }
 
     @Deprecated

diff --git a/...andra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java b/...andra/src/main/java/org/testcontainers/containers/delegate/CassandraDatabaseDelegate.java
@@ -25,7 +25,8 @@ public class CassandraDatabaseDelegate extends AbstractDatabaseDelegate<Session>
     @Override
     protected Session createNewConnection() {
         try {
-            return CassandraContainer.getCluster(container).newSession();
+            return CassandraContainer.getCluster(container)
+                    .newSession();
         } catch (DriverException e) {
             log.error("Could not obtain cassandra connection");
             throw new ConnectionCreationException("Could not obtain cassandra connection", e);

diff --git a/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java b/modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java
@@ -27,13 +27,13 @@ public class CassandraContainerTest {
 
     private static final String TEST_CLUSTER_NAME_IN_CONF = "Test Cluster Integration Test";
 
-    private static final String BAISC_QUERY = "SELECT release_version FROM system.local";
+    private static final String BASIC_QUERY = "SELECT release_version FROM system.local";
 
     @Test
     public void testSimple() {
         try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)) {
             cassandraContainer.start();
-            ResultSet resultSet = performQuery(cassandraContainer, BAISC_QUERY);
+            ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
             assertTrue("Query was not applied", resultSet.wasApplied());
             assertNotNull("Result set has no release_version", resultSet.one().getString(0));
         }
@@ -44,7 +44,7 @@ public void testSpecificVersion() {
         String cassandraVersion = "3.0.15";
         try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE.withTag(cassandraVersion))) {
             cassandraContainer.start();
-            ResultSet resultSet = performQuery(cassandraContainer, BAISC_QUERY);
+            ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
             assertTrue("Query was not applied", resultSet.wasApplied());
             assertEquals("Cassandra has wrong version", cassandraVersion, resultSet.one().getString(0));
         }
@@ -103,7 +103,7 @@ public void testCassandraQueryWaitStrategy() {
                 .waitingFor(new CassandraQueryWaitStrategy())
         ) {
             cassandraContainer.start();
-            ResultSet resultSet = performQuery(cassandraContainer, BAISC_QUERY);
+            ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
             assertTrue("Query was not applied", resultSet.wasApplied());
         }
     }
@@ -113,26 +113,12 @@ public void testCassandraQueryWaitStrategy() {
     public void testCassandraGetCluster() {
         try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>()) {
             cassandraContainer.start();
-            ResultSet resultSet = performQuery(cassandraContainer.getCluster(), BAISC_QUERY);
+            ResultSet resultSet = performQuery(cassandraContainer.getCluster(), BASIC_QUERY);
             assertTrue("Query was not applied", resultSet.wasApplied());
             assertNotNull("Result set has no release_version", resultSet.one().getString(0));
         }
     }
 
-    @Test
-    public void testMissingLocalDatacenter() {
-        try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)) {
-            cassandraContainer.start();
-            // Trying to build a CqlSession will fail if a Contact Point is specified,
-            // but Local Datacenter is omitted.
-            CqlSession.builder().addContactPoint(cassandraContainer.getContactPoint()).build();
-            fail("Session build should fail if no local Datacenter provided");
-        } catch (IllegalStateException ise) {
-            String msg = "Since you provided explicit contact points, the local DC must be explicitly set";
-            assertThat(ise.getMessage(), containsString(msg));
-        }
-    }
-
     @Test
     public void testCassandraGetContactPoint() {
         try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)) {
@@ -141,7 +127,7 @@ public void testCassandraGetContactPoint() {
                 .addContactPoint(cassandraContainer.getContactPoint())
                 .withLocalDatacenter(cassandraContainer.getLocalDatacenter())
                 .build();
-            com.datastax.oss.driver.api.core.cql.ResultSet resultSet = performQuery(session, BAISC_QUERY);
+            com.datastax.oss.driver.api.core.cql.ResultSet resultSet = performQuery(session, BASIC_QUERY);
             assertTrue("Query was not applied", resultSet.wasApplied());
             assertNotNull("Result set has no release_version", resultSet.one().getString(0));
         }