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 bc78f2c36..00c0a0716 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 @@ -93,7 +93,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) @@ -125,13 +125,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/AbstractSessionConfigurationIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/AbstractSessionConfigurationIntegrationTests.java index 874b25f57..672303542 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/AbstractSessionConfigurationIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/AbstractSessionConfigurationIntegrationTests.java @@ -68,12 +68,6 @@ class AbstractSessionConfigurationIntegrationTests { return "system"; } - @Nullable - @Override - protected String getLocalDataCenter() { - return "datacenter1"; - } - @Override protected int getPort() { return new CassandraConnectionProperties().getCassandraPort(); 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 0b6ce38be..faac9197b 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 @@ -25,8 +25,8 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.data.cassandra.core.cql.CqlTemplate; -import org.springframework.data.cassandra.test.util.IntegrationTestsSupport; import org.springframework.data.cassandra.test.util.CassandraExtension; +import org.springframework.data.cassandra.test.util.IntegrationTestsSupport; import com.datastax.oss.driver.api.core.CqlSession; @@ -47,11 +47,6 @@ class CqlTemplateConfigIntegrationTests extends IntegrationTestsSupport { return "system"; } - @Override - protected String getLocalDataCenter() { - return "datacenter1"; - } - @Override protected int getPort() { return CassandraExtension.getResources().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"; - } }