Consider @column and @element annotated constructor parameters.

We now allow using Column and Element annotations for constructor arguments when using constructor creation from columns/UDT fields respective tuple value elements. The column name/element ordinal can be overwritten for persistent properties. Non-persistent properties can be easier obtained than through the Value("…") annotation that uses SpEL.

Closes #1104.

Author: mp911de

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

@@ -0,0 +1,291 @@
+/*
+ * Copyright 2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.cassandra.core.convert;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedType;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.annotation.MergedAnnotations;
+import org.springframework.data.cassandra.core.cql.Ordering;
+import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty;
+import org.springframework.data.cassandra.core.mapping.Column;
+import org.springframework.data.cassandra.core.mapping.Element;
+import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.lang.Nullable;
+
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+
+/**
+ * {@link CassandraPersistentProperty} wrapper for a delegate {@link CassandraPersistentProperty} considering
+ * annotations from a constructor parameter.
+ *
+ * @author Mark Paluch
+ * @since 3.2
+ */
+class AnnotatedCassandraConstructorProperty implements CassandraPersistentProperty {
+
+	private final CassandraPersistentProperty delegate;
+
+	private final MergedAnnotations annotations;
+
+	public AnnotatedCassandraConstructorProperty(CassandraPersistentProperty delegate, MergedAnnotations annotations) {
+		this.delegate = delegate;
+		this.annotations = annotations;
+	}
+
+	@Override
+	@Nullable
+	public CqlIdentifier getColumnName() {
+
+		if (annotations.isPresent(Column.class)) {
+			return CqlIdentifier.fromCql(annotations.get(Column.class).getString("value"));
+		}
+
+		return delegate.getColumnName();
+	}
+
+	@Override
+	@Nullable
+	public Integer getOrdinal() {
+
+		if (annotations.isPresent(Element.class)) {
+			return annotations.get(Element.class).getInt("value");
+		}
+
+		return delegate.getOrdinal();
+	}
+
+	@Override
+	@Nullable
+	public Ordering getPrimaryKeyOrdering() {
+		return delegate.getPrimaryKeyOrdering();
+	}
+
+	@Override
+	public boolean isClusterKeyColumn() {
+		return delegate.isClusterKeyColumn();
+	}
+
+	@Override
+	public boolean isCompositePrimaryKey() {
+		return delegate.isCompositePrimaryKey();
+	}
+
+	@Override
+	public boolean isMapLike() {
+		return delegate.isMapLike();
+	}
+
+	@Override
+	public boolean isPartitionKeyColumn() {
+		return delegate.isPartitionKeyColumn();
+	}
+
+	@Override
+	public boolean isPrimaryKeyColumn() {
+		return delegate.isPrimaryKeyColumn();
+	}
+
+	@Override
+	@Nullable
+	public AnnotatedType findAnnotatedType(Class<? extends Annotation> annotationType) {
+		return delegate.findAnnotatedType(annotationType);
+	}
+
+	@Override
+	public PersistentEntity<?, CassandraPersistentProperty> getOwner() {
+		return delegate.getOwner();
+	}
+
+	@Override
+	public String getName() {
+		return delegate.getName();
+	}
+
+	@Override
+	public Class<?> getType() {
+		return delegate.getType();
+	}
+
+	@Override
+	public TypeInformation<?> getTypeInformation() {
+		return delegate.getTypeInformation();
+	}
+
+	@Override
+	public Iterable<? extends TypeInformation<?>> getPersistentEntityTypes() {
+		return delegate.getPersistentEntityTypes();
+	}
+
+	@Override
+	@Nullable
+	public Method getGetter() {
+		return delegate.getGetter();
+	}
+
+	@Override
+	@Nullable
+	public Method getSetter() {
+		return delegate.getSetter();
+	}
+
+	@Override
+	@Nullable
+	public Method getWither() {
+		return delegate.getWither();
+	}
+
+	@Override
+	@Nullable
+	public Field getField() {
+		return delegate.getField();
+	}
+
+	@Override
+	@Nullable
+	public String getSpelExpression() {
+		return delegate.getSpelExpression();
+	}
+
+	@Override
+	@Nullable
+	public Association<CassandraPersistentProperty> getAssociation() {
+		return delegate.getAssociation();
+	}
+
+	@Override
+	public boolean isEntity() {
+		return delegate.isEntity();
+	}
+
+	@Override
+	public boolean isIdProperty() {
+		return delegate.isIdProperty();
+	}
+
+	@Override
+	public boolean isVersionProperty() {
+		return delegate.isVersionProperty();
+	}
+
+	@Override
+	public boolean isCollectionLike() {
+		return delegate.isCollectionLike();
+	}
+
+	@Override
+	public boolean isMap() {
+		return delegate.isMap();
+	}
+
+	@Override
+	public boolean isArray() {
+		return delegate.isArray();
+	}
+
+	@Override
+	public boolean isTransient() {
+		return delegate.isTransient();
+	}
+
+	@Override
+	public boolean isWritable() {
+		return delegate.isWritable();
+	}
+
+	@Override
+	public boolean isImmutable() {
+		return delegate.isImmutable();
+	}
+
+	@Override
+	public boolean isAssociation() {
+		return delegate.isAssociation();
+	}
+
+	@Override
+	@Nullable
+	public Class<?> getComponentType() {
+		return delegate.getComponentType();
+	}
+
+	@Override
+	public Class<?> getRawType() {
+		return delegate.getRawType();
+	}
+
+	@Override
+	@Nullable
+	public Class<?> getMapValueType() {
+		return delegate.getMapValueType();
+	}
+
+	@Override
+	public Class<?> getActualType() {
+		return delegate.getActualType();
+	}
+
+	@Override
+	@Nullable
+	public <A extends Annotation> A findAnnotation(Class<A> annotationType) {
+		return delegate.findAnnotation(annotationType);
+	}
+
+	@Override
+	@Nullable
+	public <A extends Annotation> A findPropertyOrOwnerAnnotation(Class<A> annotationType) {
+		return delegate.findPropertyOrOwnerAnnotation(annotationType);
+	}
+
+	@Override
+	public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
+		return delegate.isAnnotationPresent(annotationType);
+	}
+
+	@Override
+	public boolean usePropertyAccess() {
+		return delegate.usePropertyAccess();
+	}
+
+	@Override
+	@Nullable
+	public Class<?> getAssociationTargetType() {
+		return delegate.getAssociationTargetType();
+	}
+
+	@Override
+	public void setColumnName(CqlIdentifier columnName) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	@Deprecated
+	public void setForceQuote(boolean forceQuote) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		throw new UnsupportedOperationException();
+	}
+
+}