From 3bf86dd0b139e27bbdd4869cabdc34855f5e64a0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 11 Dec 2019 15:59:17 +0100 Subject: [PATCH] DATACASS-656 - Polishing. Move to Driver's CqlIdentifier in Javadoc. Original pull request: #167. --- .../data/cassandra/core/ExecutableDeleteOperation.java | 2 +- .../data/cassandra/core/ExecutableInsertOperation.java | 2 +- .../data/cassandra/core/ExecutableSelectOperation.java | 2 +- .../data/cassandra/core/ExecutableUpdateOperation.java | 2 +- .../data/cassandra/core/ReactiveDeleteOperation.java | 2 +- .../data/cassandra/core/ReactiveInsertOperation.java | 2 +- .../data/cassandra/core/ReactiveSelectOperation.java | 2 +- .../data/cassandra/core/ReactiveUpdateOperation.java | 2 +- .../core/mapping/CassandraPersistentPropertyComparator.java | 5 ++--- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableDeleteOperation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableDeleteOperation.java index 389365f32..3d880b06d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableDeleteOperation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableDeleteOperation.java @@ -84,7 +84,7 @@ public interface ExecutableDeleteOperation { * @param table {@link CqlIdentifier name} of the table; must not be {@literal null}. * @return new instance of {@link DeleteWithQuery}. * @throws IllegalArgumentException if {@link CqlIdentifier table} is {@literal null}. - * @see org.springframework.data.cassandra.core.cql.CqlIdentifier + * @see com.datastax.oss.driver.api.core.CqlIdentifier * @see DeleteWithQuery */ DeleteWithQuery inTable(CqlIdentifier table); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableInsertOperation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableInsertOperation.java index f5d2fd368..713c343ec 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableInsertOperation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableInsertOperation.java @@ -81,7 +81,7 @@ public interface ExecutableInsertOperation { * @param table {@link CqlIdentifier name} of the table; must not be {@literal null}. * @return new instance of {@link InsertWithOptions}. * @throws IllegalArgumentException if {@link CqlIdentifier table} is {@literal null}. - * @see org.springframework.data.cassandra.core.cql.CqlIdentifier + * @see com.datastax.oss.driver.api.core.CqlIdentifier * @see InsertWithOptions */ InsertWithOptions inTable(CqlIdentifier table); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperation.java index 8b079f577..bcfe7f184 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperation.java @@ -97,7 +97,7 @@ public interface ExecutableSelectOperation { * @param table {@link CqlIdentifier name} of the table; must not be {@literal null}. * @return new instance of {@link SelectWithProjection}. * @throws IllegalArgumentException if {@link CqlIdentifier table} is {@literal null}. - * @see org.springframework.data.cassandra.core.cql.CqlIdentifier + * @see com.datastax.oss.driver.api.core.CqlIdentifier * @see SelectWithProjection */ SelectWithProjection inTable(CqlIdentifier table); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableUpdateOperation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableUpdateOperation.java index bf017e250..ffe3dbe99 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableUpdateOperation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableUpdateOperation.java @@ -90,7 +90,7 @@ public interface ExecutableUpdateOperation { * @param table {@link CqlIdentifier name} of the table; must not be {@literal null}. * @return new instance of {@link UpdateWithQuery}. * @throws IllegalArgumentException if {@link CqlIdentifier table} is {@literal null}. - * @see org.springframework.data.cassandra.core.cql.CqlIdentifier + * @see com.datastax.oss.driver.api.core.CqlIdentifier * @see UpdateWithQuery */ UpdateWithQuery inTable(CqlIdentifier table); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveDeleteOperation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveDeleteOperation.java index 06850ef5d..e2ffcaeaf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveDeleteOperation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveDeleteOperation.java @@ -88,7 +88,7 @@ public interface ReactiveDeleteOperation { * @param table {@link CqlIdentifier name} of the table; must not be {@literal null}. * @return new instance of {@link DeleteWithQuery}. * @throws IllegalArgumentException if {@link CqlIdentifier table} is {@literal null}. - * @see org.springframework.data.cassandra.core.cql.CqlIdentifier + * @see com.datastax.oss.driver.api.core.CqlIdentifier * @see DeleteWithQuery */ DeleteWithQuery inTable(CqlIdentifier table); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveInsertOperation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveInsertOperation.java index 5ab92c4ed..567756ce8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveInsertOperation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveInsertOperation.java @@ -85,7 +85,7 @@ public interface ReactiveInsertOperation { * @param table {@link String name} of the table; must not be {@literal null}. * @return new instance of {@link InsertWithOptions}. * @throws IllegalArgumentException if {@link CqlIdentifier table} is {@literal null}. - * @see org.springframework.data.cassandra.core.cql.CqlIdentifier + * @see com.datastax.oss.driver.api.core.CqlIdentifier * @see InsertWithOptions */ InsertWithOptions inTable(CqlIdentifier table); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveSelectOperation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveSelectOperation.java index 894652c49..f9ce706fe 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveSelectOperation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveSelectOperation.java @@ -95,7 +95,7 @@ public interface ReactiveSelectOperation { * @param table {@link CqlIdentifier name} of the table; must not be {@literal null}. * @return new instance of {@link SelectWithProjection}. * @throws IllegalArgumentException if {@link CqlIdentifier table} is {@literal null}. - * @see org.springframework.data.cassandra.core.cql.CqlIdentifier + * @see com.datastax.oss.driver.api.core.CqlIdentifier * @see SelectWithProjection */ SelectWithProjection inTable(CqlIdentifier table); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveUpdateOperation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveUpdateOperation.java index 88f8fb312..464e31045 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveUpdateOperation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveUpdateOperation.java @@ -93,7 +93,7 @@ public interface ReactiveUpdateOperation { * @param table {@link CqlIdentifier name} of the table; must not be {@literal null}. * @return new instance of {@link UpdateWithQuery}. * @throws IllegalArgumentException if {@link CqlIdentifier table} is {@literal null}. - * @see org.springframework.data.cassandra.core.cql.CqlIdentifier + * @see com.datastax.oss.driver.api.core.CqlIdentifier * @see UpdateWithQuery */ UpdateWithQuery inTable(CqlIdentifier table); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java index dbac78087..7ac032671 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java @@ -17,8 +17,6 @@ package org.springframework.data.cassandra.core.mapping; import java.util.Comparator; -import org.springframework.data.cassandra.core.cql.CqlIdentifier; - /** * {@link Comparator} implementation that orders {@link CassandraPersistentProperty} instances. *

@@ -27,7 +25,8 @@ import org.springframework.data.cassandra.core.cql.CqlIdentifier; *

  • Composite primary keys first (equal if both {@link CassandraPersistentProperty} are a composite primary key)
    • *
  • Primary key columns (see {@link CassandraPrimaryKeyColumnAnnotationComparator}, compare by ordinal/name/ordering) *
    • - *
  • Regular columns, compared by column name (see {@link CqlIdentifier#compareTo(CqlIdentifier)})
    • + *
  • Regular columns, compared by column name (see + * {@link com.datastax.oss.driver.api.core.CqlIdentifier#compareTo(CqlIdentifier)})
    • * * * @author Alex Shvid