Polishing.

mp911de · mp911de · commit 4492e1a06abc · 2021-04-07T13:55:26.000+02:00
Add author tags. Reformat code. Add overrides for methods that were introduced in the meantime. See #978. Original pull request: #1108.
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AnnotatedCassandraConstructorProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AnnotatedCassandraConstructorProperty.java
@@ -105,6 +105,11 @@ public boolean isPrimaryKeyColumn() {
 		return delegate.isPrimaryKeyColumn();
 	}
 
+	@Override
+	public boolean isStaticColumn() {
+		return delegate.isStaticColumn();
+	}
+
 	@Override
 	@Nullable
 	public AnnotatedType findAnnotatedType(Class<? extends Annotation> annotationType) {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConstructorProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConstructorProperty.java
@@ -98,6 +98,11 @@ public boolean isPrimaryKeyColumn() {
 		return false;
 	}
 
+	@Override
+	public boolean isStaticColumn() {
+		return false;
+	}
+
 	@Nullable
 	@Override
 	public AnnotatedType findAnnotatedType(Class<? extends Annotation> annotationType) {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/SchemaFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/SchemaFactory.java
@@ -46,6 +46,7 @@
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Aleksei Zotov
  * @since 3.0
  * @see CreateUserTypeSpecification
  * @see CreateTableSpecification
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/CreateTableCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/CreateTableCqlGenerator.java
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.cassandra.core.cql.generator;
 
+import static org.springframework.data.cassandra.core.cql.PrimaryKeyType.*;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -25,14 +27,13 @@
 import org.springframework.data.cassandra.core.cql.keyspace.TableSpecification;
 import org.springframework.util.StringUtils;
 
-import static org.springframework.data.cassandra.core.cql.PrimaryKeyType.*;
-
 /**
  * CQL generator for generating a {@code CREATE TABLE} statement.
  *
  * @author Matthew T. Adams
  * @author Alex Shvid
  * @author Mark Paluch
+ * @author Aleksei Zotov
  */
 public class CreateTableCqlGenerator extends TableOptionsCqlGenerator<TableSpecification<CreateTableSpecification>> {
 
@@ -78,7 +79,7 @@ private void columnsAndOptionsCql(StringBuilder cql) {
 		List<ColumnSpecification> clusterKeys = new ArrayList<>();
 		for (ColumnSpecification col : spec().getColumns()) {
 			if (col.isStatic()) {
-				col.toCql(cql).append(" static, ");
+				col.toCql(cql).append(" STATIC, ");
 			} else {
 				col.toCql(cql).append(", ");
 			}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java
@@ -29,14 +29,15 @@
 /**
  * Object to configure a CQL column specification.
  * <p/>
- * Use {@link #name(String)} and {@link #type(DataType)} to set the name and type of the column, respectively. To specify
- * a clustered {@code PRIMARY KEY} column, use {@link #clustered()} or {@link #clustered(Ordering)}. To specify that the
- * {@code PRIMARY KEY} column is or is part of the partition key, use {@link #partitioned()} instead of
+ * Use {@link #name(String)} and {@link #type(DataType)} to set the name and type of the column, respectively. To
+ * specify a clustered {@code PRIMARY KEY} column, use {@link #clustered()} or {@link #clustered(Ordering)}. To specify
+ * that the {@code PRIMARY KEY} column is or is part of the partition key, use {@link #partitioned()} instead of
  * {@link #clustered()} or {@link #clustered(Ordering)}. To specify {@code STATIC} column, use {@link #staticColumn()}.
  *
  * @author Matthew T. Adams
  * @author Alex Shvid
  * @author Mark Paluch
+ * @author Aleksei Zotov
  */
 public class ColumnSpecification {
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableDescriptor.java
@@ -25,6 +25,7 @@
  *
  * @author Matthew T. Adams
  * @author Alex Shvid
+ * @author Aleksei Zotov
  */
 public interface TableDescriptor {
 
@@ -60,6 +61,8 @@ public interface TableDescriptor {
 
 	/**
 	 * Returns an unmodifiable list of static columns.
+	 *
+	 * @since 3.2
 	 */
 	List<ColumnSpecification> getStaticColumns();
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableSpecification.java
@@ -15,19 +15,19 @@
  */
 package org.springframework.data.cassandra.core.cql.keyspace;
 
+import static org.springframework.data.cassandra.core.cql.PrimaryKeyType.*;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-import com.datastax.oss.driver.api.core.CqlIdentifier;
-import com.datastax.oss.driver.api.core.type.DataType;
-
 import org.springframework.data.cassandra.core.cql.Ordering;
 import org.springframework.data.cassandra.core.cql.PrimaryKeyType;
 import org.springframework.util.Assert;
 
-import static org.springframework.data.cassandra.core.cql.PrimaryKeyType.*;
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+import com.datastax.oss.driver.api.core.type.DataType;
 
 /**
  * Object to support the configuration of table specifications that have columns. This class can also be used as a
@@ -36,6 +36,7 @@
  * @author Matthew T. Adams
  * @author Alex Shvid
  * @author Mark Paluch
+ * @author Aleksei Zotov
  */
 public class TableSpecification<T> extends TableOptionsSpecification<TableSpecification<T>> implements TableDescriptor {
 
@@ -355,8 +356,6 @@ public List<ColumnSpecification> getNonKeyColumns() {
 
 	/**
 	 * Returns an unmodifiable list of static columns.
-	 *
-	 * @since 3.2
 	 */
 	@Override
 	public List<ColumnSpecification> getStaticColumns() {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java
@@ -54,6 +54,7 @@
  * @author Antoine Toulme
  * @author Mark Paluch
  * @author John Blum
+ * @author Aleksei Zotov
  */
 public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentProperty<CassandraPersistentProperty>
 		implements CassandraPersistentProperty, ApplicationContextAware {
@@ -181,6 +182,7 @@ public boolean isPrimaryKeyColumn() {
 	 */
 	@Override
 	public boolean isStaticColumn() {
+
 		Column annotation = findAnnotation(Column.class);
 
 		return annotation != null && annotation.isStatic();
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleProperty.java
@@ -29,6 +29,7 @@
  *
  * @author Mark Paluch
  * @author Frank Spitulski
+ * @author Aleksei Zotov
  * @since 2.1
  * @see Element
  */
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CachingCassandraPersistentProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CachingCassandraPersistentProperty.java
@@ -24,6 +24,7 @@
  * {@link BasicCassandraPersistentProperty} that pre-computes primary key and embedded flags.
  *
  * @author Mark Paluch
+ * @author Aleksei Zotov
  * @since 3.1.4
  */
 public class CachingCassandraPersistentProperty extends BasicCassandraPersistentProperty {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentProperty.java
@@ -36,6 +36,7 @@
  * @author John Blum
  * @author Christoph Strobl
  * @author Frank Spitulski
+ * @author Aleksei Zotov
  */
 public interface CassandraPersistentProperty
 		extends PersistentProperty<CassandraPersistentProperty>, ApplicationContextAware {
@@ -160,7 +161,8 @@ default int getRequiredOrdinal() {
 	boolean isPrimaryKeyColumn();
 
 	/**
-	 * Whether the property is a static column.
+	 * Whether the property maps to a static column.
+	 *
 	 * @since 3.2
 	 */
 	boolean isStaticColumn();
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Column.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Column.java
@@ -42,6 +42,7 @@
  * @author Alex Shvid
  * @author Matthew T. Adams
  * @author Mark Paluch
+ * @author Aleksei Zotov
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
@@ -54,8 +55,9 @@
 	String value() default "";
 
 	/**
-	 * Whether the column is static.
-	 * Default is {@literal false}.
+	 * Whether the column is {@code static}. Default is {@literal false}. Used primarily for schema creation.
+	 *
+	 * @since 3.2
 	 */
 	boolean isStatic() default false;
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/SchemaFactoryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/SchemaFactoryUnitTests.java
@@ -67,6 +67,7 @@
  * @author Matthew T. Adams
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Aleksei Zotov
  */
 public class SchemaFactoryUnitTests {
 
@@ -898,7 +899,7 @@ static class Address {
 		@Element(1) int number;
 	}
 
-	@Test // DATACASS-812
+	@Test // GH-978
 	void createdTableSpecificationShouldConsiderStaticColumns() {
 
 		CassandraPersistentEntity<?> persistentEntity = ctx
@@ -911,7 +912,7 @@ void createdTableSpecificationShouldConsiderStaticColumns() {
 		assertThat(name.isStatic()).isTrue();
 	}
 
-	@Test // DATACASS-812
+	@Test // GH-978
 	void createdTableSpecificationShouldConsiderStaticForTypedTupleColumns() {
 
 		CassandraPersistentEntity<?> persistentEntity = ctx
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java
@@ -42,6 +42,7 @@
  * @author Matthew T. Adams
  * @author David Webb
  * @author Mark Paluch
+ * @author Aleksei Zotov
  */
 class CreateTableCqlGeneratorUnitTests {
 
@@ -188,7 +189,7 @@ void createTableWithOrderedClusteringAndOptions() {
 				+ "WITH CLUSTERING ORDER BY (date_of_birth ASC) AND COMPACT STORAGE;");
 	}
 
-	@Test // DATACASS-812
+	@Test // GH-978
 	void createTableWithStaticColumns() {
 
 		CreateTableSpecification table = CreateTableSpecification.createTable("person")
@@ -198,7 +199,7 @@ void createTableWithStaticColumns() {
 				.staticColumn("country", DataTypes.ASCII);
 
 		assertThat(toCql(table)).isEqualTo("CREATE TABLE person ("
-				+ "id ascii, date_of_birth date, name ascii, country ascii static, "
+				+ "id ascii, date_of_birth date, name ascii, country ascii STATIC, "
 				+ "PRIMARY KEY (id, date_of_birth)) "
 				+ "WITH CLUSTERING ORDER BY (date_of_birth ASC);");
 	}
diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc
@@ -8,6 +8,7 @@ This chapter summarizes changes and new features for each release.
 
 * <<cassandra.template.prepared-statements,Support for prepared statements>> using `CassandraTemplate` and repositories (enabled by default).
 * `@Column` and `@Element` can be used on constructor arguments.
+* Schema support for static columns through `@Column(isStatic = …)`.
 
 [[new-features.3-1-0]]
 == What's new in Spring Data for Apache Cassandra 3.1

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@`
`46`	`46`	`*`
`47`	`47`	`* @author Mark Paluch`
`48`	`48`	`* @author Christoph Strobl`
	`49`	`+ * @author Aleksei Zotov`
`49`	`50`	`* @since 3.0`
`50`	`51`	`* @see CreateUserTypeSpecification`
`51`	`52`	`* @see CreateTableSpecification`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`*`
`30`	`30`	`* @author Mark Paluch`
`31`	`31`	`* @author Frank Spitulski`
	`32`	`+ * @author Aleksei Zotov`
`32`	`33`	`* @since 2.1`
`33`	`34`	`* @see Element`
`34`	`35`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`* {@link BasicCassandraPersistentProperty} that pre-computes primary key and embedded flags.`
`25`	`25`	`*`
`26`	`26`	`* @author Mark Paluch`
	`27`	`+ * @author Aleksei Zotov`
`27`	`28`	`* @since 3.1.4`
`28`	`29`	`*/`
`29`	`30`	`public class CachingCassandraPersistentProperty extends BasicCassandraPersistentProperty {`