Polishing.

Remove constructors defaulting to BatchType.LOGGED and turn batchOps() into default methods to avoid defaulting sprawl.

Update since tags.

See #1174
Original pull request: #1175.

Author: mp911de

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java

@@ -56,21 +56,12 @@ class CassandraBatchTemplate implements CassandraBatchOperations {
 
 	private final StatementFactory statementFactory;
 
-	/**
-	 * Create a new {@link CassandraBatchTemplate} given {@link CassandraOperations}.
-	 *
-	 * @param operations must not be {@literal null}.
-	 */
-	CassandraBatchTemplate(CassandraOperations operations) {
-		this(operations, BatchType.LOGGED);
-	}
-
 	/**
 	 * Create a new {@link CassandraBatchTemplate} given {@link CassandraOperations} and {@link BatchType}.
 	 *
 	 * @param operations must not be {@literal null}.
 	 * @param batchType must not be {@literal null}.
-	 * @since 3.3.0
+	 * @since 3.2.6
 	 */
 	CassandraBatchTemplate(CassandraOperations operations, BatchType batchType) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java

@@ -53,20 +53,24 @@
 public interface CassandraOperations extends FluentCassandraOperations {
 
 	/**
-	 * Returns a new {@link CassandraBatchOperations}. Each {@link CassandraBatchOperations} instance can be executed only
-	 * once, so you might want to obtain new {@link CassandraBatchOperations} instances for each batch.
+	 * Returns a new {@link CassandraBatchOperations} using {@link BatchType#LOGGED}. Each
+	 * {@link CassandraBatchOperations} instance can be executed only once, so you need to obtain new
+	 * {@link CassandraBatchOperations} instances for each batch.
 	 *
 	 * @return a new {@link CassandraBatchOperations} associated with the given entity class.
+	 * @see #batchOps(BatchType)
 	 */
-	CassandraBatchOperations batchOps();
+	default CassandraBatchOperations batchOps() {
+		return batchOps(BatchType.LOGGED);
+	}
 
 	/**
 	 * Returns a new {@link CassandraBatchOperations}. Each {@link CassandraBatchOperations} instance can be executed only
-	 * once, so you might want to obtain new {@link CassandraBatchOperations} instances for each batch.
+	 * once, so you need to obtain new {@link CassandraBatchOperations} instances for each batch.
 	 *
 	 * @param batchType must not be {@literal null}.
 	 * @return a new {@link ReactiveCassandraBatchOperations} associated with the given entity class.
-	 * @since 3.3.0
+	 * @since 3.2.6
 	 */
 	CassandraBatchOperations batchOps(BatchType batchType);
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java

@@ -196,14 +196,6 @@ public CassandraTemplate(CqlOperations cqlOperations, CassandraConverter convert
 		this.statementFactory = new StatementFactory(new QueryMapper(converter), new UpdateMapper(converter));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.CassandraOperations#batchOps()
-	 */
-	@Override
-	public CassandraBatchOperations batchOps() {
-		return new CassandraBatchTemplate(this);
-	}
-
 	/* (non-Javadoc)
 	 * @see org.springframework.data.cassandra.core.CassandraOperations#batchOps(com.datastax.oss.driver.api.core.cql.BatchType)
 	 */

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchTemplate.java

@@ -65,21 +65,12 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations
 
 	private final StatementFactory statementFactory;
 
-	/**
-	 * Create a new {@link CassandraBatchTemplate} given {@link CassandraOperations}.
-	 *
-	 * @param operations must not be {@literal null}.
-	 */
-	ReactiveCassandraBatchTemplate(ReactiveCassandraOperations operations) {
-		this(operations, BatchType.LOGGED);
-	}
-
 	/**
 	 * Create a new {@link CassandraBatchTemplate} given {@link CassandraOperations} and {@link BatchType}.
 	 *
 	 * @param operations must not be {@literal null}.
 	 * @param batchType must not be {@literal null}.
-	 * @since 3.3.0
+	 * @since 3.2.6
 	 */
 	ReactiveCassandraBatchTemplate(ReactiveCassandraOperations operations, BatchType batchType) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraOperations.java

@@ -52,23 +52,25 @@
 public interface ReactiveCassandraOperations extends ReactiveFluentCassandraOperations {
 
 	/**
-	 * Returns a new {@link ReactiveCassandraBatchOperations}. Each {@link ReactiveCassandraBatchOperations} instance can
-	 * be executed only once, so you might want to obtain new {@link ReactiveCassandraBatchOperations} instances for each
-	 * batch.
+	 * Returns a new {@link ReactiveCassandraBatchOperations} using {@link BatchType#LOGGED}. Each
+	 * {@link ReactiveCassandraBatchOperations} instance can be executed only once, so you need to obtain new
+	 * {@link ReactiveCassandraBatchOperations} instances for each batch.
 	 *
 	 * @return a new {@link ReactiveCassandraBatchOperations} associated with the given entity class.
 	 * @since 2.1
+	 * @see #batchOps(BatchType)
 	 */
-	ReactiveCassandraBatchOperations batchOps();
+	default ReactiveCassandraBatchOperations batchOps() {
+		return batchOps(BatchType.LOGGED);
+	}
 
 	/**
 	 * Returns a new {@link ReactiveCassandraBatchOperations}. Each {@link ReactiveCassandraBatchOperations} instance can
-	 * be executed only once, so you might want to obtain new {@link ReactiveCassandraBatchOperations} instances for each
-	 * batch.
+	 * be executed only once, so you need to obtain new {@link ReactiveCassandraBatchOperations} instances for each batch.
 	 *
 	 * @param batchType must not be {@literal null}.
 	 * @return a new {@link ReactiveCassandraBatchOperations} associated with the given entity class.
-	 * @since 3.3.0
+	 * @since 3.2.6
 	 */
 	ReactiveCassandraBatchOperations batchOps(BatchType batchType);
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java

@@ -193,14 +193,6 @@ public ReactiveCassandraTemplate(ReactiveCqlOperations reactiveCqlOperations, Ca
 		this.statementFactory = new StatementFactory(converter);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#batchOps()
-	 */
-	@Override
-	public ReactiveCassandraBatchOperations batchOps() {
-		return new ReactiveCassandraBatchTemplate(this);
-	}
-
 	/* (non-Javadoc)
 	 * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#batchOps(com.datastax.oss.driver.api.core.cql.BatchType)
 	 */

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraBatchTemplateIntegrationTests.java

@@ -30,6 +30,7 @@
 import org.springframework.data.cassandra.repository.support.SchemaTestUtils;
 import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTests;
 
+import com.datastax.oss.driver.api.core.cql.BatchType;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.Row;
 
@@ -64,7 +65,7 @@ void setUp() throws Exception {
 	@Test // DATACASS-288
 	void shouldInsertEntities() {
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 		batchOperations.insert(walter).insert(mike).execute();
 
 		Group loaded = template.selectOneById(walter.getId(), Group.class);
@@ -89,7 +90,7 @@ void shouldInsertEntitiesWithLwt() {
 
 		walter.setAge(100);
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 
 		WriteResult writeResult = batchOperations.insert(walter, lwtOptions).insert(mike).execute();
 
@@ -108,7 +109,7 @@ void shouldInsertEntitiesWithLwt() {
 	@Test // DATACASS-288
 	void shouldInsertCollectionOfEntities() {
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 		batchOperations.insert(Arrays.asList(walter, mike)).execute();
 
 		Group loaded = template.selectOneById(walter.getId(), Group.class);
@@ -125,7 +126,7 @@ void shouldInsertCollectionOfEntitiesWithTtl() {
 		int ttl = 30;
 		WriteOptions options = WriteOptions.builder().ttl(30).build();
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 		batchOperations.insert(Arrays.asList(walter, mike), options).execute();
 
 		ResultSet resultSet = template.getCqlOperations().queryForResultSet("SELECT TTL(email) FROM group;");
@@ -149,7 +150,7 @@ void shouldUpdateEntities() {
 		walter.setEmail("walter@white.com");
 		mike.setEmail("mike@sauls.com");
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 		batchOperations.update(walter).update(mike).execute();
 
 		Group loaded = template.selectOneById(walter.getId(), Group.class);
@@ -163,7 +164,7 @@ void shouldUpdateCollectionOfEntities() {
 		walter.setEmail("walter@white.com");
 		mike.setEmail("mike@sauls.com");
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 		batchOperations.update(Arrays.asList(walter, mike)).execute();
 
 		Group loaded = template.selectOneById(walter.getId(), Group.class);
@@ -180,7 +181,7 @@ void shouldUpdateCollectionOfEntitiesWithTtl() {
 		int ttl = 30;
 		WriteOptions options = WriteOptions.builder().ttl(ttl).build();
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 		batchOperations.update(walter, options).execute();
 
 		ResultSet resultSet = template.getCqlOperations().queryForResultSet("SELECT TTL(email), email FROM group");
@@ -209,7 +210,7 @@ void shouldUpdatesCollectionOfEntities() {
 		walter.setEmail("walter@white.com");
 		mike.setEmail("mike@sauls.com");
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 		batchOperations.update(Arrays.asList(walter, mike)).execute();
 
 		FlatGroup loaded = template.selectOneById(walter, FlatGroup.class);
@@ -226,7 +227,7 @@ void deleteAsVarargsShouldRejectQueryOptions() {
 	@Test // DATACASS-288
 	void shouldDeleteEntities() {
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 
 		batchOperations.delete(walter).delete(mike).execute();
 
@@ -238,7 +239,7 @@ void shouldDeleteEntities() {
 	@Test // DATACASS-288
 	void shouldDeleteCollectionOfEntities() {
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 
 		batchOperations.delete(Arrays.asList(walter, mike)).execute();
 
@@ -255,7 +256,7 @@ void shouldApplyTimestampToAllEntities() {
 
 		long timestamp = (System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1)) * 1000;
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 		batchOperations.insert(walter).insert(mike).withTimestamp(timestamp).execute();
 
 		ResultSet resultSet = template.getCqlOperations().queryForResultSet("SELECT writetime(email) FROM group;");
@@ -270,7 +271,7 @@ void shouldApplyTimestampToAllEntities() {
 	@Test // DATACASS-288
 	void shouldNotExecuteTwice() {
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 		batchOperations.insert(walter).execute();
 
 		assertThatIllegalStateException().isThrownBy(() -> batchOperations.execute());
@@ -279,7 +280,7 @@ void shouldNotExecuteTwice() {
 	@Test // DATACASS-288
 	void shouldNotAllowModificationAfterExecution() {
 
-		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template);
+		CassandraBatchOperations batchOperations = new CassandraBatchTemplate(template, BatchType.LOGGED);
 		batchOperations.insert(walter).execute();
 
 		assertThatIllegalStateException().isThrownBy(() -> batchOperations.update(new Group()));