From d7f42f15b3bdb20cbe4ffcb17b756580090028e9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 7 Dec 2020 14:41:29 +0100 Subject: [PATCH] DATACASS-834 - Default to datacenter1 in AbstractSessionConfiguration.getLocalDataCenter. Align with Cassandra defaults when starting a new server. Also, improve Javadoc explaining when the localDataCenter setting is required. --- .../cassandra/config/AbstractSessionConfiguration.java | 9 +++++---- .../config/CqlTemplateConfigIntegrationTests.java | 5 ----- .../data/cassandra/support/AbstractTestJavaConfig.java | 4 ---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java index 65e3589bc..bbf79331f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java @@ -90,7 +90,7 @@ public abstract class AbstractSessionConfiguration implements BeanFactoryAware { /** * Gets a required bean of the provided {@link Class type} from the {@link BeanFactory}. * - * @param {@link Class parameterized clas type} of the bean. + * @param {@link Class parameterized class type} of the bean. * @param beanType {@link Class type} of the bean. * @return a required bean of the given {@link Class type} from the {@link BeanFactory}. * @see org.springframework.beans.factory.BeanFactory#getBean(Class) @@ -122,13 +122,14 @@ public abstract class AbstractSessionConfiguration implements BeanFactoryAware { /** * Returns the local data center name used for - * {@link com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy}. + * {@link com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy}, defaulting to {@code datacenter1}. + * Typically required when connecting a Cassandra cluster. Not required when using an Astra connection bundle. * - * @return the local data center name. + * @return the local data center name. Can be {@literal null} when using an Astra connection bundle. */ @Nullable protected String getLocalDataCenter() { - return null; + return "datacenter1"; } /** diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CqlTemplateConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CqlTemplateConfigIntegrationTests.java index 431455ab9..f93c9063f 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CqlTemplateConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CqlTemplateConfigIntegrationTests.java @@ -46,11 +46,6 @@ public class CqlTemplateConfigIntegrationTests extends AbstractEmbeddedCassandra return "system"; } - @Override - protected String getLocalDataCenter() { - return "datacenter1"; - } - @Override protected int getPort() { return cassandraEnvironment.getPort(); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/AbstractTestJavaConfig.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/AbstractTestJavaConfig.java index 350d27dc5..b80b75e10 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/AbstractTestJavaConfig.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/AbstractTestJavaConfig.java @@ -34,8 +34,4 @@ public abstract class AbstractTestJavaConfig extends AbstractSessionConfiguratio return PROPERTIES.getCassandraPort(); } - @Override - protected String getLocalDataCenter() { - return "datacenter1"; - } }