diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraAuthenticationException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraAuthenticationException.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraAuthenticationException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraAuthenticationException.java index 528a1af6a..888f6ef44 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraAuthenticationException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraAuthenticationException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import java.net.InetAddress; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraConnectionFailureException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraConnectionFailureException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraConnectionFailureException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraConnectionFailureException.java index a30616c5a..6cf6be359 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraConnectionFailureException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraConnectionFailureException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import java.net.InetSocketAddress; import java.util.Collections; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInsufficientReplicasAvailableException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInsufficientReplicasAvailableException.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInsufficientReplicasAvailableException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInsufficientReplicasAvailableException.java index 7a76f1df0..819952e7b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInsufficientReplicasAvailableException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInsufficientReplicasAvailableException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.TransientDataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInternalException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInternalException.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInternalException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInternalException.java index 556c7362b..185c677d4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInternalException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInternalException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.DataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidConfigurationInQueryException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInvalidConfigurationInQueryException.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidConfigurationInQueryException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInvalidConfigurationInQueryException.java index 524075722..ec112c05e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidConfigurationInQueryException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInvalidConfigurationInQueryException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.InvalidDataAccessApiUsageException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidQueryException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInvalidQueryException.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidQueryException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInvalidQueryException.java index cc45a591b..839a9ce20 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraInvalidQueryException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInvalidQueryException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.InvalidDataAccessApiUsageException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraKeyspaceExistsException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraKeyspaceExistsException.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraKeyspaceExistsException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraKeyspaceExistsException.java index d3cbbb3dc..408ac2e47 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraKeyspaceExistsException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraKeyspaceExistsException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; /** * Spring data access exception for Cassandra when a keyspace being created already exists. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraQuerySyntaxException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraQuerySyntaxException.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraQuerySyntaxException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraQuerySyntaxException.java index aebadff27..aca9530d1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraQuerySyntaxException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraQuerySyntaxException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.InvalidDataAccessApiUsageException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraReadTimeoutException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraReadTimeoutException.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraReadTimeoutException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraReadTimeoutException.java index c13030b9f..6acb1ec31 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraReadTimeoutException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraReadTimeoutException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.QueryTimeoutException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraSchemaElementExistsException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraSchemaElementExistsException.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraSchemaElementExistsException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraSchemaElementExistsException.java index 12eb49942..7bf8a5ab9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraSchemaElementExistsException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraSchemaElementExistsException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.NonTransientDataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTableExistsException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTableExistsException.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTableExistsException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTableExistsException.java index 533b0370a..973c49b5e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTableExistsException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTableExistsException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; /** * Spring data access exception for when a Cassandra table being created already exists. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTraceRetrievalException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTraceRetrievalException.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTraceRetrievalException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTraceRetrievalException.java index 24ab8d26c..fee1dfb8c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTraceRetrievalException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTraceRetrievalException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.TransientDataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTruncateException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTruncateException.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTruncateException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTruncateException.java index cdb5e4ad6..1f04dba65 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTruncateException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTruncateException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.TransientDataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTypeMismatchException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTypeMismatchException.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTypeMismatchException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTypeMismatchException.java index 55e66268c..033c653f6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraTypeMismatchException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTypeMismatchException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.TypeMismatchDataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUnauthorizedException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraUnauthorizedException.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUnauthorizedException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraUnauthorizedException.java index 8d6fa3278..b836a3df4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUnauthorizedException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraUnauthorizedException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.PermissionDeniedDataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUncategorizedException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraUncategorizedException.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUncategorizedException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraUncategorizedException.java index 0bfb3ebfc..ef926c0cc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraUncategorizedException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraUncategorizedException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.UncategorizedDataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraWriteTimeoutException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraWriteTimeoutException.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraWriteTimeoutException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraWriteTimeoutException.java index 5f11e9d63..a99ffee75 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/CassandraWriteTimeoutException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraWriteTimeoutException.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support.exception; +package org.springframework.data.cassandra; import org.springframework.dao.QueryTimeoutException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveResultSet.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveResultSet.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveResultSet.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveResultSet.java index 6159498bf..e8a719cee 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveResultSet.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveResultSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session; +package org.springframework.data.cassandra; import reactor.core.publisher.Flux; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSession.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSession.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSession.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSession.java index 51a7e0871..9d69d15f8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSession.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSession.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session; +package org.springframework.data.cassandra; import reactor.core.publisher.Mono; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSessionFactory.java similarity index 85% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSessionFactory.java index cc490651f..34ca8f6e2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/ReactiveSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSessionFactory.java @@ -13,9 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session; - -import org.springframework.data.cql.core.ReactiveCqlTemplate; +package org.springframework.data.cassandra; /** * Strategy interface to produce {@link ReactiveSession} instances. @@ -27,8 +25,8 @@ import org.springframework.data.cql.core.ReactiveCqlTemplate; * @author Mark Paluch * @see 2.0 * @see ReactiveSession - * @see DefaultReactiveSessionFactory - * @see ReactiveCqlTemplate + * @see org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessionFactory + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlTemplate */ public interface ReactiveSessionFactory { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/SessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/SessionFactory.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/SessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/SessionFactory.java index c43e942ad..915d4018e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/SessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/SessionFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session; +package org.springframework.data.cassandra; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractCassandraConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractCassandraConfiguration.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java index 3774cb3f1..86dc868d1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractCassandraConfiguration.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.config.java; +package org.springframework.data.cassandra.config; import java.util.Collections; import java.util.Set; @@ -22,21 +22,17 @@ import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -import org.springframework.data.cassandra.config.CassandraEntityClassScanner; -import org.springframework.data.cassandra.config.CassandraSessionFactoryBean; -import org.springframework.data.cassandra.config.SchemaAction; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.data.cassandra.core.CassandraAdminOperations; import org.springframework.data.cassandra.core.CassandraAdminTemplate; import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.convert.CassandraCustomConversions; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.cql.session.DefaultSessionFactory; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver; import org.springframework.data.cassandra.core.mapping.Table; import org.springframework.data.convert.CustomConversions; -import org.springframework.data.cql.config.java.AbstractClusterConfiguration; -import org.springframework.data.cql.core.session.DefaultSessionFactory; -import org.springframework.data.cql.core.session.SessionFactory; import org.springframework.data.mapping.context.MappingContext; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractClusterConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractClusterConfiguration.java similarity index 85% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractClusterConfiguration.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractClusterConfiguration.java index 2ad64b729..bb1c09a5c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractClusterConfiguration.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractClusterConfiguration.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,18 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.java; +package org.springframework.data.cassandra.config; import java.util.Collections; import java.util.List; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.cql.config.CassandraCqlClusterFactoryBean; -import org.springframework.data.cql.config.ClusterBuilderConfigurer; -import org.springframework.data.cql.config.CompressionType; -import org.springframework.data.cql.core.keyspace.CreateKeyspaceSpecification; -import org.springframework.data.cql.core.keyspace.DropKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.CreateKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropKeyspaceSpecification; import com.datastax.driver.core.AuthProvider; import com.datastax.driver.core.NettyOptions; @@ -52,19 +49,19 @@ import com.datastax.driver.core.policies.SpeculativeExecutionPolicy; public abstract class AbstractClusterConfiguration { /** - * Creates a {@link CassandraCqlClusterFactoryBean} that provides a Cassandra - * {@link com.datastax.driver.core.Cluster}. The lifecycle of {@link CassandraCqlClusterFactoryBean} executes - * {@link #getStartupScripts() startup} and {@link #getShutdownScripts() shutdown} scripts. + * Creates a {@link CassandraClusterFactoryBean} that provides a Cassandra {@link com.datastax.driver.core.Cluster}. + * The lifecycle of {@link CassandraClusterFactoryBean} executes {@link #getStartupScripts() startup} and + * {@link #getShutdownScripts() shutdown} scripts. * - * @return the {@link CassandraCqlClusterFactoryBean}. + * @return the {@link CassandraClusterFactoryBean}. * @see #cluster() * @see #getStartupScripts() * @see #getShutdownScripts() */ @Bean - public CassandraCqlClusterFactoryBean cluster() { + public CassandraClusterFactoryBean cluster() { - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setAddressTranslator(getAddressTranslator()); bean.setAuthProvider(getAuthProvider()); @@ -146,10 +143,10 @@ public abstract class AbstractClusterConfiguration { * Returns the Cassandra contact points. Defaults to {@code localhost} * * @return the Cassandra contact points - * @see CassandraCqlClusterFactoryBean#DEFAULT_CONTACT_POINTS + * @see CassandraClusterFactoryBean#DEFAULT_CONTACT_POINTS */ protected String getContactPoints() { - return CassandraCqlClusterFactoryBean.DEFAULT_CONTACT_POINTS; + return CassandraClusterFactoryBean.DEFAULT_CONTACT_POINTS; } /** @@ -167,17 +164,17 @@ public abstract class AbstractClusterConfiguration { * @return the maximum schema agreement wait in seconds; default to {@literal 10} seconds. */ protected int getMaxSchemaAgreementWaitSeconds() { - return CassandraCqlClusterFactoryBean.DEFAULT_MAX_SCHEMA_AGREEMENT_WAIT_SECONDS; + return CassandraClusterFactoryBean.DEFAULT_MAX_SCHEMA_AGREEMENT_WAIT_SECONDS; } /** * Returns the whether to enable metrics. Defaults to {@literal true} * * @return {@literal true} to enable metrics. - * @see CassandraCqlClusterFactoryBean#DEFAULT_METRICS_ENABLED + * @see CassandraClusterFactoryBean#DEFAULT_METRICS_ENABLED */ protected boolean getMetricsEnabled() { - return CassandraCqlClusterFactoryBean.DEFAULT_METRICS_ENABLED; + return CassandraClusterFactoryBean.DEFAULT_METRICS_ENABLED; } /** @@ -203,10 +200,10 @@ public abstract class AbstractClusterConfiguration { * Returns the Cassandra port. Defaults to {@code 9042} * * @return the Cassandra port - * @see CassandraCqlClusterFactoryBean#DEFAULT_PORT + * @see CassandraClusterFactoryBean#DEFAULT_PORT */ protected int getPort() { - return CassandraCqlClusterFactoryBean.DEFAULT_PORT; + return CassandraClusterFactoryBean.DEFAULT_PORT; } /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractCqlTemplateConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCqlTemplateConfiguration.java similarity index 84% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractCqlTemplateConfiguration.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCqlTemplateConfiguration.java index 71b8c4c63..7f38bad51 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractCqlTemplateConfiguration.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCqlTemplateConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.java; +package org.springframework.data.cassandra.config; import org.springframework.context.annotation.Bean; -import org.springframework.data.cql.core.CqlTemplate; +import org.springframework.data.cassandra.core.cql.CqlTemplate; /** * Abstract configuration class to create a {@link CqlTemplate} and inheriting {@link com.datastax.driver.core.Session} @@ -24,8 +24,8 @@ import org.springframework.data.cql.core.CqlTemplate; * * @author Matthew T. Adams * @author Mark Paluch - * @see org.springframework.data.cql.config.java.AbstractClusterConfiguration - * @see org.springframework.data.cql.config.java.AbstractSessionConfiguration + * @see AbstractClusterConfiguration + * @see AbstractSessionConfiguration * @see com.datastax.driver.core.Session * @see com.datastax.driver.core.Cluster * @see CqlTemplate diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractReactiveCassandraConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractReactiveCassandraConfiguration.java similarity index 84% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractReactiveCassandraConfiguration.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractReactiveCassandraConfiguration.java index 4a0606e4d..b53ddc931 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractReactiveCassandraConfiguration.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractReactiveCassandraConfiguration.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.config.java; +package org.springframework.data.cassandra.config; import reactor.core.scheduler.Schedulers; import org.springframework.context.annotation.Bean; +import org.springframework.data.cassandra.ReactiveSession; +import org.springframework.data.cassandra.ReactiveSessionFactory; import org.springframework.data.cassandra.core.CassandraAdminTemplate; import org.springframework.data.cassandra.core.ReactiveCassandraOperations; import org.springframework.data.cassandra.core.ReactiveCassandraTemplate; -import org.springframework.data.cql.core.ReactiveCqlOperations; -import org.springframework.data.cql.core.ReactiveCqlTemplate; -import org.springframework.data.cql.core.session.DefaultBridgedReactiveSession; -import org.springframework.data.cql.core.session.DefaultReactiveSessionFactory; -import org.springframework.data.cql.core.session.ReactiveSession; -import org.springframework.data.cql.core.session.ReactiveSessionFactory; +import org.springframework.data.cassandra.core.cql.ReactiveCqlOperations; +import org.springframework.data.cassandra.core.cql.ReactiveCqlTemplate; +import org.springframework.data.cassandra.core.cql.session.DefaultBridgedReactiveSession; +import org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessionFactory; /** * Extension to {@link AbstractCassandraConfiguration} providing Spring Data Cassandra configuration for Spring Data's diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractSessionConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java similarity index 83% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractSessionConfiguration.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java index 5a1622c5a..c05a79b47 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/AbstractSessionConfiguration.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.java; +package org.springframework.data.cassandra.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.cql.config.CassandraCqlSessionFactoryBean; -import org.springframework.data.cql.core.session.DefaultSessionFactory; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; +import org.springframework.data.cassandra.core.cql.CqlTemplate; +import org.springframework.data.cassandra.core.cql.session.DefaultSessionFactory; /** * Spring {@link @Configuration} class used to configure a Cassandra client application @@ -29,7 +29,7 @@ import org.springframework.data.cql.core.session.SessionFactory; * @author Matthew T. Adams * @author John Blum * @author Mark Paluch - * @see org.springframework.data.cql.config.java.AbstractClusterConfiguration + * @see AbstractClusterConfiguration * @see org.springframework.context.annotation.Configuration */ @Configuration @@ -56,7 +56,7 @@ public abstract class AbstractSessionConfiguration extends AbstractClusterConfig /** * Creates a {@link DefaultSessionFactory} using the configured {@link #session()} to be used with - * {@link org.springframework.data.cql.core.CqlTemplate}. + * {@link CqlTemplate}. * * @return {@link SessionFactory} used to initialize the Template API. * @since 2.0 diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBean.java index 8b17e517e..520af453c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBean.java @@ -1,11 +1,11 @@ /* - * Copyright 2013-2017 the original author or authors + * Copyright 2013-2017 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 * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,17 +13,645 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.cassandra.config; -import org.springframework.data.cql.config.CassandraCqlClusterFactoryBean; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.BeanNameAware; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.beans.factory.FactoryBean; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.dao.DataAccessException; +import org.springframework.dao.support.PersistenceExceptionTranslator; +import org.springframework.data.cassandra.core.cql.CassandraExceptionTranslator; +import org.springframework.data.cassandra.core.cql.CqlTemplate; +import org.springframework.data.cassandra.core.cql.generator.CreateKeyspaceCqlGenerator; +import org.springframework.data.cassandra.core.cql.generator.DropKeyspaceCqlGenerator; +import org.springframework.data.cassandra.core.cql.keyspace.CreateKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceActionSpecification; +import org.springframework.util.Assert; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; + +import com.datastax.driver.core.*; +import com.datastax.driver.core.Cluster.Builder; +import com.datastax.driver.core.ProtocolOptions.Compression; +import com.datastax.driver.core.policies.AddressTranslator; +import com.datastax.driver.core.policies.LoadBalancingPolicy; +import com.datastax.driver.core.policies.ReconnectionPolicy; +import com.datastax.driver.core.policies.RetryPolicy; +import com.datastax.driver.core.policies.SpeculativeExecutionPolicy; /** - * Spring Data Cassandra extension of CassandraCqlClusterFactoryBean. This class exists only in the name of symmetry, - * based on the other CassandraData*FactoryBean classes. + * {@link org.springframework.beans.factory.FactoryBean} for configuring a Cassandra {@link Cluster}. * + * @author Alex Shvid * @author Matthew T. Adams + * @author David Webb + * @author Kirk Clemens + * @author Jorge Davison + * @author John Blum + * @author Mark Paluch + * @author Stefan Birkner + * @see org.springframework.beans.factory.InitializingBean + * @see org.springframework.beans.factory.DisposableBean + * @see org.springframework.beans.factory.FactoryBean + * @see com.datastax.driver.core.Cluster */ -public class CassandraClusterFactoryBean extends CassandraCqlClusterFactoryBean { +@SuppressWarnings("unused") +public class CassandraClusterFactoryBean + implements FactoryBean, InitializingBean, DisposableBean, BeanNameAware, PersistenceExceptionTranslator { + public static final boolean DEFAULT_JMX_REPORTING_ENABLED = true; + public static final boolean DEFAULT_METRICS_ENABLED = true; + public static final boolean DEFAULT_SSL_ENABLED = false; + + public static final int DEFAULT_MAX_SCHEMA_AGREEMENT_WAIT_SECONDS = 10; + public static final int DEFAULT_PORT = 9042; + + public static final String DEFAULT_CONTACT_POINTS = "localhost"; + + protected static final Logger log = LoggerFactory.getLogger(CassandraCqlClusterFactoryBean.class); + + private boolean jmxReportingEnabled = DEFAULT_JMX_REPORTING_ENABLED; + private boolean metricsEnabled = DEFAULT_METRICS_ENABLED; + private boolean sslEnabled = DEFAULT_SSL_ENABLED; + + private int maxSchemaAgreementWaitSeconds = DEFAULT_MAX_SCHEMA_AGREEMENT_WAIT_SECONDS; + private int port = DEFAULT_PORT; + + private final PersistenceExceptionTranslator exceptionTranslator = new CassandraExceptionTranslator(); + + private Cluster cluster; + private ClusterBuilderConfigurer clusterBuilderConfigurer; + + private AddressTranslator addressTranslator; + private AuthProvider authProvider; + private CompressionType compressionType; + private Host.StateListener hostStateListener; + private LatencyTracker latencyTracker; + + private List keyspaceCreations = new ArrayList<>(); + private List keyspaceDrops = new ArrayList<>(); + private Set> keyspaceSpecifications = new HashSet<>(); + + private List startupScripts = new ArrayList<>(); + private List shutdownScripts = new ArrayList<>(); + + private LoadBalancingPolicy loadBalancingPolicy; + private NettyOptions nettyOptions; + private PoolingOptions poolingOptions; + private ProtocolVersion protocolVersion; + private QueryOptions queryOptions; + private ReconnectionPolicy reconnectionPolicy; + private RetryPolicy retryPolicy; + private SpeculativeExecutionPolicy speculativeExecutionPolicy; + private SocketOptions socketOptions; + private SSLOptions sslOptions; + private TimestampGenerator timestampGenerator; + + private String beanName; + private String clusterName; + private String contactPoints = DEFAULT_CONTACT_POINTS; + private String password; + private String username; + + /* + * (non-Javadoc) + * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() + */ + @Override + public void afterPropertiesSet() throws Exception { + + Assert.hasText(contactPoints, "At least one server is required"); + + Cluster.Builder clusterBuilder = newClusterBuilder(); + + clusterBuilder.addContactPoints(StringUtils.commaDelimitedListToStringArray(contactPoints)).withPort(port); + clusterBuilder.withMaxSchemaAgreementWaitSeconds(maxSchemaAgreementWaitSeconds); + + Optional.ofNullable(compressionType).map(CassandraClusterFactoryBean::convertCompressionType) + .ifPresent(clusterBuilder::withCompression); + + Optional.ofNullable(addressTranslator).ifPresent(clusterBuilder::withAddressTranslator); + Optional.ofNullable(loadBalancingPolicy).ifPresent(clusterBuilder::withLoadBalancingPolicy); + Optional.ofNullable(nettyOptions).ifPresent(clusterBuilder::withNettyOptions); + Optional.ofNullable(poolingOptions).ifPresent(clusterBuilder::withPoolingOptions); + Optional.ofNullable(protocolVersion).ifPresent(clusterBuilder::withProtocolVersion); + Optional.ofNullable(queryOptions).ifPresent(clusterBuilder::withQueryOptions); + Optional.ofNullable(reconnectionPolicy).ifPresent(clusterBuilder::withReconnectionPolicy); + Optional.ofNullable(retryPolicy).ifPresent(clusterBuilder::withRetryPolicy); + Optional.ofNullable(socketOptions).ifPresent(clusterBuilder::withSocketOptions); + Optional.ofNullable(speculativeExecutionPolicy).ifPresent(clusterBuilder::withSpeculativeExecutionPolicy); + Optional.ofNullable(timestampGenerator).ifPresent(clusterBuilder::withTimestampGenerator); + + if (authProvider != null) { + clusterBuilder.withAuthProvider(authProvider); + } else if (username != null) { + clusterBuilder.withCredentials(username, password); + } + + if (!jmxReportingEnabled) { + clusterBuilder.withoutJMXReporting(); + } + + if (!metricsEnabled) { + clusterBuilder.withoutMetrics(); + } + + if (sslEnabled) { + if (sslOptions != null) { + clusterBuilder.withSSL(sslOptions); + } else { + clusterBuilder.withSSL(); + } + } + + Optional.ofNullable(resolveClusterName()).filter(StringUtils::hasText).ifPresent(clusterBuilder::withClusterName); + + if (clusterBuilderConfigurer != null) { + clusterBuilderConfigurer.configure(clusterBuilder); + } + + cluster = clusterBuilder.build(); + + Optional.ofNullable(hostStateListener).ifPresent(cluster::register); + Optional.ofNullable(latencyTracker).ifPresent(cluster::register); + + generateSpecificationsFromFactoryBeans(); + executeSpecsAndScripts(keyspaceCreations, startupScripts); + } + + /* + * (non-Javadoc) + * @see com.datastax.driver.core.Cluster#builder() + */ + Cluster.Builder newClusterBuilder() { + return Cluster.builder(); + } + + /* (non-Javadoc) */ + private String resolveClusterName() { + return (StringUtils.hasText(clusterName) ? clusterName : beanName); + } + + /* + * (non-Javadoc) + * @see org.springframework.beans.factory.DisposableBean#destroy() + */ + @Override + public void destroy() throws Exception { + executeSpecsAndScripts(keyspaceDrops, shutdownScripts); + cluster.close(); + } + + /* + * (non-Javadoc) + * @see org.springframework.beans.factory.FactoryBean#getObject() + */ + @Override + public Cluster getObject() { + return cluster; + } + + /* + * (non-Javadoc) + * @see org.springframework.beans.factory.FactoryBean#getObjectType() + */ + @Override + public Class getObjectType() { + return (cluster != null ? cluster.getClass() : Cluster.class); + } + + /* + * (non-Javadoc) + * @see org.springframework.beans.factory.FactoryBean#isSingleton() + */ + @Override + public boolean isSingleton() { + return true; + } + + /* + * (non-Javadoc) + * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException) + */ + @Override + public DataAccessException translateExceptionIfPossible(RuntimeException ex) { + return exceptionTranslator.translateExceptionIfPossible(ex); + } + + /** + * Examines the contents of all the KeyspaceSpecificationFactoryBeans and generates the proper KeyspaceSpecification + * from them. + */ + private void generateSpecificationsFromFactoryBeans() { + + keyspaceSpecifications.forEach(keyspaceActionSpecification -> { + + if (keyspaceActionSpecification instanceof CreateKeyspaceSpecification) { + keyspaceCreations.add((CreateKeyspaceSpecification) keyspaceActionSpecification); + } + + if (keyspaceActionSpecification instanceof DropKeyspaceSpecification) { + keyspaceDrops.add((DropKeyspaceSpecification) keyspaceActionSpecification); + } + }); + } + + protected void executeSpecsAndScripts(List> kepspaceActionSpecifications, + List scripts) { + + if (!CollectionUtils.isEmpty(kepspaceActionSpecifications) || !CollectionUtils.isEmpty(scripts)) { + + Session session = cluster.connect(); + + try { + CqlTemplate template = new CqlTemplate(session); + + kepspaceActionSpecifications + .forEach(keyspaceActionSpecification -> template.execute(toCql(keyspaceActionSpecification))); + + scripts.forEach(template::execute); + } finally { + if (session != null) { + session.close(); + } + } + } + } + + private String toCql(KeyspaceActionSpecification keyspaceActionSpecification) { + + return (keyspaceActionSpecification instanceof CreateKeyspaceSpecification + ? new CreateKeyspaceCqlGenerator((CreateKeyspaceSpecification) keyspaceActionSpecification).toCql() + : new DropKeyspaceCqlGenerator((DropKeyspaceSpecification) keyspaceActionSpecification).toCql()); + } + + /* + * (non-Javadoc) + * @see org.springframework.beans.factory.BeanNameAware#setBeanName(String) + * @since 1.5 + */ + @Override + public void setBeanName(String beanName) { + this.beanName = beanName; + } + + /** + * Set a comma-delimited string of the contact points (hosts) to connect to. Default is {@code localhost}; see + * {@link #DEFAULT_CONTACT_POINTS}. + * + * @param contactPoints the contact points used by the new cluster. + */ + public void setContactPoints(String contactPoints) { + this.contactPoints = contactPoints; + } + + /** + * Set the port for the contact points. Default is {@code 9042}, see {@link #DEFAULT_PORT}. + * + * @param port the port used by the new cluster. + */ + public void setPort(int port) { + this.port = port; + } + + /** + * Set the {@link CompressionType}. Default is uncompressed. + * + * @param compressionType the {@link CompressionType} used by the new cluster. + */ + public void setCompressionType(CompressionType compressionType) { + this.compressionType = compressionType; + } + + /** + * Set the {@link PoolingOptions} to configure the connection pooling behavior. + * + * @param poolingOptions the {@link PoolingOptions} used by the new cluster. + */ + public void setPoolingOptions(PoolingOptions poolingOptions) { + this.poolingOptions = poolingOptions; + } + + /** + * Set the {@link ProtocolVersion}. + * + * @param protocolVersion the {@link ProtocolVersion} used by the new cluster. + * @since 1.4 + */ + public void setProtocolVersion(ProtocolVersion protocolVersion) { + this.protocolVersion = protocolVersion; + } + + /** + * Set the {@link SocketOptions} containing low-level socket options. + * + * @param socketOptions the {@link SocketOptions} used by the new cluster. + */ + public void setSocketOptions(SocketOptions socketOptions) { + this.socketOptions = socketOptions; + } + + /** + * Set the {@link QueryOptions} to tune to defaults for individual queries. + * + * @param queryOptions the {@link QueryOptions} used by the new cluster. + */ + public void setQueryOptions(QueryOptions queryOptions) { + this.queryOptions = queryOptions; + } + + /** + * Set the {@link AuthProvider}. Default is unauthenticated. + * + * @param authProvider the {@link AuthProvider} used by the new cluster. + */ + public void setAuthProvider(AuthProvider authProvider) { + this.authProvider = authProvider; + } + + /** + * Set the {@link NettyOptions} used by a client to customize the driver's underlying Netty layer. + * + * @param nettyOptions the {@link NettyOptions} used by the new cluster. + * @since 1.5 + */ + public void setNettyOptions(NettyOptions nettyOptions) { + this.nettyOptions = nettyOptions; + } + + /** + * Set the {@link LoadBalancingPolicy} that decides which Cassandra hosts to contact for each new query. + * + * @param loadBalancingPolicy the {@link LoadBalancingPolicy} used by the new cluster. + */ + public void setLoadBalancingPolicy(LoadBalancingPolicy loadBalancingPolicy) { + this.loadBalancingPolicy = loadBalancingPolicy; + } + + /** + * Set the {@link ReconnectionPolicy} that decides how often the reconnection to a dead node is attempted. + * + * @param reconnectionPolicy the {@link ReconnectionPolicy} used by the new cluster. + */ + public void setReconnectionPolicy(ReconnectionPolicy reconnectionPolicy) { + this.reconnectionPolicy = reconnectionPolicy; + } + + /** + * Set the {@link RetryPolicy} that defines a default behavior to adopt when a request fails. + * + * @param retryPolicy the {@link RetryPolicy} used by the new cluster. + */ + public void setRetryPolicy(RetryPolicy retryPolicy) { + this.retryPolicy = retryPolicy; + } + + /** + * Set whether metrics are enabled. Default is {@literal true}, see {@link #DEFAULT_METRICS_ENABLED}. + */ + public void setMetricsEnabled(boolean metricsEnabled) { + this.metricsEnabled = metricsEnabled; + } + + /** + * Set a {@link List} of {@link CreateKeyspaceSpecification create keyspace specifications} that are executed when + * this factory is {@link #afterPropertiesSet() initialized}. {@link CreateKeyspaceSpecification Create keyspace + * specifications} are executed on a system session with no keyspace set, before executing + * {@link #setStartupScripts(List)}. + * + * @param specifications the {@link List} of {@link CreateKeyspaceSpecification create keyspace specifications}. + */ + public void setKeyspaceCreations(List specifications) { + this.keyspaceCreations = specifications; + } + + /** + * @return {@link List} of {@link CreateKeyspaceSpecification create keyspace specifications}. + */ + public List getKeyspaceCreations() { + return keyspaceCreations; + } + + /** + * Set a {@link List} of {@link DropKeyspaceSpecification drop keyspace specifications} that are executed when this + * factory is {@link #destroy() destroyed}. {@link DropKeyspaceSpecification Drop keyspace specifications} are + * executed on a system session with no keyspace set, before executing {@link #setShutdownScripts(List)}. + * + * @param specifications the {@link List} of {@link DropKeyspaceSpecification drop keyspace specifications}. + */ + public void setKeyspaceDrops(List specifications) { + this.keyspaceDrops = specifications; + } + + /** + * @return the {@link List} of {@link DropKeyspaceSpecification drop keyspace specifications}. + */ + public List getKeyspaceDrops() { + return keyspaceDrops; + } + + /** + * Set a {@link List} of raw {@link String CQL statements} that are executed when this factory is + * {@link #afterPropertiesSet() initialized}. Scripts are executed on a system session with no keyspace set, after + * executing {@link #setKeyspaceCreations(List)}. + * + * @param scripts the scripts to execute on startup + */ + public void setStartupScripts(List scripts) { + this.startupScripts = scripts; + } + + /** + * @return the startup scripts + */ + public List getStartupScripts() { + return startupScripts; + } + + /** + * Set a {@link List} of raw {@link String CQL statements} that are executed when this factory is {@link #destroy() + * destroyed}. {@link DropKeyspaceSpecification Drop keyspace specifications} are executed on a system session with no + * keyspace set, after executing {@link #setKeyspaceDrops(List)}. + * + * @param scripts the scripts to execute on shutdown + */ + public void setShutdownScripts(List scripts) { + this.shutdownScripts = scripts; + } + + /** + * @return the shutdown scripts + */ + public List getShutdownScripts() { + return shutdownScripts; + } + + /** + * @param keyspaceSpecifications The {@link KeyspaceActionSpecification} to set. + */ + public void setKeyspaceSpecifications(Set> keyspaceSpecifications) { + this.keyspaceSpecifications = keyspaceSpecifications; + } + + /** + * @return the {@link KeyspaceActionSpecification} associated with this factory. + */ + public Set> getKeyspaceSpecifications() { + return keyspaceSpecifications; + } + + /** + * Set the username to use with {@link com.datastax.driver.core.PlainTextAuthProvider}. + * + * @param username The username to set. + */ + public void setUsername(String username) { + this.username = username; + } + + /** + * Set the username to use with {@link com.datastax.driver.core.PlainTextAuthProvider}. + * + * @param password The password to set. + */ + public void setPassword(String password) { + this.password = password; + } + + /** + * Set whether to use JMX reporting. Default is {@literal false}, see {@link #DEFAULT_JMX_REPORTING_ENABLED}. + * + * @param jmxReportingEnabled The jmxReportingEnabled to set. + */ + public void setJmxReportingEnabled(boolean jmxReportingEnabled) { + this.jmxReportingEnabled = jmxReportingEnabled; + } + + /** + * Set whether to use SSL. Default is plain, see {@link #DEFAULT_SSL_ENABLED}. + * + * @param sslEnabled The sslEnabled to set. + */ + public void setSslEnabled(boolean sslEnabled) { + this.sslEnabled = sslEnabled; + } + + /** + * @param sslOptions The sslOptions to set. + */ + public void setSslOptions(SSLOptions sslOptions) { + this.sslOptions = sslOptions; + } + + /** + * @param hostStateListener The hostStateListener to set. + */ + public void setHostStateListener(Host.StateListener hostStateListener) { + this.hostStateListener = hostStateListener; + } + + /** + * @param latencyTracker The latencyTracker to set. + */ + public void setLatencyTracker(LatencyTracker latencyTracker) { + this.latencyTracker = latencyTracker; + } + + /** + * Configures the address translator used by the new cluster to translate IP addresses received from Cassandra nodes + * into locally query-able addresses. + * + * @param addressTranslator {@link AddressTranslator} used by the new cluster. + * @see com.datastax.driver.core.Cluster.Builder#withAddressTranslator(AddressTranslator) + * @see com.datastax.driver.core.policies.AddressTranslator + * @since 1.5 + */ + public void setAddressTranslator(AddressTranslator addressTranslator) { + this.addressTranslator = addressTranslator; + } + + /** + * Sets the {@link ClusterBuilderConfigurer} used to apply additional configuration logic to the + * {@link com.datastax.driver.core.Cluster.Builder}. {@link ClusterBuilderConfigurer} is invoked after all provided + * options are configured. The factory will {@link Builder#build()} the {@link Cluster} after applying + * {@link ClusterBuilderConfigurer}. + * + * @param clusterBuilderConfigurer {@link ClusterBuilderConfigurer} used to configure the + * {@link com.datastax.driver.core.Cluster.Builder}. + * @see org.springframework.data.cql.config.ClusterBuilderConfigurer + */ + public void setClusterBuilderConfigurer(ClusterBuilderConfigurer clusterBuilderConfigurer) { + this.clusterBuilderConfigurer = clusterBuilderConfigurer; + } + + /** + * An optional name for the cluster instance. This name appears in JMX metrics. Defaults to the bean name. + * + * @param clusterName optional name for the cluster. + * @see com.datastax.driver.core.Cluster.Builder#withClusterName(String) + * @since 1.5 + */ + public void setClusterName(String clusterName) { + this.clusterName = clusterName; + } + + /** + * Sets the maximum time to wait for schema agreement before returning from a DDL query. The timeout is used to wait + * for all currently up hosts in the cluster to agree on the schema. + * + * @param seconds max schema agreement wait in seconds. + * @see com.datastax.driver.core.Cluster.Builder#withMaxSchemaAgreementWaitSeconds(int) + * @since 1.5 + */ + public void setMaxSchemaAgreementWaitSeconds(int seconds) { + this.maxSchemaAgreementWaitSeconds = seconds; + } + + /** + * Configures the speculative execution policy to use for the new cluster. + * + * @param speculativeExecutionPolicy {@link SpeculativeExecutionPolicy} to use with the new cluster. + * @see com.datastax.driver.core.Cluster.Builder#withSpeculativeExecutionPolicy(SpeculativeExecutionPolicy) + * @see com.datastax.driver.core.policies.SpeculativeExecutionPolicy + * @since 1.5 + */ + public void setSpeculativeExecutionPolicy(SpeculativeExecutionPolicy speculativeExecutionPolicy) { + this.speculativeExecutionPolicy = speculativeExecutionPolicy; + } + + /** + * Configures the generator that will produce the client-side timestamp sent with each query. + * + * @param timestampGenerator {@link TimestampGenerator} used to produce a client-side timestamp sent with each query. + * @see com.datastax.driver.core.Cluster.Builder#withTimestampGenerator(TimestampGenerator) + * @see com.datastax.driver.core.TimestampGenerator + * @since 1.5 + */ + public void setTimestampGenerator(TimestampGenerator timestampGenerator) { + this.timestampGenerator = timestampGenerator; + } + + private static Compression convertCompressionType(CompressionType type) { + + switch (type) { + case NONE: + return Compression.NONE; + case SNAPPY: + return Compression.SNAPPY; + case LZ4: + return Compression.LZ4; + } + + throw new IllegalArgumentException(String.format("Unknown compression type [%s]", type)); + } } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraClusterParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterParser.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraClusterParser.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterParser.java index 810b4e92b..88299caa4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraClusterParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterParser.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.config.xml; +package org.springframework.data.cassandra.config; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.data.cql.config.xml.CassandraCqlClusterParser; import org.w3c.dom.Element; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlClusterFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlClusterFactoryBean.java new file mode 100644 index 000000000..18026fed0 --- /dev/null +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlClusterFactoryBean.java @@ -0,0 +1,26 @@ +/* + * Copyright 2013-2017 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 + * + * http://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.config; + +/** + * Spring CQL extension of CassandraCqlClusterFactoryBean. This class exists only in the name of symmetry, based on the + * other CassandraData*FactoryBean classes. + * + * @author Matthew T. Adams + * @author Mark Paluch + */ +public class CassandraCqlClusterFactoryBean extends CassandraClusterFactoryBean {} diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlClusterParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlClusterParser.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlClusterParser.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlClusterParser.java index 44cb36ccb..6a24e449c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlClusterParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlClusterParser.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.xml; +package org.springframework.data.cassandra.config; -import static org.springframework.data.cql.config.xml.ParsingUtils.*; +import static org.springframework.data.cassandra.config.ParsingUtils.*; import java.util.ArrayList; import java.util.List; @@ -28,13 +28,8 @@ import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.support.ManagedSet; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.data.cql.config.CassandraCqlClusterFactoryBean; -import org.springframework.data.cql.config.KeyspaceActionSpecificationFactoryBean; -import org.springframework.data.cql.config.MultiLevelSetFlattenerFactoryBean; -import org.springframework.data.cql.config.PoolingOptionsFactoryBean; -import org.springframework.data.cql.config.SocketOptionsFactoryBean; -import org.springframework.data.cql.core.keyspace.KeyspaceActionSpecification; -import org.springframework.data.cql.core.keyspace.KeyspaceAttributes; +import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceActionSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceAttributes; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Element; @@ -70,7 +65,7 @@ public class CassandraCqlClusterParser extends AbstractBeanDefinitionParser { @Override protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CassandraCqlClusterFactoryBean.class); + BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CassandraClusterFactoryBean.class); builder.setLazyInit(parserContext.isDefaultLazyInit()); builder.getRawBeanDefinition().setDestroyMethodName("destroy"); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlSessionFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlSessionFactoryBean.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlSessionFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlSessionFactoryBean.java index ceb61e1cd..cfaae3de3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlSessionFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlSessionFactoryBean.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.cql.config; +package org.springframework.data.cassandra.config; import java.util.ArrayList; import java.util.Collections; @@ -25,9 +25,9 @@ import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.PersistenceExceptionTranslator; -import org.springframework.data.cql.core.CqlOperations; -import org.springframework.data.cql.core.CqlTemplate; -import org.springframework.data.cql.support.CassandraExceptionTranslator; +import org.springframework.data.cassandra.core.cql.CassandraExceptionTranslator; +import org.springframework.data.cassandra.core.cql.CqlOperations; +import org.springframework.data.cassandra.core.cql.CqlTemplate; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -49,8 +49,8 @@ import com.datastax.driver.core.Session; * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.InitializingBean * @see org.springframework.dao.support.PersistenceExceptionTranslator - * @see org.springframework.data.cql.core.CqlTemplate - * @see org.springframework.data.cql.support.CassandraExceptionTranslator + * @see CqlTemplate + * @see CassandraExceptionTranslator * @see com.datastax.driver.core.Cluster * @see com.datastax.driver.core.Session */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlSessionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlSessionParser.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlSessionParser.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlSessionParser.java index fe30ee937..6134a4f49 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlSessionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlSessionParser.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.xml; +package org.springframework.data.cassandra.config; -import static org.springframework.data.cql.config.xml.ParsingUtils.*; +import static org.springframework.data.cassandra.config.ParsingUtils.*; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.data.cql.config.CassandraCqlSessionFactoryBean; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Attr; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlTemplateFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateFactoryBean.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlTemplateFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateFactoryBean.java index a2a52284b..8d7ece5ff 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/CassandraCqlTemplateFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateFactoryBean.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config; +package org.springframework.data.cassandra.config; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.data.cql.core.CqlTemplate; +import org.springframework.data.cassandra.core.cql.CqlTemplate; import org.springframework.util.Assert; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlTemplateParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateParser.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlTemplateParser.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateParser.java index 457abcc2d..ae714992a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlTemplateParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateParser.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.xml; +package org.springframework.data.cassandra.config; -import static org.springframework.data.cql.config.xml.ParsingUtils.*; +import static org.springframework.data.cassandra.config.ParsingUtils.*; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.data.cql.config.CassandraCqlTemplateFactoryBean; import org.springframework.util.StringUtils; import org.w3c.dom.Element; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextParser.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextParser.java index 939b9c575..a77aecac3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextParser.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.config.xml; +package org.springframework.data.cassandra.config; import java.util.HashMap; import java.util.HashSet; @@ -27,14 +27,11 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.data.cassandra.config.CassandraEntityClassScanner; -import org.springframework.data.cassandra.config.DefaultBeanNames; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.EntityMapping; import org.springframework.data.cassandra.core.mapping.Mapping; import org.springframework.data.cassandra.core.mapping.PropertyMapping; import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver; -import org.springframework.data.cql.config.xml.DefaultCqlBeanNames; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingConverterParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingConverterParser.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingConverterParser.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingConverterParser.java index e06e4b6c5..a3c983b8b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingConverterParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingConverterParser.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.config.xml; +package org.springframework.data.cassandra.config; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.data.cassandra.config.DefaultBeanNames; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; import org.springframework.util.StringUtils; import org.w3c.dom.Element; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingXmlBeanFactoryPostProcessorRegistrar.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingXmlBeanFactoryPostProcessorRegistrar.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingXmlBeanFactoryPostProcessorRegistrar.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingXmlBeanFactoryPostProcessorRegistrar.java index 475ca8273..adedfa25f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingXmlBeanFactoryPostProcessorRegistrar.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingXmlBeanFactoryPostProcessorRegistrar.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.config.xml; +package org.springframework.data.cassandra.config; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -21,7 +21,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessor; import org.springframework.data.config.BeanComponentDefinitionBuilder; import org.w3c.dom.Element; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraNamespaceHandler.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraNamespaceHandler.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraNamespaceHandler.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraNamespaceHandler.java index 3fc60423f..8e5ac3715 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraNamespaceHandler.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraNamespaceHandler.java @@ -1,19 +1,19 @@ /* - * Copyright 2013-2017 the original author or authors - * + * Copyright 2013-2017 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://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.config.xml; +package org.springframework.data.cassandra.config; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; import org.springframework.data.cassandra.repository.config.CassandraRepositoryConfigurationExtension; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBean.java index cb868ffed..4f98940be 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBean.java @@ -21,7 +21,6 @@ import org.springframework.data.cassandra.core.CassandraPersistentEntitySchemaCr import org.springframework.data.cassandra.core.CassandraPersistentEntitySchemaDropper; import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; -import org.springframework.data.cql.config.CassandraCqlSessionFactoryBean; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraSessionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionParser.java similarity index 85% rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraSessionParser.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionParser.java index 4d9173646..4cc266cb2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraSessionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionParser.java @@ -1,11 +1,11 @@ /* - * Copyright 2013-2017 the original author or authors + * Copyright 2013-2017 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 * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,16 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.config.xml; +package org.springframework.data.cassandra.config; -import static org.springframework.data.cql.config.xml.ParsingUtils.*; +import static org.springframework.data.cassandra.config.ParsingUtils.*; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.data.cassandra.config.CassandraSessionFactoryBean; -import org.springframework.data.cassandra.config.DefaultBeanNames; -import org.springframework.data.cassandra.config.SchemaAction; -import org.springframework.data.cql.config.xml.CassandraCqlSessionParser; import org.w3c.dom.Attr; import org.w3c.dom.Element; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java index d2c207cf9..b3c11b450 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java @@ -17,11 +17,11 @@ package org.springframework.data.cassandra.config; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.core.convert.CassandraConverter; -import org.springframework.data.cql.core.CqlOperations; -import org.springframework.data.cql.core.session.DefaultSessionFactory; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.core.cql.CqlOperations; +import org.springframework.data.cassandra.core.cql.session.DefaultSessionFactory; import org.springframework.util.Assert; import com.datastax.driver.core.Session; @@ -88,8 +88,7 @@ public class CassandraTemplateFactoryBean implements FactoryBean, I * {@link PoolingOptionsFactoryBean}'s {@link HostDistance#LOCAL}-based {@link PoolingOptions}. * @see com.datastax.driver.core.HostDistance#LOCAL * @see com.datastax.driver.core.PoolingOptions - * @see org.springframework.data.cql.config.PoolingOptionsFactoryBean.HostDistancePoolingOptions - * @see org.springframework.data.cql.config.PoolingOptionsFactoryBean.LocalHostDistancePoolingOptions + * @see PoolingOptionsFactoryBean.HostDistancePoolingOptions + * @see PoolingOptionsFactoryBean.LocalHostDistancePoolingOptions */ protected HostDistancePoolingOptions newLocalHostDistancePoolingOptions() { return LocalHostDistancePoolingOptions.create(getLocalCoreConnections(), getLocalMaxConnections(), @@ -149,8 +149,8 @@ public class PoolingOptionsFactoryBean implements FactoryBean, I * {@link PoolingOptionsFactoryBean}'s {@link HostDistance#REMOTE}-based {@link PoolingOptions}. * @see com.datastax.driver.core.HostDistance#REMOTE * @see com.datastax.driver.core.PoolingOptions - * @see org.springframework.data.cql.config.PoolingOptionsFactoryBean.HostDistancePoolingOptions - * @see org.springframework.data.cql.config.PoolingOptionsFactoryBean.RemoteHostDistancePoolingOptions + * @see PoolingOptionsFactoryBean.HostDistancePoolingOptions + * @see PoolingOptionsFactoryBean.RemoteHostDistancePoolingOptions */ protected HostDistancePoolingOptions newRemoteHostDistancePoolingOptions() { return RemoteHostDistancePoolingOptions.create(getRemoteCoreConnections(), getRemoteMaxConnections(), diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/SocketOptionsFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SocketOptionsFactoryBean.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/config/SocketOptionsFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SocketOptionsFactoryBean.java index 9c4456c96..119418b2f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/SocketOptionsFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SocketOptionsFactoryBean.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config; +package org.springframework.data.cassandra.config; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/package-info.java deleted file mode 100644 index e7324e593..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring Java configuration for Spring Data Cassandra. - */ -package org.springframework.data.cassandra.config.java; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/package-info.java deleted file mode 100644 index 77706f6da..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring XML namespace configuration for Spring Data Cassandra. - */ -package org.springframework.data.cassandra.config.xml; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraOperations.java index 0dadd1f7a..6014ca0f8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraOperations.java @@ -20,11 +20,11 @@ import java.util.function.Consumer; import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.core.convert.CassandraConverter; +import org.springframework.data.cassandra.core.cql.AsyncCqlOperations; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.data.cassandra.core.query.Query; import org.springframework.data.cassandra.core.query.Update; -import org.springframework.data.cql.core.AsyncCqlOperations; -import org.springframework.data.cql.core.QueryOptions; -import org.springframework.data.cql.core.WriteOptions; import org.springframework.util.concurrent.ListenableFuture; import com.datastax.driver.core.Statement; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java index 983b7c249..9d32a0433 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java @@ -21,24 +21,24 @@ import java.util.function.Consumer; import java.util.function.Function; import org.springframework.dao.DataAccessException; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; import org.springframework.data.cassandra.core.convert.QueryMapper; import org.springframework.data.cassandra.core.convert.UpdateMapper; +import org.springframework.data.cassandra.core.cql.AsyncCqlOperations; +import org.springframework.data.cassandra.core.cql.AsyncCqlTemplate; +import org.springframework.data.cassandra.core.cql.AsyncSessionCallback; +import org.springframework.data.cassandra.core.cql.CqlExceptionTranslator; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlProvider; +import org.springframework.data.cassandra.core.cql.GuavaListenableFutureAdapter; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.core.cql.session.DefaultSessionFactory; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.cassandra.core.query.Query; -import org.springframework.data.cql.core.AsyncCqlOperations; -import org.springframework.data.cql.core.AsyncCqlTemplate; -import org.springframework.data.cql.core.AsyncSessionCallback; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.CqlProvider; -import org.springframework.data.cql.core.GuavaListenableFutureAdapter; -import org.springframework.data.cql.core.QueryOptions; -import org.springframework.data.cql.core.session.DefaultSessionFactory; -import org.springframework.data.cql.core.session.SessionFactory; -import org.springframework.data.cql.support.CqlExceptionTranslator; import org.springframework.data.mapping.context.MappingContext; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; @@ -470,7 +470,7 @@ public class AsyncCassandraTemplate implements AsyncCassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#delete(java.lang.Object, org.springframework.data.cql.core.QueryOptions) + * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#delete(java.lang.Object, org.springframework.data.cassandra.core.cql.QueryOptions) */ @Override public ListenableFuture delete(Object entity, QueryOptions options) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java index 146b373cf..8c5f71695 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java @@ -18,7 +18,7 @@ package org.springframework.data.cassandra.core; import java.util.Map; import java.util.Optional; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import com.datastax.driver.core.KeyspaceMetadata; import com.datastax.driver.core.TableMetadata; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java index 160f8c994..f2351fe04 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java @@ -18,17 +18,17 @@ package org.springframework.data.cassandra.core; import java.util.Map; import java.util.Optional; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.data.cassandra.core.convert.CassandraConverter; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.SessionCallback; +import org.springframework.data.cassandra.core.cql.generator.CreateTableCqlGenerator; +import org.springframework.data.cassandra.core.cql.generator.DropTableCqlGenerator; +import org.springframework.data.cassandra.core.cql.generator.DropUserTypeCqlGenerator; +import org.springframework.data.cassandra.core.cql.keyspace.CreateTableSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropTableSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropUserTypeSpecification; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.SessionCallback; -import org.springframework.data.cql.core.generator.CreateTableCqlGenerator; -import org.springframework.data.cql.core.generator.DropTableCqlGenerator; -import org.springframework.data.cql.core.generator.DropUserTypeCqlGenerator; -import org.springframework.data.cql.core.keyspace.CreateTableSpecification; -import org.springframework.data.cql.core.keyspace.DropTableSpecification; -import org.springframework.data.cql.core.keyspace.DropUserTypeSpecification; -import org.springframework.data.cql.core.session.SessionFactory; import org.springframework.util.Assert; import com.datastax.driver.core.KeyspaceMetadata; @@ -66,7 +66,7 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#createTable(boolean, org.springframework.data.cql.core.cql.CqlIdentifier, java.lang.Class, java.util.Map) + * @see org.springframework.data.cassandra.core.CassandraAdminOperations#createTable(boolean, org.springframework.data.cassandra.core.cql.CqlIdentifier, java.lang.Class, java.util.Map) */ @Override public void createTable(boolean ifNotExists, CqlIdentifier tableName, Class entityClass, @@ -86,7 +86,7 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropTable(org.springframework.data.cql.core.cql.CqlIdentifier) + * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropTable(org.springframework.data.cassandra.core.cql.CqlIdentifier) */ @Override public void dropTable(CqlIdentifier tableName) { @@ -95,7 +95,7 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropUserType(org.springframework.data.cql.core.cql.CqlIdentifier) + * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropUserType(org.springframework.data.cassandra.core.cql.CqlIdentifier) */ @Override public void dropUserType(CqlIdentifier typeName) { @@ -107,7 +107,7 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#getTableMetadata(java.lang.String, org.springframework.data.cql.core.cql.CqlIdentifier) + * @see org.springframework.data.cassandra.core.CassandraAdminOperations#getTableMetadata(java.lang.String, org.springframework.data.cassandra.core.cql.CqlIdentifier) */ @Override public Optional getTableMetadata(String keyspace, CqlIdentifier tableName) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchOperations.java index b53ea13f2..319367096 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchOperations.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.core; -import org.springframework.data.cql.core.WriteOptions; +import org.springframework.data.cassandra.core.cql.WriteOptions; /** * Batch operations for insert/update/delete actions on a table. {@link CassandraBatchOperations} use logged Cassandra diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java index f87fa9675..2aa15fc92 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java @@ -18,7 +18,7 @@ package org.springframework.data.cassandra.core; import java.util.Arrays; import java.util.concurrent.atomic.AtomicBoolean; -import org.springframework.data.cql.core.WriteOptions; +import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.util.Assert; import com.datastax.driver.core.querybuilder.Batch; @@ -103,7 +103,7 @@ class CassandraBatchTemplate implements CassandraBatchOperations { } /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#insert(java.lang.Iterable, org.springframework.data.cql.core.WriteOptions) + * @see org.springframework.data.cassandra.core.CassandraBatchOperations#insert(java.lang.Iterable, org.springframework.data.cassandra.core.cql.WriteOptions) */ @Override public CassandraBatchOperations insert(Iterable entities, WriteOptions options) { @@ -141,7 +141,7 @@ class CassandraBatchTemplate implements CassandraBatchOperations { } /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#update(java.lang.Iterable, org.springframework.data.cql.core.WriteOptions) + * @see org.springframework.data.cassandra.core.CassandraBatchOperations#update(java.lang.Iterable, org.springframework.data.cassandra.core.cql.WriteOptions) */ @Override public CassandraBatchOperations update(Iterable entities, WriteOptions options) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java index 2047cab34..52d38f49f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java @@ -21,12 +21,12 @@ import java.util.stream.Stream; import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.core.convert.CassandraConverter; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlOperations; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.data.cassandra.core.query.Query; import org.springframework.data.cassandra.core.query.Update; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.CqlOperations; -import org.springframework.data.cql.core.QueryOptions; -import org.springframework.data.cql.core.WriteOptions; import com.datastax.driver.core.Statement; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java index dfef330f7..dd09eb0e9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java @@ -25,15 +25,15 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.generator.CreateTableCqlGenerator; +import org.springframework.data.cassandra.core.cql.generator.CreateUserTypeCqlGenerator; +import org.springframework.data.cassandra.core.cql.keyspace.CreateTableSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.CreateUserTypeSpecification; import org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.generator.CreateTableCqlGenerator; -import org.springframework.data.cql.core.generator.CreateUserTypeCqlGenerator; -import org.springframework.data.cql.core.keyspace.CreateTableSpecification; -import org.springframework.data.cql.core.keyspace.CreateUserTypeSpecification; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropper.java index 14cfb86f3..daedd4b23 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropper.java @@ -18,9 +18,9 @@ package org.springframework.data.cassandra.core; import java.util.Set; import java.util.stream.Collectors; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; -import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.Assert; import com.datastax.driver.core.AbstractTableMetadata; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java index e45814660..f8864b172 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java @@ -26,22 +26,22 @@ import lombok.NonNull; import lombok.Value; import org.springframework.dao.DataAccessException; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; import org.springframework.data.cassandra.core.convert.QueryMapper; import org.springframework.data.cassandra.core.convert.UpdateMapper; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlOperations; +import org.springframework.data.cassandra.core.cql.CqlProvider; +import org.springframework.data.cassandra.core.cql.CqlTemplate; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.core.cql.SessionCallback; +import org.springframework.data.cassandra.core.cql.session.DefaultSessionFactory; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.cassandra.core.query.Query; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.CqlOperations; -import org.springframework.data.cql.core.CqlProvider; -import org.springframework.data.cql.core.CqlTemplate; -import org.springframework.data.cql.core.QueryOptions; -import org.springframework.data.cql.core.SessionCallback; -import org.springframework.data.cql.core.session.DefaultSessionFactory; -import org.springframework.data.cql.core.session.SessionFactory; import org.springframework.data.mapping.context.MappingContext; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; @@ -481,7 +481,7 @@ public class CassandraTemplate implements CassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#delete(java.lang.Object, org.springframework.data.cql.core.QueryOptions) + * @see org.springframework.data.cassandra.core.CassandraOperations#delete(java.lang.Object, org.springframework.data.cassandra.core.cql.QueryOptions) */ @Override public WriteResult delete(Object entity, QueryOptions options) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/InsertOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/InsertOptions.java index ca4de6264..fbe9f1b70 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/InsertOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/InsertOptions.java @@ -17,7 +17,7 @@ package org.springframework.data.cassandra.core; import java.util.concurrent.TimeUnit; -import org.springframework.data.cql.core.WriteOptions; +import org.springframework.data.cassandra.core.cql.WriteOptions; /** * Extension to {@link WriteOptions} for use with {@code INSERT} operations. @@ -64,7 +64,7 @@ public class InsertOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#consistencyLevel(com.datastax.driver.core.ConsistencyLevel) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#consistencyLevel(com.datastax.driver.core.ConsistencyLevel) */ @Override public InsertOptionsBuilder consistencyLevel(com.datastax.driver.core.ConsistencyLevel consistencyLevel) { @@ -73,7 +73,7 @@ public class InsertOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#retryPolicy(org.springframework.data.cql.core.RetryPolicy) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#retryPolicy(org.springframework.data.cassandra.core.cql.RetryPolicy) */ @Override public InsertOptionsBuilder retryPolicy(com.datastax.driver.core.policies.RetryPolicy driverRetryPolicy) { @@ -82,7 +82,7 @@ public class InsertOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#fetchSize(int) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#fetchSize(int) */ @Override public InsertOptionsBuilder fetchSize(int fetchSize) { @@ -91,7 +91,7 @@ public class InsertOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#readTimeout(long) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#readTimeout(long) */ @Override public InsertOptionsBuilder readTimeout(long readTimeout) { @@ -100,7 +100,7 @@ public class InsertOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) */ @Override public InsertOptionsBuilder readTimeout(long readTimeout, TimeUnit timeUnit) { @@ -109,7 +109,7 @@ public class InsertOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#tracing(boolean) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#tracing(boolean) */ @Override public InsertOptionsBuilder tracing(boolean tracing) { @@ -118,7 +118,7 @@ public class InsertOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#withTracing() + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#withTracing() */ @Override public InsertOptionsBuilder withTracing() { @@ -127,7 +127,7 @@ public class InsertOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.WriteOptions.WriteOptionsBuilder#ttl(int) + * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#ttl(int) */ public InsertOptionsBuilder ttl(int ttl) { return (InsertOptionsBuilder) super.ttl(ttl); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/QueryUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/QueryUtils.java index 8d514cd45..04680c4ca 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/QueryUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/QueryUtils.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.core.cql.QueryOptionsUtil; +import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.data.convert.EntityWriter; -import org.springframework.data.cql.core.QueryOptions; -import org.springframework.data.cql.core.QueryOptionsUtil; -import org.springframework.data.cql.core.WriteOptions; import org.springframework.util.Assert; import com.datastax.driver.core.querybuilder.Delete; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraOperations.java index a010d8216..65fc11921 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraOperations.java @@ -20,11 +20,11 @@ import reactor.core.publisher.Mono; import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.core.convert.CassandraConverter; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.core.cql.ReactiveCqlOperations; +import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.data.cassandra.core.query.Query; import org.springframework.data.cassandra.core.query.Update; -import org.springframework.data.cql.core.QueryOptions; -import org.springframework.data.cql.core.ReactiveCqlOperations; -import org.springframework.data.cql.core.WriteOptions; import com.datastax.driver.core.Statement; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java index 60d228b36..3187ba136 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java @@ -22,24 +22,24 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import org.springframework.dao.DataAccessException; +import org.springframework.data.cassandra.ReactiveResultSet; +import org.springframework.data.cassandra.ReactiveSession; +import org.springframework.data.cassandra.ReactiveSessionFactory; import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; import org.springframework.data.cassandra.core.convert.QueryMapper; import org.springframework.data.cassandra.core.convert.UpdateMapper; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlProvider; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.core.cql.ReactiveCqlOperations; +import org.springframework.data.cassandra.core.cql.ReactiveCqlTemplate; +import org.springframework.data.cassandra.core.cql.ReactiveSessionCallback; +import org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessionFactory; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.cassandra.core.query.Query; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.CqlProvider; -import org.springframework.data.cql.core.QueryOptions; -import org.springframework.data.cql.core.ReactiveCqlOperations; -import org.springframework.data.cql.core.ReactiveCqlTemplate; -import org.springframework.data.cql.core.ReactiveSessionCallback; -import org.springframework.data.cql.core.session.DefaultReactiveSessionFactory; -import org.springframework.data.cql.core.session.ReactiveResultSet; -import org.springframework.data.cql.core.session.ReactiveSession; -import org.springframework.data.cql.core.session.ReactiveSessionFactory; import org.springframework.data.mapping.context.MappingContext; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java index ba475b2a2..daa7182ad 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java @@ -22,6 +22,9 @@ import java.util.Set; import org.springframework.data.cassandra.core.convert.QueryMapper; import org.springframework.data.cassandra.core.convert.UpdateMapper; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.QueryOptionsUtil; +import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.query.Columns.ColumnSelector; import org.springframework.data.cassandra.core.query.Columns.FunctionCall; @@ -40,9 +43,6 @@ import org.springframework.data.cassandra.core.query.Update.RemoveOp; import org.springframework.data.cassandra.core.query.Update.SetAtIndexOp; import org.springframework.data.cassandra.core.query.Update.SetAtKeyOp; import org.springframework.data.cassandra.core.query.Update.SetOp; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.QueryOptionsUtil; -import org.springframework.data.cql.core.WriteOptions; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Order; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/UpdateOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/UpdateOptions.java index c686adff1..7d15edeaf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/UpdateOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/UpdateOptions.java @@ -17,7 +17,7 @@ package org.springframework.data.cassandra.core; import java.util.concurrent.TimeUnit; -import org.springframework.data.cql.core.WriteOptions; +import org.springframework.data.cassandra.core.cql.WriteOptions; /** * Extension to {@link WriteOptions} for use with {@code UPDATE} operations. @@ -64,7 +64,7 @@ public class UpdateOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#consistencyLevel(com.datastax.driver.core.ConsistencyLevel) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#consistencyLevel(com.datastax.driver.core.ConsistencyLevel) */ @Override public UpdateOptionsBuilder consistencyLevel(com.datastax.driver.core.ConsistencyLevel consistencyLevel) { @@ -73,7 +73,7 @@ public class UpdateOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#retryPolicy(org.springframework.data.cql.core.RetryPolicy) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#retryPolicy(org.springframework.data.cassandra.core.cql.RetryPolicy) */ @Override public UpdateOptionsBuilder retryPolicy(com.datastax.driver.core.policies.RetryPolicy driverRetryPolicy) { @@ -82,7 +82,7 @@ public class UpdateOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#fetchSize(int) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#fetchSize(int) */ @Override public UpdateOptionsBuilder fetchSize(int fetchSize) { @@ -91,7 +91,7 @@ public class UpdateOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#readTimeout(long) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#readTimeout(long) */ @Override public UpdateOptionsBuilder readTimeout(long readTimeout) { @@ -100,7 +100,7 @@ public class UpdateOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) */ @Override public UpdateOptionsBuilder readTimeout(long readTimeout, TimeUnit timeUnit) { @@ -109,7 +109,7 @@ public class UpdateOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#tracing(boolean) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#tracing(boolean) */ @Override public UpdateOptionsBuilder tracing(boolean tracing) { @@ -118,7 +118,7 @@ public class UpdateOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#withTracing() + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#withTracing() */ @Override public UpdateOptionsBuilder withTracing() { @@ -127,7 +127,7 @@ public class UpdateOptions extends WriteOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.WriteOptions.WriteOptionsBuilder#ttl(int) + * @see org.springframework.data.cassandra.core.cql.WriteOptions.WriteOptionsBuilder#ttl(int) */ public UpdateOptionsBuilder ttl(int ttl) { return (UpdateOptionsBuilder) super.ttl(ttl); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java index 305fc7355..e485c1931 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java @@ -18,6 +18,7 @@ package org.springframework.data.cassandra.core.convert; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.core.mapping.MapId; import org.springframework.data.convert.CustomConversions; import org.springframework.data.convert.EntityConverter; import org.springframework.data.util.TypeInformation; @@ -50,8 +51,8 @@ public interface CassandraConverter *
    *
  • A singular value if for a simple {@link org.springframework.data.annotation.Id} or * {@link org.springframework.data.cassandra.core.mapping.PrimaryKey} Id
    • - *
  • A {@link org.springframework.data.cassandra.repository.MapId} for composite - * {@link org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn} Id's
    • + *
  • A {@link MapId} for composite {@link org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn} + * Id's
    • *
  • A the composite primary key for {@link org.springframework.data.cassandra.core.mapping.PrimaryKey} using a * {@link org.springframework.data.cassandra.core.mapping.PrimaryKeyClass}
    • *
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverters.java index c0259c279..9ae0582a8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverters.java @@ -25,9 +25,9 @@ import java.util.UUID; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.ConverterFactory; +import org.springframework.data.cassandra.core.cql.converter.RowToListConverter; +import org.springframework.data.cassandra.core.cql.converter.RowToMapConverter; import org.springframework.data.convert.ReadingConverter; -import org.springframework.data.cql.core.converter.RowToListConverter; -import org.springframework.data.cql.core.converter.RowToMapConverter; import org.springframework.util.Assert; import org.springframework.util.NumberUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/ColumnReader.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/ColumnReader.java index 7c6e0bc6c..1cd6b233e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/ColumnReader.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/ColumnReader.java @@ -17,7 +17,7 @@ package org.springframework.data.cassandra.core.convert; import java.util.List; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import com.datastax.driver.core.CodecRegistry; import com.datastax.driver.core.ColumnDefinitions; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java index 8bcba0bc1..11b910f0e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java @@ -15,7 +15,6 @@ */ package org.springframework.data.cassandra.core.convert; -import static org.springframework.data.cassandra.repository.support.BasicMapId.*; import lombok.AllArgsConstructor; @@ -25,6 +24,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Map.Entry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,12 +36,13 @@ import org.springframework.core.CollectionFactory; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.BasicMapId; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; import org.springframework.data.cassandra.core.mapping.CassandraType; -import org.springframework.data.cassandra.repository.MapId; -import org.springframework.data.cassandra.repository.MapIdentifiable; +import org.springframework.data.cassandra.core.mapping.MapId; +import org.springframework.data.cassandra.core.mapping.MapIdentifiable; import org.springframework.data.convert.EntityInstantiator; import org.springframework.data.mapping.MappingException; import org.springframework.data.mapping.PersistentPropertyAccessor; @@ -605,7 +606,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter } // if the class doesn't have an id property, then it's using MapId - final MapId id = id(); + final MapId id = BasicMapId.id(); for (CassandraPersistentProperty property : entity) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java index f11bd911a..92d03e004 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java @@ -23,6 +23,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; @@ -35,7 +36,6 @@ import org.springframework.data.cassandra.core.query.Criteria; import org.springframework.data.cassandra.core.query.CriteriaDefinition; import org.springframework.data.cassandra.core.query.CriteriaDefinition.Predicate; import org.springframework.data.cassandra.core.query.Filter; -import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Order; import org.springframework.data.mapping.PersistentProperty; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ArgumentPreparedStatementBinder.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ArgumentPreparedStatementBinder.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ArgumentPreparedStatementBinder.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ArgumentPreparedStatementBinder.java index a610112ce..b9f8f83bf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ArgumentPreparedStatementBinder.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ArgumentPreparedStatementBinder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.PreparedStatement; @@ -39,7 +39,7 @@ public class ArgumentPreparedStatementBinder implements PreparedStatementBinder } /* (non-Javadoc) - * @see org.springframework.data.cql.core.PreparedStatementBinder#bindValues(com.datastax.driver.core.PreparedStatement) + * @see org.springframework.data.cassandra.core.cql.PreparedStatementBinder#bindValues(com.datastax.driver.core.PreparedStatement) */ @Override public BoundStatement bindValues(PreparedStatement ps) throws DriverException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlOperations.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlOperations.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlOperations.java index 50c363797..ce641eb9a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlOperations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import reactor.core.publisher.Mono; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java similarity index 77% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlTemplate.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java index 19ba2cd23..487e77b8a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.List; import java.util.Map; @@ -23,7 +23,7 @@ import java.util.function.Function; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.DataAccessUtils; import org.springframework.dao.support.PersistenceExceptionTranslator; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.util.Assert; import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.SettableListenableFuture; @@ -61,7 +61,7 @@ import com.google.common.util.concurrent.Futures; * it. *

* All CQL operations performed by this class are logged at debug level, using - * "org.springframework.data.cql.core.CqlTemplate" as log category. + * "org.springframework.data.cassandra.core.cqlTemplate" as log category. *

* NOTE: An instance of this class is thread-safe once configured. * @@ -76,7 +76,7 @@ import com.google.common.util.concurrent.Futures; * @see RowMapper * @see org.springframework.dao.support.PersistenceExceptionTranslator */ -public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOperations { +public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOperations { /** * Create a new, uninitialized {@link AsyncCqlTemplate}. Note: The {@link SessionFactory} has to be set before using @@ -120,7 +120,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(org.springframework.data.cql.core.AsyncSessionCallback) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(org.springframework.data.cassandra.core.cql.AsyncSessionCallback) */ @Override public ListenableFuture execute(AsyncSessionCallback action) throws DataAccessException { @@ -140,7 +140,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(java.lang.String) */ @Override public ListenableFuture execute(String cql) throws DataAccessException { @@ -152,7 +152,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.ResultSetExtractor) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.ResultSetExtractor) */ @Override public ListenableFuture query(String cql, ResultSetExtractor resultSetExtractor) @@ -180,7 +180,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowCallbackHandler) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowCallbackHandler) */ @Override public ListenableFuture query(String cql, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -193,7 +193,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public ListenableFuture> query(String cql, RowMapper rowMapper) throws DataAccessException { @@ -202,7 +202,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(java.lang.String) */ @Override public ListenableFuture>> queryForList(String cql) throws DataAccessException { @@ -211,7 +211,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Class) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Class) */ @Override public ListenableFuture> queryForList(String cql, Class elementType) throws DataAccessException { @@ -220,7 +220,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForMap(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForMap(java.lang.String) */ @Override public ListenableFuture> queryForMap(String cql) throws DataAccessException { @@ -229,7 +229,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(java.lang.String, java.lang.Class) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(java.lang.String, java.lang.Class) */ @Override public ListenableFuture queryForObject(String cql, Class requiredType) throws DataAccessException { @@ -238,7 +238,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public ListenableFuture queryForObject(String cql, RowMapper rowMapper) throws DataAccessException { @@ -251,7 +251,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForResultSet(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForResultSet(java.lang.String) */ @Override public ListenableFuture queryForResultSet(String cql) throws DataAccessException { @@ -264,7 +264,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(com.datastax.driver.core.Statement) */ @Override public ListenableFuture execute(Statement statement) throws DataAccessException { @@ -276,7 +276,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.ResultSetExtractor) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cassandra.core.cql.ResultSetExtractor) */ @Override public ListenableFuture query(Statement statement, ResultSetExtractor resultSetExtractor) @@ -305,7 +305,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowCallbackHandler) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cassandra.core.cql.RowCallbackHandler) */ @Override public ListenableFuture query(Statement statement, RowCallbackHandler rowCallbackHandler) @@ -319,7 +319,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public ListenableFuture> query(Statement statement, RowMapper rowMapper) throws DataAccessException { @@ -328,7 +328,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(com.datastax.driver.core.Statement) */ @Override public ListenableFuture>> queryForList(Statement statement) throws DataAccessException { @@ -337,7 +337,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public ListenableFuture> queryForList(Statement statement, Class elementType) @@ -347,7 +347,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForMap(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForMap(com.datastax.driver.core.Statement) */ @Override public ListenableFuture> queryForMap(Statement statement) throws DataAccessException { @@ -356,7 +356,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public ListenableFuture queryForObject(Statement statement, Class requiredType) throws DataAccessException { @@ -365,7 +365,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(com.datastax.driver.core.Statement, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public ListenableFuture queryForObject(Statement statement, RowMapper rowMapper) @@ -379,7 +379,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForResultSet(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForResultSet(com.datastax.driver.core.Statement) */ @Override public ListenableFuture queryForResultSet(Statement statement) throws DataAccessException { @@ -392,7 +392,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(org.springframework.data.cql.core.AsyncPreparedStatementCreator) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator) */ @Override public ListenableFuture execute(AsyncPreparedStatementCreator preparedStatementCreator) @@ -403,7 +403,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(java.lang.String, java.lang.Object[]) */ @Override public ListenableFuture execute(String cql, Object... args) throws DataAccessException { @@ -412,7 +412,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder) */ @Override public ListenableFuture execute(String cql, PreparedStatementBinder preparedStatementBinder) @@ -423,7 +423,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(java.lang.String, org.springframework.data.cql.core.PreparedStatementCallback) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementCallback) */ @Override public ListenableFuture execute(String cql, PreparedStatementCallback action) throws DataAccessException { @@ -432,7 +432,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementCallback) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#execute(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementCallback) */ @Override public ListenableFuture execute(AsyncPreparedStatementCreator preparedStatementCreator, @@ -463,7 +463,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.ResultSetExtractor) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.ResultSetExtractor) */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -474,7 +474,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.RowCallbackHandler) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.RowCallbackHandler) */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -488,7 +488,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public ListenableFuture> query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -499,7 +499,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.ResultSetExtractor) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.ResultSetExtractor) */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -569,7 +569,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowCallbackHandler) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowCallbackHandler) */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -585,7 +585,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public ListenableFuture> query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -596,7 +596,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.ResultSetExtractor, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.ResultSetExtractor, java.lang.Object[]) */ @Override public ListenableFuture query(String cql, ResultSetExtractor resultSetExtractor, Object... args) @@ -607,7 +607,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowCallbackHandler, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowCallbackHandler, java.lang.Object[]) */ @Override public ListenableFuture query(String cql, RowCallbackHandler rowCallbackHandler, Object... args) @@ -622,7 +622,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) */ @Override public ListenableFuture> query(String cql, RowMapper rowMapper, Object... args) @@ -634,7 +634,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.ResultSetExtractor) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.ResultSetExtractor) */ @Override public ListenableFuture query(String cql, PreparedStatementBinder preparedStatementBinder, @@ -645,7 +645,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowCallbackHandler) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowCallbackHandler) */ @Override public ListenableFuture query(String cql, PreparedStatementBinder preparedStatementBinder, @@ -660,7 +660,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public ListenableFuture> query(String cql, PreparedStatementBinder preparedStatementBinder, @@ -671,7 +671,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Object[]) */ @Override public ListenableFuture>> queryForList(String cql, Object... args) @@ -683,7 +683,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public ListenableFuture> queryForList(String cql, Class elementType, Object... args) @@ -695,7 +695,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForMap(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForMap(java.lang.String, java.lang.Object[]) */ @Override public ListenableFuture> queryForMap(String cql, Object... args) throws DataAccessException { @@ -704,7 +704,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public ListenableFuture queryForObject(String cql, Class requiredType, Object... args) @@ -715,7 +715,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) */ @Override public ListenableFuture queryForObject(String cql, RowMapper rowMapper, Object... args) @@ -730,7 +730,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.AsyncCqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) */ @Override public ListenableFuture queryForResultSet(String cql, Object... args) throws DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncPreparedStatementCreator.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncPreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncPreparedStatementCreator.java index 1d2c029be..681bd7897 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncPreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncPreparedStatementCreator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.springframework.util.concurrent.ListenableFuture; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncSessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncSessionCallback.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncSessionCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncSessionCallback.java index bcd13cf5d..83f89aaa1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncSessionCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncSessionCallback.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.springframework.dao.DataAccessException; import org.springframework.util.concurrent.ListenableFuture; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsynchronousQueryListener.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsynchronousQueryListener.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsynchronousQueryListener.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsynchronousQueryListener.java index 141eec270..edcbe8ad4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsynchronousQueryListener.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsynchronousQueryListener.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import com.datastax.driver.core.ResultSetFuture; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CachedPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CachedPreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java index b4552aa0b..649d3159a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CachedPreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -38,7 +38,7 @@ import com.datastax.driver.core.exceptions.DriverException; * @author Mark Paluch * @deprecated since 2.0. This class uses an unsafe, static held cache and is not able to prepare * {@link com.datastax.driver.core.querybuilder.BuiltStatement}. Use - * {@link org.springframework.data.cql.core.support.CachedPreparedStatementCreator}. + * {@link org.springframework.data.cassandra.core.cql.support.CachedPreparedStatementCreator}. */ @Deprecated public class CachedPreparedStatementCreator implements PreparedStatementCreator { @@ -71,7 +71,7 @@ public class CachedPreparedStatementCreator implements PreparedStatementCreator } /* (non-Javadoc) - * @see org.springframework.data.cql.core.PreparedStatementCreator#createPreparedStatement(com.datastax.driver.core.Session) + * @see org.springframework.data.cassandra.core.cql.PreparedStatementCreator#createPreparedStatement(com.datastax.driver.core.Session) */ @Override public PreparedStatement createPreparedStatement(Session session) throws DriverException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraAccessor.java similarity index 72% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraAccessor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraAccessor.java index c9761051a..9a33093aa 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraAccessor.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,18 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.core.cql; + +import java.util.Map; +import java.util.Optional; +import java.util.stream.StreamSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; -import org.springframework.data.cql.core.session.DefaultSessionFactory; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; +import org.springframework.data.cassandra.core.cql.session.DefaultSessionFactory; import org.springframework.util.Assert; import com.datastax.driver.core.ConsistencyLevel; import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import com.datastax.driver.core.Statement; import com.datastax.driver.core.exceptions.DriverException; @@ -325,4 +330,118 @@ public class CassandraAccessor implements InitializingBean { return getExceptionTranslator().translate(task, cql, ex); } + + /** + * Create a new arg-based PreparedStatementSetter using the args passed in. By default, we'll create an + * {@link ArgumentPreparedStatementBinder}. This method allows for the creation to be overridden by subclasses. + * + * @param args object array with arguments + * @return the new {@link PreparedStatementBinder} to use + */ + protected PreparedStatementBinder newPreparedStatementBinder(Object[] args) { + return new ArgumentPreparedStatementBinder(args); + } + + /** + * Constructs a new instance of the {@link ResultSetExtractor} initialized with and adapting the given + * {@link RowCallbackHandler}. + * + * @param rowCallbackHandler {@link RowCallbackHandler} to adapt as a {@link ResultSetExtractor}. + * @return a {@link ResultSetExtractor} implementation adapting an instance of the {@link RowCallbackHandler}. + * @see AsyncCqlTemplate.RowCallbackHandlerResultSetExtractor + * @see ResultSetExtractor + * @see RowCallbackHandler + */ + protected RowCallbackHandlerResultSetExtractor newResultSetExtractor(RowCallbackHandler rowCallbackHandler) { + return new RowCallbackHandlerResultSetExtractor(rowCallbackHandler); + } + + /** + * Constructs a new instance of the {@link ResultSetExtractor} initialized with and adapting the given + * {@link RowMapper}. + * + * @param rowMapper {@link RowMapper} to adapt as a {@link ResultSetExtractor}. + * @return a {@link ResultSetExtractor} implementation adapting an instance of the {@link RowMapper}. + * @see ResultSetExtractor + * @see RowMapper + * @see RowMapperResultSetExtractor + */ + protected RowMapperResultSetExtractor newResultSetExtractor(RowMapper rowMapper) { + return new RowMapperResultSetExtractor<>(rowMapper); + } + + /** + * Constructs a new instance of the {@link ResultSetExtractor} initialized with and adapting the given + * {@link RowMapper}. + * + * @param rowMapper {@link RowMapper} to adapt as a {@link ResultSetExtractor}. + * @param rowsExpected number of expected rows in the {@link ResultSet}. + * @return a {@link ResultSetExtractor} implementation adapting an instance of the {@link RowMapper}. + * @see ResultSetExtractor + * @see RowMapper + * @see RowMapperResultSetExtractor + */ + protected RowMapperResultSetExtractor newResultSetExtractor(RowMapper rowMapper, int rowsExpected) { + return new RowMapperResultSetExtractor<>(rowMapper, rowsExpected); + } + + /** + * Create a new RowMapper for reading columns as key-value pairs. + * + * @return the RowMapper to use + * @see ColumnMapRowMapper + */ + protected RowMapper> newColumnMapRowMapper() { + return new ColumnMapRowMapper(); + } + + /** + * Create a new RowMapper for reading result objects from a single column. + * + * @param requiredType the type that each result object is expected to match + * @return the RowMapper to use + * @see SingleColumnRowMapper + */ + protected RowMapper newSingleColumnRowMapper(Class requiredType) { + return SingleColumnRowMapper.newInstance(requiredType); + } + + /** + * Determine CQL from potential provider object. + * + * @param cqlProvider object that's potentially a {@link CqlProvider} + * @return the CQL string, or {@code null} + * @see CqlProvider + */ + protected static String toCql(Object cqlProvider) { + return Optional.ofNullable(cqlProvider) // + .filter(o -> o instanceof CqlProvider) // + .map(o -> (CqlProvider) o) // + .map(CqlProvider::getCql) // + .orElse(null); + } + + /** + * Adapter to enable use of a {@link RowCallbackHandler} inside a {@link ResultSetExtractor}. + */ + protected static class RowCallbackHandlerResultSetExtractor implements ResultSetExtractor { + + private final RowCallbackHandler rowCallbackHandler; + + protected RowCallbackHandlerResultSetExtractor(RowCallbackHandler rowCallbackHandler) { + this.rowCallbackHandler = rowCallbackHandler; + } + + /* (non-Javadoc) + * + @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(com.datastax.driver.core.ResultSet) + */ + @Override + public Object extractData(ResultSet resultSet) { + + StreamSupport.stream(resultSet.spliterator(), false).forEach(rowCallbackHandler::processRow); + + return null; + } + } } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraExceptionTranslator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslator.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraExceptionTranslator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslator.java index 9e33599bb..0d6c41afe 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraExceptionTranslator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslator.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.core.cql; import java.net.InetSocketAddress; import java.util.Arrays; @@ -26,7 +26,7 @@ import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.TransientDataAccessResourceException; import org.springframework.dao.support.PersistenceExceptionTranslator; -import org.springframework.data.cql.support.exception.*; +import org.springframework.data.cassandra.*; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; @@ -73,7 +73,7 @@ public class CassandraExceptionTranslator implements CqlExceptionTranslator { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.support.CQLExceptionTranslator#translate(java.lang.String, java.lang.String, com.datastax.driver.core.exceptions.DriverException) + * @see org.springframework.data.cassandra.cql.CQLExceptionTranslator#translate(java.lang.String, java.lang.String, com.datastax.driver.core.exceptions.DriverException) */ @Override public DataAccessException translate(String task, String cql, DriverException exception) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ColumnMapRowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ColumnMapRowMapper.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ColumnMapRowMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ColumnMapRowMapper.java index 71bb0925f..0e0111e87 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ColumnMapRowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ColumnMapRowMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.Map; @@ -42,7 +42,7 @@ import com.datastax.driver.core.Row; public class ColumnMapRowMapper implements RowMapper> { /* (non-Javadoc) - * @see org.springframework.data.cql.core.RowMapper#mapRow(com.datastax.driver.core.Row, int) + * @see org.springframework.data.cassandra.core.cql.RowMapper#mapRow(com.datastax.driver.core.Row, int) */ @Override public Map mapRow(Row rs, int rowNum) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlConstantType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlConstantType.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlConstantType.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlConstantType.java index 19e5a1c3e..fd011e527 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlConstantType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlConstantType.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; -import static org.springframework.data.cql.core.CqlConstantType.Regex.*; +import static org.springframework.data.cassandra.core.cql.CqlConstantType.Regex.*; import java.util.regex.Pattern; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CqlExceptionTranslator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlExceptionTranslator.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CqlExceptionTranslator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlExceptionTranslator.java index 624bcd94e..1bdb34a68 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CqlExceptionTranslator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlExceptionTranslator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.core.cql; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.PersistenceExceptionTranslator; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlIdentifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlIdentifier.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java index cb03aa036..55459ab4b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlIdentifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.io.Serializable; import java.util.regex.Pattern; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlOperations.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlOperations.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlOperations.java index c2a1e7f8d..939dfbe2c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlOperations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import reactor.core.publisher.Mono; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlProvider.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlProvider.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlProvider.java index 145069236..e0f5add92 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; /** * Interface to be implemented by objects that can provide CQL strings. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlStringUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlStringUtils.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlStringUtils.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlStringUtils.java index 4460a1023..4ade34cb0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlStringUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlStringUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java similarity index 73% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplate.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java index d1901baa7..5c2822727 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.Collection; import java.util.List; @@ -23,7 +23,7 @@ import java.util.function.Function; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.DataAccessUtils; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.util.Assert; import com.datastax.driver.core.BoundStatement; @@ -58,7 +58,7 @@ import com.datastax.driver.core.exceptions.DriverException; * it. *

* All CQL operations performed by this class are logged at debug level, using - * "org.springframework.data.cql.core.CqlTemplate" as log category. + * "org.springframework.data.cassandra.core.cqlTemplate" as log category. *

* NOTE: An instance of this class is thread-safe once configured. * @@ -76,7 +76,7 @@ import com.datastax.driver.core.exceptions.DriverException; * @see RowMapper * @see org.springframework.dao.support.PersistenceExceptionTranslator */ -public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { +public class CqlTemplate extends CassandraAccessor implements CqlOperations { /** * Create a new, uninitialized {@link CqlTemplate}. Note: The {@link SessionFactory} has to be set before using the @@ -119,7 +119,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#execute(org.springframework.data.cql.core.SessionCallback) + * @see org.springframework.data.cassandra.core.cqlOperations#execute(org.springframework.data.cassandra.core.cql.SessionCallback) */ @Override public T execute(SessionCallback action) throws DataAccessException { @@ -139,7 +139,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#execute(java.lang.String) + * @see org.springframework.data.cassandra.core.cqlOperations#execute(java.lang.String) */ @Override public boolean execute(String cql) throws DataAccessException { @@ -151,7 +151,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.ResultSetExtractor) + * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.ResultSetExtractor) */ @Override public T query(String cql, ResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -176,7 +176,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowCallbackHandler) + * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowCallbackHandler) */ @Override public void query(String cql, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -185,7 +185,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public List query(String cql, RowMapper rowMapper) throws DataAccessException { @@ -194,7 +194,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForList(java.lang.String) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(java.lang.String) */ @Override public List> queryForList(String cql) throws DataAccessException { @@ -203,7 +203,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForList(java.lang.String, java.lang.Class) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(java.lang.String, java.lang.Class) */ @Override public List queryForList(String cql, Class elementType) throws DataAccessException { @@ -212,7 +212,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForMap(java.lang.String) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForMap(java.lang.String) */ @Override public Map queryForMap(String cql) throws DataAccessException { @@ -221,7 +221,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForObject(java.lang.String, java.lang.Class) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(java.lang.String, java.lang.Class) */ @Override public T queryForObject(String cql, Class requiredType) throws DataAccessException { @@ -230,7 +230,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public T queryForObject(String cql, RowMapper rowMapper) throws DataAccessException { @@ -239,7 +239,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForResultSet(java.lang.String) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForResultSet(java.lang.String) */ @Override public ResultSet queryForResultSet(String cql) throws DataAccessException { @@ -248,7 +248,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForRows(java.lang.String) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForRows(java.lang.String) */ @Override public Iterable queryForRows(String cql) throws DataAccessException { @@ -261,7 +261,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#execute(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cqlOperations#execute(com.datastax.driver.core.Statement) */ @Override public boolean execute(Statement statement) throws DataAccessException { @@ -273,7 +273,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.ResultSetExtractor) + * @see org.springframework.data.cassandra.core.cqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cassandra.core.cql.ResultSetExtractor) */ @Override public T query(Statement statement, ResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -294,7 +294,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowCallbackHandler) + * @see org.springframework.data.cassandra.core.cqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cassandra.core.cql.RowCallbackHandler) */ @Override public void query(Statement statement, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -303,7 +303,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public List query(Statement statement, RowMapper rowMapper) throws DataAccessException { @@ -312,7 +312,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForList(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(com.datastax.driver.core.Statement) */ @Override public List> queryForList(Statement statement) throws DataAccessException { @@ -321,7 +321,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForList(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public List queryForList(Statement statement, Class elementType) throws DataAccessException { @@ -330,7 +330,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForMap(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForMap(com.datastax.driver.core.Statement) */ @Override public Map queryForMap(Statement statement) throws DataAccessException { @@ -339,7 +339,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public T queryForObject(Statement statement, Class requiredType) throws DataAccessException { @@ -348,7 +348,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForObject(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(com.datastax.driver.core.Statement, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public T queryForObject(Statement statement, RowMapper rowMapper) throws DataAccessException { @@ -357,7 +357,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForResultSet(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForResultSet(com.datastax.driver.core.Statement) */ @Override public ResultSet queryForResultSet(Statement statement) throws DataAccessException { @@ -366,7 +366,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForRows(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForRows(com.datastax.driver.core.Statement) */ @Override public Iterable queryForRows(Statement statement) throws DataAccessException { @@ -379,7 +379,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#execute(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cqlOperations#execute(java.lang.String, java.lang.Object[]) */ @Override public boolean execute(String cql, Object... args) throws DataAccessException { @@ -388,7 +388,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#execute(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder) + * @see org.springframework.data.cassandra.core.cqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder) */ @Override public boolean execute(String cql, PreparedStatementBinder preparedStatementBinder) throws DataAccessException { @@ -397,7 +397,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#execute(java.lang.String, org.springframework.data.cql.core.PreparedStatementCallback) + * @see org.springframework.data.cassandra.core.cqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementCallback) */ @Override public T execute(String cql, PreparedStatementCallback action) throws DataAccessException { @@ -406,7 +406,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#execute(org.springframework.data.cql.core.PreparedStatementCreator) + * @see org.springframework.data.cassandra.core.cqlOperations#execute(org.springframework.data.cassandra.core.cql.PreparedStatementCreator) */ @Override public boolean execute(PreparedStatementCreator preparedStatementCreator) throws DataAccessException { @@ -415,7 +415,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#execute(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementCallback) + * @see org.springframework.data.cassandra.core.cqlOperations#execute(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementCallback) */ @Override public T execute(PreparedStatementCreator preparedStatementCreator, PreparedStatementCallback action) @@ -441,7 +441,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.ResultSetExtractor) + * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.ResultSetExtractor) */ @Override public T query(PreparedStatementCreator preparedStatementCreator, ResultSetExtractor resultSetExtractor) @@ -452,7 +452,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.RowCallbackHandler) + * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.RowCallbackHandler) */ @Override public void query(PreparedStatementCreator preparedStatementCreator, RowCallbackHandler rowCallbackHandler) @@ -463,7 +463,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public List query(PreparedStatementCreator preparedStatementCreator, RowMapper rowMapper) @@ -474,7 +474,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.ResultSetExtractor) + * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.ResultSetExtractor) */ @Override public T query(PreparedStatementCreator preparedStatementCreator, PreparedStatementBinder preparedStatementBinder, @@ -510,7 +510,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowCallbackHandler) + * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowCallbackHandler) */ @Override public void query(PreparedStatementCreator preparedStatementCreator, PreparedStatementBinder preparedStatementBinder, @@ -521,7 +521,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cqlOperations#query(org.springframework.data.cassandra.core.cql.PreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public List query(PreparedStatementCreator preparedStatementCreator, @@ -532,7 +532,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.ResultSetExtractor, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.ResultSetExtractor, java.lang.Object[]) */ @Override public T query(String cql, ResultSetExtractor resultSetExtractor, Object... args) throws DataAccessException { @@ -542,7 +542,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowCallbackHandler, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowCallbackHandler, java.lang.Object[]) */ @Override public void query(String cql, RowCallbackHandler rowCallbackHandler, Object... args) throws DataAccessException { @@ -552,7 +552,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) */ @Override public List query(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { @@ -561,7 +561,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.ResultSetExtractor) + * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.ResultSetExtractor) */ @Override public T query(String cql, PreparedStatementBinder preparedStatementBinder, @@ -572,7 +572,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowCallbackHandler) + * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowCallbackHandler) */ @Override public void query(String cql, PreparedStatementBinder preparedStatementBinder, RowCallbackHandler rowCallbackHandler) @@ -583,7 +583,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public List query(String cql, PreparedStatementBinder preparedStatementBinder, RowMapper rowMapper) @@ -594,7 +594,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForList(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(java.lang.String, java.lang.Object[]) */ @Override public List> queryForList(String cql, Object... args) throws DataAccessException { @@ -604,7 +604,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForList(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForList(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public List queryForList(String cql, Class elementType, Object... args) throws DataAccessException { @@ -614,7 +614,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForMap(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForMap(java.lang.String, java.lang.Object[]) */ @Override public Map queryForMap(String cql, Object... args) throws DataAccessException { @@ -623,7 +623,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public T queryForObject(String cql, Class requiredType, Object... args) throws DataAccessException { @@ -632,7 +632,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) */ @Override public T queryForObject(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { @@ -642,7 +642,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) */ @Override public ResultSet queryForResultSet(String cql, Object... args) throws DataAccessException { @@ -651,7 +651,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#queryForRows(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cqlOperations#queryForRows(java.lang.String, java.lang.Object[]) */ @Override public Iterable queryForRows(String cql, Object... args) throws DataAccessException { @@ -660,7 +660,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#describeRing() + * @see org.springframework.data.cassandra.core.cqlOperations#describeRing() */ @Override public List describeRing() throws DataAccessException { @@ -669,7 +669,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.CqlOperations#describeRing(org.springframework.data.cql.core.HostMapper) + * @see org.springframework.data.cassandra.core.cqlOperations#describeRing(org.springframework.data.cassandra.core.cql.HostMapper) */ @Override public Collection describeRing(HostMapper hostMapper) throws DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ExceptionTranslatingListenableFutureAdapter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExceptionTranslatingListenableFutureAdapter.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ExceptionTranslatingListenableFutureAdapter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExceptionTranslatingListenableFutureAdapter.java index d34bb266b..5caf208d9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ExceptionTranslatingListenableFutureAdapter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExceptionTranslatingListenableFutureAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/GuavaListenableFutureAdapter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/GuavaListenableFutureAdapter.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/GuavaListenableFutureAdapter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/GuavaListenableFutureAdapter.java index 9a79ee1a0..8b09edbcc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/GuavaListenableFutureAdapter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/GuavaListenableFutureAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/HostMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/HostMapper.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/HostMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/HostMapper.java index 638b5952b..0781de822 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/HostMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/HostMapper.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.Collection; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/IncorrectResultSetColumnCountException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/IncorrectResultSetColumnCountException.java similarity index 70% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/IncorrectResultSetColumnCountException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/IncorrectResultSetColumnCountException.java index 7e0265fff..09c4557df 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/IncorrectResultSetColumnCountException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/IncorrectResultSetColumnCountException.java @@ -1,4 +1,19 @@ -package org.springframework.data.cql.support.exception; +/* + * Copyright 2017 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 + * + * http://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.cql; import org.springframework.dao.DataRetrievalFailureException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/KeyspaceIdentifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/KeyspaceIdentifier.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java index 7c27e0622..2f0391f15 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/KeyspaceIdentifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.regex.Pattern; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/Ordering.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/Ordering.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/Ordering.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/Ordering.java index 4ba3b3a4b..202f1cd08 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/Ordering.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/Ordering.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.Comparator; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementBinder.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementBinder.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementBinder.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementBinder.java index 6cc540afa..ab5437e62 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementBinder.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementBinder.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.PreparedStatement; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementCallback.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementCallback.java index 9ee714052..de3b20d99 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementCallback.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.springframework.dao.DataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementCreator.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementCreator.java index 986bba323..9defa7ab2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementCreator.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PrimaryKeyType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PrimaryKeyType.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PrimaryKeyType.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PrimaryKeyType.java index 3165c2040..763fecea2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/PrimaryKeyType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PrimaryKeyType.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.Comparator; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryOptions.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptions.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryOptions.java index 53ae7f8d3..9d73f0f67 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryOptions.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.Optional; import java.util.concurrent.TimeUnit; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptionsUtil.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryOptionsUtil.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptionsUtil.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryOptionsUtil.java index 68926319f..ad5448fe5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/QueryOptionsUtil.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryOptionsUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/ReactiveCassandraAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/ReactiveCassandraAccessor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java index a6efa2ba6..cc537e072 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/ReactiveCassandraAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.core.cql; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; -import org.springframework.data.cql.core.session.ReactiveSession; -import org.springframework.data.cql.core.session.ReactiveSessionFactory; +import org.springframework.data.cassandra.ReactiveSession; +import org.springframework.data.cassandra.ReactiveSessionFactory; import org.springframework.util.Assert; import com.datastax.driver.core.exceptions.DriverException; /** - * Base class for {@link org.springframework.data.cql.core.ReactiveCqlTemplate} and other CQL-accessing DAO helpers, - * defining common properties such as {@link ReactiveSessionFactory} and exception translator. + * Base class for {@link ReactiveCqlTemplate} and other CQL-accessing DAO helpers, defining common properties such as + * {@link ReactiveSessionFactory} and exception translator. *

* Not intended to be used directly. * @@ -35,7 +35,7 @@ import com.datastax.driver.core.exceptions.DriverException; * @since 2.0 * @see InitializingBean * @see ReactiveSession - * @see org.springframework.data.cql.core.ReactiveCqlTemplate + * @see ReactiveCqlTemplate */ public abstract class ReactiveCassandraAccessor implements InitializingBean { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlOperations.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlOperations.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlOperations.java index 999f54d6c..7809303a6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlOperations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -23,7 +23,7 @@ import java.util.Map; import org.reactivestreams.Publisher; import org.springframework.dao.DataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; -import org.springframework.data.cql.core.session.ReactiveResultSet; +import org.springframework.data.cassandra.ReactiveResultSet; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Row; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java similarity index 80% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlTemplate.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java index 0e3fd5a26..6dc9d405b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -25,11 +25,10 @@ import java.util.function.Function; import org.reactivestreams.Publisher; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.DataAccessUtils; -import org.springframework.data.cql.core.session.DefaultReactiveSessionFactory; -import org.springframework.data.cql.core.session.ReactiveResultSet; -import org.springframework.data.cql.core.session.ReactiveSession; -import org.springframework.data.cql.core.session.ReactiveSessionFactory; -import org.springframework.data.cql.support.ReactiveCassandraAccessor; +import org.springframework.data.cassandra.ReactiveResultSet; +import org.springframework.data.cassandra.ReactiveSession; +import org.springframework.data.cassandra.ReactiveSessionFactory; +import org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessionFactory; import org.springframework.util.Assert; import com.datastax.driver.core.BoundStatement; @@ -65,7 +64,7 @@ import com.datastax.driver.core.querybuilder.QueryBuilder; * it. *

* All CQL operations performed by this class are logged at debug level, using - * "org.springframework.data.cql.core.ReactiveCqlTemplate" as log category. + * "org.springframework.data.cassandra.core.cql.ReactiveCqlTemplate" as log category. *

* NOTE: An instance of this class is thread-safe once configured. * @@ -196,11 +195,11 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } // ------------------------------------------------------------------------- - // Methods dealing with a plain org.springframework.data.cql.core.ReactiveSession + // Methods dealing with a plain org.springframework.data.cassandra.core.cql.ReactiveSession // ------------------------------------------------------------------------- /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(org.springframework.data.cql.core.ReactiveSessionCallback) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(org.springframework.data.cassandra.core.cql.ReactiveSessionCallback) */ @Override public Flux execute(ReactiveSessionCallback action) throws DataAccessException { @@ -215,7 +214,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re // ------------------------------------------------------------------------- /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(java.lang.String) */ @Override public Mono execute(String cql) throws DataAccessException { @@ -226,7 +225,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.ReactiveResultSetExtractor) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor) */ @Override public Flux query(String cql, ReactiveResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -245,7 +244,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public Flux query(String cql, RowMapper rowMapper) throws DataAccessException { @@ -253,7 +252,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public Mono queryForObject(String cql, RowMapper rowMapper) throws DataAccessException { @@ -262,7 +261,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(java.lang.String, java.lang.Class) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(java.lang.String, java.lang.Class) */ @Override public Mono queryForObject(String cql, Class requiredType) throws DataAccessException { @@ -270,7 +269,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForMap(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForMap(java.lang.String) */ @Override public Mono> queryForMap(String cql) throws DataAccessException { @@ -278,7 +277,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Class) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Class) */ @Override public Flux queryForFlux(String cql, Class elementType) throws DataAccessException { @@ -286,7 +285,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(java.lang.String) */ @Override public Flux> queryForFlux(String cql) throws DataAccessException { @@ -294,7 +293,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForResultSet(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForResultSet(java.lang.String) */ @Override public Mono queryForResultSet(String cql) throws DataAccessException { @@ -312,7 +311,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForRows(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForRows(java.lang.String) */ @Override public Flux queryForRows(String cql) throws DataAccessException { @@ -321,7 +320,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(org.reactivestreams.Publisher) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(org.reactivestreams.Publisher) */ @Override public Flux execute(Publisher statementPublisher) throws DataAccessException { @@ -336,7 +335,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re // ------------------------------------------------------------------------- /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(com.datastax.driver.core.Statement) */ @Override public Mono execute(Statement statement) throws DataAccessException { @@ -347,7 +346,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.ReactiveResultSetExtractor) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor) */ @Override public Flux query(Statement statement, ReactiveResultSetExtractor rse) throws DataAccessException { @@ -366,7 +365,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public Flux query(Statement statement, RowMapper rowMapper) throws DataAccessException { @@ -374,7 +373,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(com.datastax.driver.core.Statement, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public Mono queryForObject(Statement statement, RowMapper rowMapper) throws DataAccessException { @@ -383,7 +382,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public Mono queryForObject(Statement statement, Class requiredType) throws DataAccessException { @@ -391,7 +390,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForMap(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForMap(com.datastax.driver.core.Statement) */ @Override public Mono> queryForMap(Statement statement) throws DataAccessException { @@ -399,7 +398,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public Flux queryForFlux(Statement statement, Class elementType) throws DataAccessException { @@ -407,7 +406,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(com.datastax.driver.core.Statement) */ @Override public Flux> queryForFlux(Statement statement) throws DataAccessException { @@ -415,7 +414,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForResultSet(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForResultSet(com.datastax.driver.core.Statement) */ @Override public Mono queryForResultSet(Statement statement) throws DataAccessException { @@ -444,7 +443,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re // ------------------------------------------------------------------------- /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(org.springframework.data.cql.core.ReactivePreparedStatementCreator, org.springframework.data.cql.core.ReactivePreparedStatementCallback) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator, org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCallback) */ @Override public Flux execute(ReactivePreparedStatementCreator psc, ReactivePreparedStatementCallback action) @@ -463,7 +462,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(java.lang.String, org.springframework.data.cql.core.ReactivePreparedStatementCallback) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCallback) */ @Override public Flux execute(String cql, ReactivePreparedStatementCallback action) throws DataAccessException { @@ -502,7 +501,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(org.springframework.data.cql.core.ReactivePreparedStatementCreator, org.springframework.data.cql.core.ReactiveResultSetExtractor) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator, org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor) */ @Override public Flux query(ReactivePreparedStatementCreator psc, ReactiveResultSetExtractor rse) @@ -512,7 +511,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.ReactiveResultSetExtractor) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor) */ @Override public Flux query(String cql, PreparedStatementBinder psb, ReactiveResultSetExtractor rse) @@ -522,7 +521,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.ReactiveResultSetExtractor, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor, java.lang.Object[]) */ @Override public Flux query(String cql, ReactiveResultSetExtractor rse, Object... args) throws DataAccessException { @@ -530,7 +529,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(org.springframework.data.cql.core.ReactivePreparedStatementCreator, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public Flux query(ReactivePreparedStatementCreator psc, RowMapper rowMapper) throws DataAccessException { @@ -538,7 +537,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public Flux query(String cql, PreparedStatementBinder psb, RowMapper rowMapper) throws DataAccessException { @@ -546,7 +545,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(org.springframework.data.cql.core.ReactivePreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator, org.springframework.data.cassandra.core.cql.PreparedStatementBinder, org.springframework.data.cassandra.core.cql.RowMapper) */ @Override public Flux query(ReactivePreparedStatementCreator psc, PreparedStatementBinder psb, RowMapper rowMapper) @@ -556,7 +555,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) */ @Override public Flux query(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { @@ -564,7 +563,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(java.lang.String, org.springframework.data.cassandra.core.cql.RowMapper, java.lang.Object[]) */ @Override public Mono queryForObject(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { @@ -573,7 +572,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public Mono queryForObject(String cql, Class requiredType, Object... args) throws DataAccessException { @@ -581,7 +580,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForMap(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForMap(java.lang.String, java.lang.Object[]) */ @Override public Mono> queryForMap(String cql, Object... args) throws DataAccessException { @@ -589,7 +588,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public Flux queryForFlux(String cql, Class elementType, Object... args) throws DataAccessException { @@ -597,7 +596,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Object[]) */ @Override public Flux> queryForFlux(String cql, Object... args) throws DataAccessException { @@ -605,7 +604,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) */ @Override public Mono queryForResultSet(String cql, Object... args) throws DataAccessException { @@ -617,7 +616,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForRows(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#queryForRows(java.lang.String, java.lang.Object[]) */ @Override public Flux queryForRows(String cql, Object... args) throws DataAccessException { @@ -626,7 +625,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(org.springframework.data.cql.core.ReactivePreparedStatementCreator) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator) */ @Override public Mono execute(ReactivePreparedStatementCreator psc) throws DataAccessException { @@ -634,7 +633,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(java.lang.String, org.springframework.data.cassandra.core.cql.PreparedStatementBinder) */ @Override public Mono execute(String cql, PreparedStatementBinder psb) throws DataAccessException { @@ -643,7 +642,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(java.lang.String, java.lang.Object[]) */ @Override public Mono execute(String cql, Object... args) throws DataAccessException { @@ -651,7 +650,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(java.lang.String, org.reactivestreams.Publisher) + * @see org.springframework.data.cassandra.core.cql.ReactiveCqlOperations#execute(java.lang.String, org.reactivestreams.Publisher) */ @Override public Flux execute(String cql, Publisher args) throws DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCallback.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCallback.java index 62fbb265f..60dae4c73 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCallback.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.reactivestreams.Publisher; import org.springframework.dao.DataAccessException; -import org.springframework.data.cql.core.session.ReactiveSession; +import org.springframework.data.cassandra.ReactiveSession; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Statement; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCreator.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCreator.java index e12ea8d89..6859aec52 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactivePreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCreator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import reactor.core.publisher.Mono; -import org.springframework.data.cql.core.session.ReactiveSession; +import org.springframework.data.cassandra.ReactiveSession; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveResultSetExtractor.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveResultSetExtractor.java index aadfac7ea..e64760678 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveResultSetExtractor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.reactivestreams.Publisher; import org.springframework.dao.DataAccessException; -import org.springframework.data.cql.core.session.ReactiveResultSet; +import org.springframework.data.cassandra.ReactiveResultSet; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveRowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveRowMapperResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java index 527ec2495..67901f263 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveRowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import reactor.core.publisher.Mono; import org.reactivestreams.Publisher; import org.springframework.dao.DataAccessException; -import org.springframework.data.cql.core.session.ReactiveResultSet; +import org.springframework.data.cassandra.ReactiveResultSet; import org.springframework.util.Assert; import com.datastax.driver.core.exceptions.DriverException; @@ -56,7 +56,7 @@ public class ReactiveRowMapperResultSetExtractor implements ReactiveResultSet } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveResultSetExtractor#extractData(org.springframework.data.cql.core.ReactiveResultSet) + * @see org.springframework.data.cassandra.core.cql.ReactiveResultSetExtractor#extractData(org.springframework.data.cassandra.core.cql.ReactiveResultSet) */ @Override public Publisher extractData(ReactiveResultSet resultSet) throws DriverException, DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveSessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveSessionCallback.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveSessionCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveSessionCallback.java index 589318adc..b2d32d42f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveSessionCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveSessionCallback.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.reactivestreams.Publisher; import org.springframework.dao.DataAccessException; -import org.springframework.data.cql.core.session.ReactiveSession; +import org.springframework.data.cassandra.ReactiveSession; import com.datastax.driver.core.Statement; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveStatementCallback.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveStatementCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveStatementCallback.java index b8185e8ae..ca3c5c368 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveStatementCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveStatementCallback.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.reactivestreams.Publisher; import org.springframework.dao.DataAccessException; -import org.springframework.data.cql.core.session.ReactiveSession; +import org.springframework.data.cassandra.ReactiveSession; import com.datastax.driver.core.Statement; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReservedKeyword.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReservedKeyword.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReservedKeyword.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReservedKeyword.java index 29d940c1d..452c1e9fe 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReservedKeyword.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReservedKeyword.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.HashSet; import java.util.Set; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ResultSetExtractor.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ResultSetExtractor.java index fd5c91f39..6de385479 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ResultSetExtractor.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.springframework.dao.DataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMember.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMember.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMember.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMember.java index 75ad48c1f..32db4615f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMember.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMember.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.io.Serializable; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMemberHostMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java similarity index 87% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMemberHostMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java index 201a4a929..f422bd4d8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMemberHostMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.Collection; import java.util.stream.Collectors; @@ -36,7 +36,7 @@ public enum RingMemberHostMapper implements HostMapper { INSTANCE; /* (non-Javadoc) - * @see org.springframework.data.cql.core.HostMapper#mapHosts(java.util.Iterable) + * @see org.springframework.data.cassandra.core.cql.HostMapper#mapHosts(java.util.Iterable) */ @Override public Collection mapHosts(Iterable hosts) throws DriverException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowCallbackHandler.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowCallbackHandler.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowCallbackHandler.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowCallbackHandler.java index 98751ffc2..71fbad1fd 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowCallbackHandler.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowCallbackHandler.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import com.datastax.driver.core.Row; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapper.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapper.java index f20da24e1..782a5135f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapper.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import com.datastax.driver.core.Row; import com.datastax.driver.core.exceptions.DriverException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapperResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java index 0e2ee4afe..31f2a8d5d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.ArrayList; import java.util.List; @@ -70,7 +70,7 @@ public class RowMapperResultSetExtractor implements ResultSetExtractor extractData(ResultSet resultSet) throws DriverException, DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/RowUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowUtils.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/support/RowUtils.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowUtils.java index 61879caba..1d82aa742 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/RowUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.core.cql; import java.math.BigDecimal; import java.nio.ByteBuffer; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SessionCallback.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SessionCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SessionCallback.java index 60f9ba120..82920351f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SessionCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SessionCallback.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.springframework.dao.DataAccessException; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SimplePreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SimplePreparedStatementCreator.java similarity index 86% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SimplePreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SimplePreparedStatementCreator.java index aae98050c..0fe334f00 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SimplePreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SimplePreparedStatementCreator.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.springframework.util.Assert; @@ -48,14 +48,14 @@ public class SimplePreparedStatementCreator implements PreparedStatementCreator, } /* (non-Javadoc) - * @see org.springframework.data.cql.core.CqlProvider#getCql() + * @see org.springframework.data.cassandra.core.cqlProvider#getCql() */ public String getCql() { return this.cql; } /* (non-Javadoc) - * @see org.springframework.data.cql.core.PreparedStatementCreator#createPreparedStatement(com.datastax.driver.core.Session) + * @see org.springframework.data.cassandra.core.cql.PreparedStatementCreator#createPreparedStatement(com.datastax.driver.core.Session) */ @Override public PreparedStatement createPreparedStatement(Session session) throws DriverException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SingleColumnRowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SingleColumnRowMapper.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SingleColumnRowMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SingleColumnRowMapper.java index b07f8cbc0..adde84b1d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SingleColumnRowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SingleColumnRowMapper.java @@ -13,11 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import org.springframework.dao.TypeMismatchDataAccessException; -import org.springframework.data.cql.support.RowUtils; -import org.springframework.data.cql.support.exception.IncorrectResultSetColumnCountException; import org.springframework.util.ClassUtils; import org.springframework.util.NumberUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/WriteOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/WriteOptions.java similarity index 83% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/WriteOptions.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/WriteOptions.java index cf01bb253..2a9723c1f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/WriteOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/WriteOptions.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import java.util.concurrent.TimeUnit; @@ -99,7 +99,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#consistencyLevel(com.datastax.driver.core.ConsistencyLevel) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#consistencyLevel(com.datastax.driver.core.ConsistencyLevel) */ @Override public WriteOptionsBuilder consistencyLevel(com.datastax.driver.core.ConsistencyLevel consistencyLevel) { @@ -108,7 +108,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#retryPolicy(org.springframework.data.cql.core.RetryPolicy) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#retryPolicy(org.springframework.data.cassandra.core.cql.RetryPolicy) */ @Override public WriteOptionsBuilder retryPolicy(com.datastax.driver.core.policies.RetryPolicy driverRetryPolicy) { @@ -117,7 +117,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#fetchSize(int) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#fetchSize(int) */ @Override public WriteOptionsBuilder fetchSize(int fetchSize) { @@ -126,7 +126,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#readTimeout(long) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#readTimeout(long) */ @Override public WriteOptionsBuilder readTimeout(long readTimeout) { @@ -135,7 +135,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) */ @Override public WriteOptionsBuilder readTimeout(long readTimeout, TimeUnit timeUnit) { @@ -144,7 +144,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#tracing(boolean) + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#tracing(boolean) */ @Override public WriteOptionsBuilder tracing(boolean tracing) { @@ -153,7 +153,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#withTracing() + * @see org.springframework.data.cassandra.core.cql.QueryOptions.QueryOptionsBuilder#withTracing() */ @Override public WriteOptionsBuilder withTracing() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/AbstractResultSetConverter.java similarity index 98% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/AbstractResultSetConverter.java index 7be3d755b..10d35332b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/AbstractResultSetConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.util.List; import java.util.Map; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetToBasicFixedTypeConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/AbstractResultSetToBasicFixedTypeConverter.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetToBasicFixedTypeConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/AbstractResultSetToBasicFixedTypeConverter.java index 29234df7e..164c9e0fb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/AbstractResultSetToBasicFixedTypeConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/AbstractResultSetToBasicFixedTypeConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToArrayConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToArrayConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java index e976e6f3b..f3e210cc4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToArrayConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.util.ArrayList; import java.util.List; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigDecimalConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigDecimalConverter.java similarity index 82% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigDecimalConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigDecimalConverter.java index 6647427bf..f5790b22f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigDecimalConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigDecimalConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.math.BigDecimal; @@ -31,7 +31,7 @@ public class ResultSetToBigDecimalConverter extends AbstractResultSetToBasicFixe public static final ResultSetToBigDecimalConverter INSTANCE = new ResultSetToBigDecimalConverter(); /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected BigDecimal doConvertSingleValue(Object object) { @@ -39,7 +39,7 @@ public class ResultSetToBigDecimalConverter extends AbstractResultSetToBasicFixe } /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigIntegerConverter.java similarity index 82% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigIntegerConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigIntegerConverter.java index 611e46e3d..5b959380c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigIntegerConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigIntegerConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.math.BigInteger; @@ -31,7 +31,7 @@ public class ResultSetToBigIntegerConverter extends AbstractResultSetToBasicFixe public static final ResultSetToBigIntegerConverter INSTANCE = new ResultSetToBigIntegerConverter(); /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected BigInteger doConvertSingleValue(Object object) { @@ -39,7 +39,7 @@ public class ResultSetToBigIntegerConverter extends AbstractResultSetToBasicFixe } /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBooleanConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBooleanConverter.java similarity index 81% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBooleanConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBooleanConverter.java index 7ade0f9a4..60ca463c3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBooleanConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBooleanConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import org.springframework.core.convert.converter.Converter; @@ -29,7 +29,7 @@ public class ResultSetToBooleanConverter extends AbstractResultSetToBasicFixedTy public static final ResultSetToBooleanConverter INSTANCE = new ResultSetToBooleanConverter(); /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Boolean doConvertSingleValue(Object object) { @@ -37,7 +37,7 @@ public class ResultSetToBooleanConverter extends AbstractResultSetToBasicFixedTy } /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToByteBufferConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java similarity index 82% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToByteBufferConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java index f070e7db6..e7a9ec2d1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToByteBufferConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.nio.ByteBuffer; @@ -31,7 +31,7 @@ public class ResultSetToByteBufferConverter extends AbstractResultSetConverter getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDateConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDateConverter.java similarity index 81% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDateConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDateConverter.java index 98382855d..c98f2f952 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDateConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDateConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.util.Date; @@ -31,7 +31,7 @@ public class ResultSetToDateConverter extends AbstractResultSetToBasicFixedTypeC public static final ResultSetToDateConverter INSTANCE = new ResultSetToDateConverter(); /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Date doConvertSingleValue(Object object) { @@ -39,7 +39,7 @@ public class ResultSetToDateConverter extends AbstractResultSetToBasicFixedTypeC } /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDoubleConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDoubleConverter.java similarity index 81% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDoubleConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDoubleConverter.java index d1c6a18f0..7b57c3e98 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDoubleConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDoubleConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import org.springframework.core.convert.converter.Converter; @@ -29,7 +29,7 @@ public class ResultSetToDoubleConverter extends AbstractResultSetToBasicFixedTyp public static final ResultSetToDoubleConverter INSTANCE = new ResultSetToDoubleConverter(); /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Double doConvertSingleValue(Object object) { @@ -37,7 +37,7 @@ public class ResultSetToDoubleConverter extends AbstractResultSetToBasicFixedTyp } /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToFloatConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToFloatConverter.java similarity index 81% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToFloatConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToFloatConverter.java index ad6161ea8..d47c07d99 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToFloatConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToFloatConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import org.springframework.core.convert.converter.Converter; @@ -29,7 +29,7 @@ public class ResultSetToFloatConverter extends AbstractResultSetToBasicFixedType public static final ResultSetToFloatConverter INSTANCE = new ResultSetToFloatConverter(); /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Float doConvertSingleValue(Object object) { @@ -37,7 +37,7 @@ public class ResultSetToFloatConverter extends AbstractResultSetToBasicFixedType } /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToInetAddressConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToInetAddressConverter.java similarity index 82% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToInetAddressConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToInetAddressConverter.java index 42c71a39b..77244eda7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToInetAddressConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToInetAddressConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.net.InetAddress; @@ -31,7 +31,7 @@ public class ResultSetToInetAddressConverter extends AbstractResultSetToBasicFix public static final ResultSetToInetAddressConverter INSTANCE = new ResultSetToInetAddressConverter(); /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected InetAddress doConvertSingleValue(Object object) { @@ -39,7 +39,7 @@ public class ResultSetToInetAddressConverter extends AbstractResultSetToBasicFix } /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToIntegerConverter.java similarity index 81% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToIntegerConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToIntegerConverter.java index d0ed3b014..5292a09a4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToIntegerConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToIntegerConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import org.springframework.core.convert.converter.Converter; @@ -29,7 +29,7 @@ public class ResultSetToIntegerConverter extends AbstractResultSetToBasicFixedTy public static final ResultSetToIntegerConverter INSTANCE = new ResultSetToIntegerConverter(); /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Integer doConvertSingleValue(Object object) { @@ -37,7 +37,7 @@ public class ResultSetToIntegerConverter extends AbstractResultSetToBasicFixedTy } /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java index 73dfa4fb1..376eeea28 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.util.ArrayList; import java.util.List; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListOfStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListOfStringConverter.java similarity index 86% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListOfStringConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListOfStringConverter.java index 1fdd9103a..9dcc0b654 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListOfStringConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListOfStringConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.util.ArrayList; import java.util.List; @@ -35,7 +35,7 @@ public class ResultSetToListOfStringConverter extends AbstractResultSetConverter public static final ResultSetToListOfStringConverter INSTANCE = new ResultSetToListOfStringConverter(); /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected List doConvertSingleValue(Object object) { @@ -47,7 +47,7 @@ public class ResultSetToListOfStringConverter extends AbstractResultSetConverter } /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleRow(java.util.Map) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleRow(java.util.Map) */ @Override protected List doConvertSingleRow(Map row) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToLongConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToLongConverter.java similarity index 81% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToLongConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToLongConverter.java index 63d0ad5e2..40965c3b2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToLongConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToLongConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import org.springframework.core.convert.converter.Converter; @@ -29,7 +29,7 @@ public class ResultSetToLongConverter extends AbstractResultSetToBasicFixedTypeC public static final ResultSetToLongConverter INSTANCE = new ResultSetToLongConverter(); /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Long doConvertSingleValue(Object object) { @@ -37,7 +37,7 @@ public class ResultSetToLongConverter extends AbstractResultSetToBasicFixedTypeC } /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java similarity index 87% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToStringConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java index 59396d89c..0382f399d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToStringConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.util.List; import java.util.Map; @@ -32,7 +32,7 @@ public class ResultSetToStringConverter extends AbstractResultSetConverter row) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToUuidConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToUuidConverter.java similarity index 81% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToUuidConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToUuidConverter.java index 53a6b2710..ac06bb2e8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToUuidConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToUuidConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.util.UUID; @@ -31,7 +31,7 @@ public class ResultSetToUuidConverter extends AbstractResultSetToBasicFixedTypeC public static final ResultSetToUuidConverter INSTANCE = new ResultSetToUuidConverter(); /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected UUID doConvertSingleValue(Object object) { @@ -39,7 +39,7 @@ public class ResultSetToUuidConverter extends AbstractResultSetToBasicFixedTypeC } /* (non-Javadoc) - * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cassandra.core.cql.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToArrayConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToArrayConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java index e5bfc8285..6a00eebfa 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToArrayConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.util.List; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToListConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToListConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java index 400e9fceb..55fd7627b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToListConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.util.List; import java.util.stream.Collectors; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToMapConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToMapConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java index 9aa156888..1b0ebd2c8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/RowToMapConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.converter; +package org.springframework.data.cassandra.core.cql.converter; import java.util.HashMap; import java.util.Map; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/package-info.java new file mode 100644 index 000000000..b5d266d70 --- /dev/null +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/package-info.java @@ -0,0 +1,4 @@ +/** + * CQL specific converters. + */ +package org.springframework.data.cassandra.core.cql.converter; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AddColumnCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AddColumnCqlGenerator.java similarity index 74% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AddColumnCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AddColumnCqlGenerator.java index 471347452..e2126be2e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AddColumnCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AddColumnCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; -import org.springframework.data.cql.core.keyspace.AddColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.AddColumnSpecification; /** * CQL generator for generating an {@code ADD} clause of an {@code ALTER TABLE} statement. @@ -26,7 +26,7 @@ import org.springframework.data.cql.core.keyspace.AddColumnSpecification; * @author Mark Paluch * @see AddColumnSpecification * @see ColumnChangeCqlGenerator - * @see org.springframework.data.cql.core.keyspace.AlterTableSpecification + * @see org.springframework.data.cassandra.core.cql.keyspace.AlterTableSpecification */ public class AddColumnCqlGenerator extends ColumnChangeCqlGenerator { @@ -35,7 +35,7 @@ public class AddColumnCqlGenerator extends ColumnChangeCqlGeneratorALTER TABLE statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterKeyspaceCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterKeyspaceCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java index 0288605a7..fdf08619c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterKeyspaceCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; import java.util.Map; -import org.springframework.data.cql.core.keyspace.AlterKeyspaceSpecification; -import org.springframework.data.cql.core.keyspace.Option; +import org.springframework.data.cassandra.core.cql.keyspace.AlterKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.Option; /** * CQL generator for generating {@code ALTER TABLE} statements. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterTableCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGenerator.java similarity index 83% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterTableCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGenerator.java index d6e9a9243..4475a255e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterTableCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGenerator.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; import java.util.Map; -import org.springframework.data.cql.core.keyspace.AddColumnSpecification; -import org.springframework.data.cql.core.keyspace.AlterColumnSpecification; -import org.springframework.data.cql.core.keyspace.AlterTableSpecification; -import org.springframework.data.cql.core.keyspace.ColumnChangeSpecification; -import org.springframework.data.cql.core.keyspace.DropColumnSpecification; -import org.springframework.data.cql.core.keyspace.Option; -import org.springframework.data.cql.core.keyspace.RenameColumnSpecification; -import org.springframework.data.cql.core.keyspace.TableOption; +import org.springframework.data.cassandra.core.cql.keyspace.AddColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.AlterColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.AlterTableSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.ColumnChangeSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.Option; +import org.springframework.data.cassandra.core.cql.keyspace.RenameColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption; /** * CQL generator for generating {@code ALTER TABLE} statements. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGenerator.java similarity index 81% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGenerator.java index e7e7bd614..ce182d663 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGenerator.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; -import org.springframework.data.cql.core.keyspace.AddColumnSpecification; -import org.springframework.data.cql.core.keyspace.AlterColumnSpecification; -import org.springframework.data.cql.core.keyspace.AlterUserTypeSpecification; -import org.springframework.data.cql.core.keyspace.ColumnChangeSpecification; -import org.springframework.data.cql.core.keyspace.RenameColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.AddColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.AlterColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.AlterUserTypeSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.ColumnChangeSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.RenameColumnSpecification; import org.springframework.util.Assert; /** @@ -52,7 +52,7 @@ public class AlterUserTypeCqlGenerator extends UserTypeNameCqlGenerator { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropIndexCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropIndexCqlGenerator.java similarity index 85% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropIndexCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropIndexCqlGenerator.java index c4246316b..a8a43579a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropIndexCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropIndexCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; -import org.springframework.data.cql.core.keyspace.DropIndexSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropIndexSpecification; /** * CQL generator for generating a {@code DROP INDEX} statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropKeyspaceCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java similarity index 84% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropKeyspaceCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java index fa1bb17d3..8724c26f8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropKeyspaceCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; -import org.springframework.data.cql.core.keyspace.DropKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropKeyspaceSpecification; /** * CQL generator for generating a {@code DROP TABLE} statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropTableCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropTableCqlGenerator.java similarity index 84% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropTableCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropTableCqlGenerator.java index c563d6e06..c16ed466d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropTableCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropTableCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; -import org.springframework.data.cql.core.keyspace.DropTableSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropTableSpecification; /** * CQL generator for generating a {@code DROP TABLE} statement. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropUserTypeCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropUserTypeCqlGenerator.java similarity index 81% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropUserTypeCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropUserTypeCqlGenerator.java index a613ab7db..207dfe078 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/DropUserTypeCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/DropUserTypeCqlGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; -import org.springframework.data.cql.core.keyspace.DropUserTypeSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropUserTypeSpecification; /** * CQL generator for generating a {@code DROP TYPE} statement. @@ -44,7 +44,7 @@ public class DropUserTypeCqlGenerator extends UserTypeNameCqlGenerator { @@ -50,7 +50,7 @@ public class RenameColumnCqlGenerator extends ColumnChangeCqlGenerator { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterTableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/AlterTableSpecification.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterTableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/AlterTableSpecification.java index 2064504bc..0183fc8c5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterTableSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/AlterTableSpecification.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import com.datastax.driver.core.DataType; @@ -35,7 +35,7 @@ import com.datastax.driver.core.DataType; * @see CreateTableSpecification * @see DropTableSpecification * @see TableOptionsSpecification - * @see org.springframework.data.cql.core.generator.AlterTableCqlGenerator + * @see org.springframework.data.cassandra.core.cql.generator.AlterTableCqlGenerator */ public class AlterTableSpecification extends TableOptionsSpecification { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterUserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/AlterUserTypeSpecification.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterUserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/AlterUserTypeSpecification.java index 910ad72c5..c9293dda0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/AlterUserTypeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/AlterUserTypeSpecification.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnChangeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnChangeSpecification.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnChangeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnChangeSpecification.java index bedd29e81..cbfe47cb1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnChangeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnChangeSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java index ff874a455..9f7f80b8f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlIdentifier.*; -import static org.springframework.data.cql.core.CqlStringUtils.*; -import static org.springframework.data.cql.core.Ordering.*; -import static org.springframework.data.cql.core.PrimaryKeyType.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.Ordering.*; +import static org.springframework.data.cassandra.core.cql.PrimaryKeyType.*; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.Ordering; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.Ordering; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.util.Assert; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnTypeChangeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnTypeChangeSpecification.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnTypeChangeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnTypeChangeSpecification.java index a9543111c..653c27323 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/ColumnTypeChangeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnTypeChangeSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.util.Assert; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateIndexSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateIndexSpecification.java similarity index 86% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateIndexSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateIndexSpecification.java index 879501f43..57b84aa0b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateIndexSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateIndexSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -84,7 +84,7 @@ public class CreateIndexSpecification extends IndexNameSpecification { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateTableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateTableSpecification.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateTableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateTableSpecification.java index bf757dc0c..199da9aa3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateTableSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateTableSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; /** * Builder class to construct a {@code CREATE TABLE} specification. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateUserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateUserTypeSpecification.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateUserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateUserTypeSpecification.java index 345544324..bf284558d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateUserTypeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateUserTypeSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; /** * Builder class to construct a {@code CREATE TYPE} specification. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DataCenterReplication.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DataCenterReplication.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DataCenterReplication.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DataCenterReplication.java index ba6bbd167..634fadc4a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DataCenterReplication.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DataCenterReplication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; /** * Simple data structure to be used when setting the replication factor for a given data center. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultOption.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DefaultOption.java similarity index 86% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultOption.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DefaultOption.java index af76d893c..7c1d68a47 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultOption.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DefaultOption.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -108,49 +108,49 @@ public class DefaultOption implements Option { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.keyspace.Option#getType() + * @see org.springframework.data.cassandra.core.cql.keyspace.Option#getType() */ public Class getType() { return type; } /* (non-Javadoc) - * @see org.springframework.data.cql.core.keyspace.Option#getName() + * @see org.springframework.data.cassandra.core.cql.keyspace.Option#getName() */ public String getName() { return name; } /* (non-Javadoc) - * @see org.springframework.data.cql.core.keyspace.Option#takesValue() + * @see org.springframework.data.cassandra.core.cql.keyspace.Option#takesValue() */ public boolean takesValue() { return type != null; } /* (non-Javadoc) - * @see org.springframework.data.cql.core.keyspace.Option#requiresValue() + * @see org.springframework.data.cassandra.core.cql.keyspace.Option#requiresValue() */ public boolean requiresValue() { return this.requiresValue; } /* (non-Javadoc) - * @see org.springframework.data.cql.core.keyspace.Option#escapesValue() + * @see org.springframework.data.cassandra.core.cql.keyspace.Option#escapesValue() */ public boolean escapesValue() { return this.escapesValue; } /* (non-Javadoc) - * @see org.springframework.data.cql.core.keyspace.Option#quotesValue() + * @see org.springframework.data.cassandra.core.cql.keyspace.Option#quotesValue() */ public boolean quotesValue() { return this.quotesValue; } /* (non-Javadoc) - * @see org.springframework.data.cql.core.keyspace.Option#checkValue(java.lang.Object) + * @see org.springframework.data.cassandra.core.cql.keyspace.Option#checkValue(java.lang.Object) */ public void checkValue(Object value) { if (takesValue()) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultTableDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DefaultTableDescriptor.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultTableDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DefaultTableDescriptor.java index 2d2f0a669..57ef43ded 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DefaultTableDescriptor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DefaultTableDescriptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; /** * Convenient default implementation of {@link TableDescriptor} as an extension of {@link TableSpecification} that diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropColumnSpecification.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropColumnSpecification.java index 42f49c0a8..76c65b80d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropColumnSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropColumnSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; /** * A specification to drop a column. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropIndexSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropIndexSpecification.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropIndexSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropIndexSpecification.java index c980938e2..00f7ef3c7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropIndexSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropIndexSpecification.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; /** * Builder class that supports the construction of {@code DROP INDEX} specifications. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropKeyspaceSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropKeyspaceSpecification.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropKeyspaceSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropKeyspaceSpecification.java index d8115a922..c0c864cc3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropKeyspaceSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropKeyspaceSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import org.springframework.data.cql.core.KeyspaceIdentifier; +import org.springframework.data.cassandra.core.cql.KeyspaceIdentifier; public class DropKeyspaceSpecification extends KeyspaceActionSpecification { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropTableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropTableSpecification.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropTableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropTableSpecification.java index 77bf3f502..9d64cf553 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropTableSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropTableSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; /** * Builder class that supports the construction of {@code DROP TABLE} specifications. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropUserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropUserTypeSpecification.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropUserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropUserTypeSpecification.java index 3910947ed..e85d41122 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DropUserTypeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropUserTypeSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; /** * Builder class that supports the construction of {@code DROP TYPE} specifications. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/FieldSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/FieldSpecification.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/FieldSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/FieldSpecification.java index 7d9c200af..20175aa7f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/FieldSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/FieldSpecification.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlIdentifier.*; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.util.Assert; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexDescriptor.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexDescriptor.java index cb5fd3811..eed40a7e7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexDescriptor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexDescriptor.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; /** * Describes an index. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexNameSpecification.java similarity index 87% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexNameSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexNameSpecification.java index dd5a6261b..b00143857 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/IndexNameSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexNameSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceActionSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceActionSpecification.java similarity index 91% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceActionSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceActionSpecification.java index 78c9e82fe..2b0ce95ae 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceActionSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceActionSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.KeyspaceIdentifier.*; +import static org.springframework.data.cassandra.core.cql.KeyspaceIdentifier.*; -import org.springframework.data.cql.core.KeyspaceIdentifier; +import org.springframework.data.cassandra.core.cql.KeyspaceIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceAttributes.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceAttributes.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceAttributes.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceAttributes.java index 4a3c8235f..e2a9ca0b1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceAttributes.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceAttributes.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; import java.util.HashMap; import java.util.Map; -import org.springframework.data.cql.core.keyspace.KeyspaceOption.ReplicationStrategy; -import org.springframework.data.cql.core.util.MapBuilder; +import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceOption.ReplicationStrategy; +import org.springframework.data.cassandra.util.MapBuilder; /** * Keyspace attributes. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceDescriptor.java similarity index 87% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceDescriptor.java index 6d08c9f15..d2a77ff8b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceDescriptor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceDescriptor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; import java.util.Map; -import org.springframework.data.cql.core.KeyspaceIdentifier; +import org.springframework.data.cassandra.core.cql.KeyspaceIdentifier; /** * Describes a Keyspace. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOption.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceOption.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOption.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceOption.java index 434b0d5aa..53463ad5d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOption.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceOption.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; import java.util.Map; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOptionsSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceOptionsSpecification.java similarity index 95% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOptionsSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceOptionsSpecification.java index 043556b50..22816c273 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceOptionsSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceOptionsSpecification.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.data.cql.core.CqlStringUtils; +import org.springframework.data.cassandra.core.cql.CqlStringUtils; /** * Abstract builder class to support the construction of table specifications that have table options, that is, those diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceSpecification.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceSpecification.java index 523c1500e..0cad4c196 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceSpecification.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; /** * Builder class to support the construction of keyspace specifications that have columns. This class can also be used diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/Option.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/Option.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/Option.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/Option.java index 2ee5ca4e5..3a43affd7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/Option.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/Option.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; /** * Interface to represent option types. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/RenameColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/RenameColumnSpecification.java similarity index 88% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/RenameColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/RenameColumnSpecification.java index 4092b10e1..f35fee17f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/RenameColumnSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/RenameColumnSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableDescriptor.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableDescriptor.java index 02be2aaa9..3f153c88d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableDescriptor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableDescriptor.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; import java.util.List; import java.util.Map; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; /** * Describes a table. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableNameSpecification.java similarity index 86% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableNameSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableNameSpecification.java index 64248ef84..644b97fb9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableNameSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableNameSpecification.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOption.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableOption.java similarity index 99% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOption.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableOption.java index c02a4acb2..29fd845e1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOption.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableOption.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; import java.util.Map; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOptionsSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableOptionsSpecification.java similarity index 93% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOptionsSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableOptionsSpecification.java index 8fe6715d3..5f9df2a60 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableOptionsSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableOptionsSpecification.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlStringUtils.*; +import static org.springframework.data.cassandra.core.cql.CqlStringUtils.*; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.CqlStringUtils; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlStringUtils; /** * Abstract builder class to support the construction of table specifications that have table options, that is, those diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableSpecification.java similarity index 96% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableSpecification.java index 2c501febe..75e0e3d65 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/TableSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableSpecification.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlIdentifier.*; -import static org.springframework.data.cql.core.PrimaryKeyType.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; +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 org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.Ordering; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.Ordering; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.util.Assert; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/UserTypeNameSpecification.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeNameSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/UserTypeNameSpecification.java index dc53f5f4a..d6c53a5fa 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeNameSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/UserTypeNameSpecification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/UserTypeSpecification.java similarity index 90% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/UserTypeSpecification.java index 85a1a0ba7..9ed85818e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/UserTypeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/UserTypeSpecification.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; -import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/package-info.java similarity index 61% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/package-info.java index a60d6b59f..a0458112c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/package-info.java @@ -1,4 +1,4 @@ /** * Keyspace object action specifications such as {@code CREATE TABLE}, {@code DROP INDEX}. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/package-info.java new file mode 100644 index 000000000..888ebc3cd --- /dev/null +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/package-info.java @@ -0,0 +1,4 @@ +/** + * CQL core support. + */ +package org.springframework.data.cassandra.core.cql; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultBridgedReactiveSession.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java similarity index 81% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultBridgedReactiveSession.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java index 709f3e654..0d03023a0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultBridgedReactiveSession.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session; +package org.springframework.data.cassandra.core.cql.session; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -26,6 +26,8 @@ import java.util.concurrent.CompletableFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.data.cassandra.ReactiveResultSet; +import org.springframework.data.cassandra.ReactiveSession; import org.springframework.util.Assert; import com.datastax.driver.core.*; @@ -44,7 +46,7 @@ import com.google.common.util.concurrent.ListenableFuture; * this is an intermediate solution until Datastax can provide a fully reactive driver. *

* All CQL operations performed by this class are logged at debug level, using - * "org.springframework.data.cql.core.DefaultBridgedReactiveSession" as log category. + * "org.springframework.data.cassandra.core.cql.DefaultBridgedReactiveSession" as log category. *

* * @author Mark Paluch @@ -77,7 +79,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveSession#execute(java.lang.String) + * @see org.springframework.data.cassandra.ReactiveSession#execute(java.lang.String) */ @Override public Mono execute(String query) { @@ -88,7 +90,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveSession#execute(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cassandra.ReactiveSession#execute(java.lang.String, java.lang.Object[]) */ @Override public Mono execute(String query, Object... values) { @@ -99,7 +101,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveSession#execute(java.lang.String, java.util.Map) + * @see org.springframework.data.cassandra.ReactiveSession#execute(java.lang.String, java.util.Map) */ @Override public Mono execute(String query, Map values) { @@ -110,7 +112,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveSession#execute(com.datastax.driver.core.Statement) + * @see org.springframework.data.cassandra.ReactiveSession#execute(com.datastax.driver.core.Statement) */ @Override public Mono execute(Statement statement) { @@ -147,7 +149,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveSession#prepare(java.lang.String) + * @see org.springframework.data.cassandra.ReactiveSession#prepare(java.lang.String) */ @Override public Mono prepare(String query) { @@ -158,7 +160,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveSession#prepare(com.datastax.driver.core.RegularStatement) + * @see org.springframework.data.cassandra.ReactiveSession#prepare(com.datastax.driver.core.RegularStatement) */ @Override public Mono prepare(RegularStatement statement) { @@ -194,7 +196,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveSession#close() + * @see org.springframework.data.cassandra.ReactiveSession#close() */ @Override public void close() { @@ -202,7 +204,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveSession#isClosed() + * @see org.springframework.data.cassandra.ReactiveSession#isClosed() */ @Override public boolean isClosed() { @@ -210,7 +212,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveSession#getCluster() + * @see org.springframework.data.cassandra.ReactiveSession#getCluster() */ @Override public Cluster getCluster() { @@ -228,7 +230,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveResultSet#rows() + * @see org.springframework.data.cassandra.ReactiveResultSet#rows() */ @Override public Flux rows() { @@ -241,7 +243,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveResultSet#getColumnDefinitions() + * @see org.springframework.data.cassandra.ReactiveResultSet#getColumnDefinitions() */ @Override public ColumnDefinitions getColumnDefinitions() { @@ -249,7 +251,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveResultSet#wasApplied() + * @see org.springframework.data.cassandra.ReactiveResultSet#wasApplied() */ @Override public boolean wasApplied() { @@ -257,7 +259,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveResultSet#getExecutionInfo() + * @see org.springframework.data.cassandra.ReactiveResultSet#getExecutionInfo() */ @Override public ExecutionInfo getExecutionInfo() { @@ -265,7 +267,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.ReactiveResultSet#getAllExecutionInfo() + * @see org.springframework.data.cassandra.ReactiveResultSet#getAllExecutionInfo() */ @Override public List getAllExecutionInfo() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultReactiveSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultReactiveSessionFactory.java similarity index 82% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultReactiveSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultReactiveSessionFactory.java index 1313e992c..52c7e191e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultReactiveSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultReactiveSessionFactory.java @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session; +package org.springframework.data.cassandra.core.cql.session; -import org.springframework.data.cql.core.ReactiveRowMapperResultSetExtractor; +import org.springframework.data.cassandra.ReactiveSession; +import org.springframework.data.cassandra.ReactiveSessionFactory; +import org.springframework.data.cassandra.core.cql.ReactiveRowMapperResultSetExtractor; /** * Default implementation of {@link ReactiveSessionFactory}. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultSessionFactory.java similarity index 87% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultSessionFactory.java index cf3f6fea7..0bb35a921 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultSessionFactory.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session; +package org.springframework.data.cassandra.core.cql.session; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.util.Assert; import com.datastax.driver.core.Session; @@ -46,7 +47,7 @@ public class DefaultSessionFactory implements SessionFactory { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.session.SessionFactory#getSession() + * @see org.springframework.data.cassandra.session.SessionFactory#getSession() */ @Override public Session getSession() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/AbstractRoutingSessionFactory.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/AbstractRoutingSessionFactory.java index 443c0a40a..7d3f466c3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/AbstractRoutingSessionFactory.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session.lookup; +package org.springframework.data.cassandra.core.cql.session.lookup; import java.util.HashMap; import java.util.Map; import org.springframework.beans.factory.InitializingBean; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.util.Assert; import com.datastax.driver.core.Session; /** - * Abstract {@link org.springframework.data.cql.core.session.SessionFactory} implementation that routes - * {@link #getSession()} calls to one of various target {@link SessionFactory factories} based on a lookup key. The - * latter is usually (but not necessarily) determined through some thread-bound transaction context. + * Abstract {@link SessionFactory} implementation that routes {@link #getSession()} calls to one of various target + * {@link SessionFactory factories} based on a lookup key. The latter is usually (but not necessarily) determined + * through some thread-bound transaction context. * * @author Mark Paluch * @since 2.0 @@ -112,7 +112,7 @@ public abstract class AbstractRoutingSessionFactory implements SessionFactory, I } /* (non-Javadoc) - * @see org.springframework.data.cql.core.session.SessionFactory#getSession() + * @see org.springframework.data.cassandra.core.cql.session.SessionFactory#getSession() */ @Override public Session getSession() { @@ -175,7 +175,8 @@ public abstract class AbstractRoutingSessionFactory implements SessionFactory, I return this.sessionFactoryLookup.getSessionFactory((String) sessionFactory); } else { throw new IllegalArgumentException(String - .format("Illegal session factory value. Only [org.springframework.data.cql.core.session.SessionFactory]" + .format( + "Illegal session factory value. Only [org.springframework.data.cassandra.core.cql.session.SessionFactory]" + " and String supported: %s", sessionFactory)); } } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/BeanFactorySessionFactoryLookup.java similarity index 85% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/BeanFactorySessionFactoryLookup.java index 9ab2de791..50ea066c0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/BeanFactorySessionFactoryLookup.java @@ -13,19 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session.lookup; +package org.springframework.data.cassandra.core.cql.session.lookup; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.util.Assert; /** * {@link SessionFactoryLookup} implementation based on a Spring {@link BeanFactory}. *

- * Will lookup Spring managed beans identified by bean name, expecting them to be of type - * {@link org.springframework.data.cql.core.session.SessionFactory}. + * Will lookup Spring managed beans identified by bean name, expecting them to be of type {@link SessionFactory}. * * @author Mark Paluch * @since 2.0 @@ -51,8 +50,7 @@ public class BeanFactorySessionFactoryLookup implements SessionFactoryLookup, Be * {@link BeanFactory} will be replaced by the {@link BeanFactory} that creates it ({@link BeanFactoryAware} * contract). So only use this constructor if you are using this class outside the context of a Spring IoC container. * - * @param beanFactory the bean factory to be used to lookup - * {@link org.springframework.data.cql.core.session.SessionFactory session factories}, must not be + * @param beanFactory the bean factory to be used to lookup {@link SessionFactory session factories}, must not be * {@literal null}. */ public BeanFactorySessionFactoryLookup(BeanFactory beanFactory) { @@ -71,7 +69,7 @@ public class BeanFactorySessionFactoryLookup implements SessionFactoryLookup, Be } /* (non-Javadoc) - * @see org.springframework.data.cql.core.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) */ @Override public SessionFactory getSessionFactory(String sessionFactoryName) throws SessionFactoryLookupFailureException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/MapSessionFactoryLookup.java similarity index 94% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/MapSessionFactoryLookup.java index c642e3949..a631aaa12 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/MapSessionFactoryLookup.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session.lookup; +package org.springframework.data.cassandra.core.cql.session.lookup; import java.util.Collections; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.util.Assert; /** @@ -102,7 +102,7 @@ public class MapSessionFactoryLookup implements SessionFactoryLookup { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) */ @Override public SessionFactory getSessionFactory(String sessionFactoryName) throws SessionFactoryLookupFailureException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SessionFactoryLookup.java similarity index 86% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SessionFactoryLookup.java index e341e5cdf..d006eff95 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SessionFactoryLookup.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session.lookup; +package org.springframework.data.cassandra.core.cql.session.lookup; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; /** - * Strategy interface for looking up {@link org.springframework.data.cql.core.session.SessionFactory} by name. + * Strategy interface for looking up {@link SessionFactory} by name. *

* Implementing classes resolve session factories keyed by {@link String} from an underlying source such as a * {@link java.util.Map} or the {@link org.springframework.beans.factory.BeanFactory}. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookupFailureException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SessionFactoryLookupFailureException.java similarity index 89% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookupFailureException.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SessionFactoryLookupFailureException.java index 8dbe0b4af..27e8d7873 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SessionFactoryLookupFailureException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SessionFactoryLookupFailureException.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session.lookup; +package org.springframework.data.cassandra.core.cql.session.lookup; import org.springframework.dao.NonTransientDataAccessException; +import org.springframework.data.cassandra.SessionFactory; /** * Exception to be thrown by a {@link SessionFactoryLookup} implementation, indicating that the specified - * {@link org.springframework.data.cql.core.session.SessionFactory} could not be obtained. + * {@link SessionFactory} could not be obtained. * * @author Mark Paluch * @since 2.0 diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SingleSessionFactoryLookup.java similarity index 86% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SingleSessionFactoryLookup.java index 4214f041f..4b777c6de 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/SingleSessionFactoryLookup.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session.lookup; +package org.springframework.data.cassandra.core.cql.session.lookup; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; import org.springframework.util.Assert; /** @@ -42,7 +42,7 @@ public class SingleSessionFactoryLookup implements SessionFactoryLookup { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) + * @see org.springframework.data.cassandra.core.cql.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) */ @Override public SessionFactory getSessionFactory(String sessionFactoryName) throws SessionFactoryLookupFailureException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/package-info.java new file mode 100644 index 000000000..63632332f --- /dev/null +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/lookup/package-info.java @@ -0,0 +1,6 @@ +/** + * Provides a strategy for looking up {@link org.springframework.data.cassandra.SessionFactory}. + * + * @author Mark Paluch + */ +package org.springframework.data.cassandra.core.cql.session.lookup; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/package-info.java similarity index 72% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/package-info.java index 1decac44f..926b07f30 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/package-info.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/package-info.java @@ -4,4 +4,4 @@ * * @author Mark Paluch */ -package org.springframework.data.cql.core.session; +package org.springframework.data.cassandra.core.cql.session; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/CachedPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreator.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/CachedPreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreator.java index dd9639fdf..16e511448 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/CachedPreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.support; +package org.springframework.data.cassandra.core.cql.support; -import org.springframework.data.cql.core.PreparedStatementCreator; -import org.springframework.data.cql.core.QueryOptions; -import org.springframework.data.cql.core.QueryOptionsUtil; +import org.springframework.data.cassandra.core.cql.PreparedStatementCreator; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.core.cql.QueryOptionsUtil; import org.springframework.util.Assert; import com.datastax.driver.core.PreparedStatement; @@ -121,7 +121,7 @@ public class CachedPreparedStatementCreator implements PreparedStatementCreator } /* (non-Javadoc) - * @see org.springframework.data.cql.core.PreparedStatementCreator#createPreparedStatement(com.datastax.driver.core.Session) + * @see org.springframework.data.cassandra.core.cql.PreparedStatementCreator#createPreparedStatement(com.datastax.driver.core.Session) */ @Override public PreparedStatement createPreparedStatement(Session session) throws DriverException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/MapPreparedStatementCache.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java similarity index 92% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/MapPreparedStatementCache.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java index 9f5b12c82..63ea8e7ac 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/MapPreparedStatementCache.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.support; +package org.springframework.data.cassandra.core.cql.support; + +import lombok.EqualsAndHashCode; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; -import lombok.EqualsAndHashCode; - import org.springframework.util.Assert; import com.datastax.driver.core.Cluster; @@ -79,7 +79,7 @@ public class MapPreparedStatementCache implements PreparedStatementCache { } /* (non-Javadoc) - * @see org.springframework.data.cql.core.support.PrepatedStatementCache#getPreparedStatement(com.datastax.driver.core.RegularStatement, com.datastax.driver.core.Session, java.util.function.Supplier) + * @see org.springframework.data.cassandra.core.cql.support.PrepatedStatementCache#getPreparedStatement(com.datastax.driver.core.RegularStatement, com.datastax.driver.core.Session, java.util.function.Supplier) */ @Override public PreparedStatement getPreparedStatement(Session session, RegularStatement statement, diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/PreparedStatementCache.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/PreparedStatementCache.java similarity index 97% rename from spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/PreparedStatementCache.java rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/PreparedStatementCache.java index 4dbd476e8..8b6625054 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/support/PreparedStatementCache.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/PreparedStatementCache.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.support; +package org.springframework.data.cassandra.core.cql.support; import java.util.function.Supplier; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java index 1c10e69f0..92368f81d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.core.mapping; -import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; import java.util.Optional; @@ -24,9 +24,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.expression.BeanFactoryAccessor; import org.springframework.context.expression.BeanFactoryResolver; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.cassandra.util.SpelUtils; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.support.exception.UnsupportedCassandraOperationException; import org.springframework.data.mapping.Association; import org.springframework.data.mapping.AssociationHandler; import org.springframework.data.mapping.MappingException; @@ -181,7 +180,7 @@ public class BasicCassandraPersistentEntity extends BasicPersistentEntity, InitializingBean, DisposableBean, BeanNameAware, PersistenceExceptionTranslator { - - public static final boolean DEFAULT_JMX_REPORTING_ENABLED = true; - public static final boolean DEFAULT_METRICS_ENABLED = true; - public static final boolean DEFAULT_SSL_ENABLED = false; - - public static final int DEFAULT_MAX_SCHEMA_AGREEMENT_WAIT_SECONDS = 10; - public static final int DEFAULT_PORT = 9042; - - public static final String DEFAULT_CONTACT_POINTS = "localhost"; - - protected static final Logger log = LoggerFactory.getLogger(CassandraCqlClusterFactoryBean.class); - - private boolean jmxReportingEnabled = DEFAULT_JMX_REPORTING_ENABLED; - private boolean metricsEnabled = DEFAULT_METRICS_ENABLED; - private boolean sslEnabled = DEFAULT_SSL_ENABLED; - - private int maxSchemaAgreementWaitSeconds = DEFAULT_MAX_SCHEMA_AGREEMENT_WAIT_SECONDS; - private int port = DEFAULT_PORT; - - private final PersistenceExceptionTranslator exceptionTranslator = new CassandraExceptionTranslator(); - - private Cluster cluster; - private ClusterBuilderConfigurer clusterBuilderConfigurer; - - private AddressTranslator addressTranslator; - private AuthProvider authProvider; - private CompressionType compressionType; - private Host.StateListener hostStateListener; - private LatencyTracker latencyTracker; - - private List keyspaceCreations = new ArrayList<>(); - private List keyspaceDrops = new ArrayList<>(); - private Set> keyspaceSpecifications = new HashSet<>(); - - private List startupScripts = new ArrayList<>(); - private List shutdownScripts = new ArrayList<>(); - - private LoadBalancingPolicy loadBalancingPolicy; - private NettyOptions nettyOptions; - private PoolingOptions poolingOptions; - private ProtocolVersion protocolVersion; - private QueryOptions queryOptions; - private ReconnectionPolicy reconnectionPolicy; - private RetryPolicy retryPolicy; - private SpeculativeExecutionPolicy speculativeExecutionPolicy; - private SocketOptions socketOptions; - private SSLOptions sslOptions; - private TimestampGenerator timestampGenerator; - - private String beanName; - private String clusterName; - private String contactPoints = DEFAULT_CONTACT_POINTS; - private String password; - private String username; - - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ - @Override - public void afterPropertiesSet() throws Exception { - - Assert.hasText(contactPoints, "At least one server is required"); - - Cluster.Builder clusterBuilder = newClusterBuilder(); - - clusterBuilder.addContactPoints(StringUtils.commaDelimitedListToStringArray(contactPoints)).withPort(port); - clusterBuilder.withMaxSchemaAgreementWaitSeconds(maxSchemaAgreementWaitSeconds); - - Optional.ofNullable(compressionType).map(CassandraCqlClusterFactoryBean::convertCompressionType) - .ifPresent(clusterBuilder::withCompression); - - Optional.ofNullable(addressTranslator).ifPresent(clusterBuilder::withAddressTranslator); - Optional.ofNullable(loadBalancingPolicy).ifPresent(clusterBuilder::withLoadBalancingPolicy); - Optional.ofNullable(nettyOptions).ifPresent(clusterBuilder::withNettyOptions); - Optional.ofNullable(poolingOptions).ifPresent(clusterBuilder::withPoolingOptions); - Optional.ofNullable(protocolVersion).ifPresent(clusterBuilder::withProtocolVersion); - Optional.ofNullable(queryOptions).ifPresent(clusterBuilder::withQueryOptions); - Optional.ofNullable(reconnectionPolicy).ifPresent(clusterBuilder::withReconnectionPolicy); - Optional.ofNullable(retryPolicy).ifPresent(clusterBuilder::withRetryPolicy); - Optional.ofNullable(socketOptions).ifPresent(clusterBuilder::withSocketOptions); - Optional.ofNullable(speculativeExecutionPolicy).ifPresent(clusterBuilder::withSpeculativeExecutionPolicy); - Optional.ofNullable(timestampGenerator).ifPresent(clusterBuilder::withTimestampGenerator); - - if (authProvider != null) { - clusterBuilder.withAuthProvider(authProvider); - } - else if (username != null) { - clusterBuilder.withCredentials(username, password); - } - - if (!jmxReportingEnabled) { - clusterBuilder.withoutJMXReporting(); - } - - if (!metricsEnabled) { - clusterBuilder.withoutMetrics(); - } - - if (sslEnabled) { - if (sslOptions != null) { - clusterBuilder.withSSL(sslOptions); - } - else { - clusterBuilder.withSSL(); - } - } - - Optional.ofNullable(resolveClusterName()).filter(StringUtils::hasText) - .ifPresent(clusterBuilder::withClusterName); - - - if (clusterBuilderConfigurer != null) { - clusterBuilderConfigurer.configure(clusterBuilder); - } - - cluster = clusterBuilder.build(); - - Optional.ofNullable(hostStateListener).ifPresent(cluster::register); - Optional.ofNullable(latencyTracker).ifPresent(cluster::register); - - generateSpecificationsFromFactoryBeans(); - executeSpecsAndScripts(keyspaceCreations, startupScripts); - } - - /* - * (non-Javadoc) - * @see com.datastax.driver.core.Cluster#builder() - */ - Cluster.Builder newClusterBuilder() { - return Cluster.builder(); - } - - /* (non-Javadoc) */ - private String resolveClusterName() { - return (StringUtils.hasText(clusterName) ? clusterName : beanName); - } - - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.DisposableBean#destroy() - */ - @Override - public void destroy() throws Exception { - executeSpecsAndScripts(keyspaceDrops, shutdownScripts); - cluster.close(); - } - - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObject() - */ - @Override - public Cluster getObject() { - return cluster; - } - - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObjectType() - */ - @Override - public Class getObjectType() { - return (cluster != null ? cluster.getClass() : Cluster.class); - } - - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#isSingleton() - */ - @Override - public boolean isSingleton() { - return true; - } - - /* - * (non-Javadoc) - * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException) - */ - @Override - public DataAccessException translateExceptionIfPossible(RuntimeException ex) { - return exceptionTranslator.translateExceptionIfPossible(ex); - } - - /** - * Examines the contents of all the KeyspaceSpecificationFactoryBeans and generates the proper KeyspaceSpecification - * from them. - */ - private void generateSpecificationsFromFactoryBeans() { - - keyspaceSpecifications.forEach(keyspaceActionSpecification -> { - - if (keyspaceActionSpecification instanceof CreateKeyspaceSpecification) { - keyspaceCreations.add((CreateKeyspaceSpecification) keyspaceActionSpecification); - } - - if (keyspaceActionSpecification instanceof DropKeyspaceSpecification) { - keyspaceDrops.add((DropKeyspaceSpecification) keyspaceActionSpecification); - } - }); - } - - protected void executeSpecsAndScripts(List> kepspaceActionSpecifications, - List scripts) { - - if (!CollectionUtils.isEmpty(kepspaceActionSpecifications) || !CollectionUtils.isEmpty(scripts)) { - - Session session = cluster.connect(); - - try { - CqlTemplate template = new CqlTemplate(session); - - kepspaceActionSpecifications - .forEach(keyspaceActionSpecification -> template.execute(toCql(keyspaceActionSpecification))); - - scripts.forEach(template::execute); - } - finally { - if (session != null) { - session.close(); - } - } - } - } - - private String toCql(KeyspaceActionSpecification keyspaceActionSpecification) { - - return (keyspaceActionSpecification instanceof CreateKeyspaceSpecification - ? new CreateKeyspaceCqlGenerator((CreateKeyspaceSpecification) keyspaceActionSpecification).toCql() - : new DropKeyspaceCqlGenerator((DropKeyspaceSpecification) keyspaceActionSpecification).toCql()); - } - - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.BeanNameAware#setBeanName(String) - * @since 1.5 - */ - @Override - public void setBeanName(String beanName) { - this.beanName = beanName; - } - - /** - * Set a comma-delimited string of the contact points (hosts) to connect to. Default is {@code localhost}; see - * {@link #DEFAULT_CONTACT_POINTS}. - * - * @param contactPoints the contact points used by the new cluster. - */ - public void setContactPoints(String contactPoints) { - this.contactPoints = contactPoints; - } - - /** - * Set the port for the contact points. Default is {@code 9042}, see {@link #DEFAULT_PORT}. - * - * @param port the port used by the new cluster. - */ - public void setPort(int port) { - this.port = port; - } - - /** - * Set the {@link CompressionType}. Default is uncompressed. - * - * @param compressionType the {@link CompressionType} used by the new cluster. - */ - public void setCompressionType(CompressionType compressionType) { - this.compressionType = compressionType; - } - - /** - * Set the {@link PoolingOptions} to configure the connection pooling behavior. - * - * @param poolingOptions the {@link PoolingOptions} used by the new cluster. - */ - public void setPoolingOptions(PoolingOptions poolingOptions) { - this.poolingOptions = poolingOptions; - } - - /** - * Set the {@link ProtocolVersion}. - * - * @param protocolVersion the {@link ProtocolVersion} used by the new cluster. - * @since 1.4 - */ - public void setProtocolVersion(ProtocolVersion protocolVersion) { - this.protocolVersion = protocolVersion; - } - - /** - * Set the {@link SocketOptions} containing low-level socket options. - * - * @param socketOptions the {@link SocketOptions} used by the new cluster. - */ - public void setSocketOptions(SocketOptions socketOptions) { - this.socketOptions = socketOptions; - } - - /** - * Set the {@link QueryOptions} to tune to defaults for individual queries. - * - * @param queryOptions the {@link QueryOptions} used by the new cluster. - */ - public void setQueryOptions(QueryOptions queryOptions) { - this.queryOptions = queryOptions; - } - - /** - * Set the {@link AuthProvider}. Default is unauthenticated. - * - * @param authProvider the {@link AuthProvider} used by the new cluster. - */ - public void setAuthProvider(AuthProvider authProvider) { - this.authProvider = authProvider; - } - - /** - * Set the {@link NettyOptions} used by a client to customize the driver's underlying Netty layer. - * - * @param nettyOptions the {@link NettyOptions} used by the new cluster. - * @since 1.5 - */ - public void setNettyOptions(NettyOptions nettyOptions) { - this.nettyOptions = nettyOptions; - } - - /** - * Set the {@link LoadBalancingPolicy} that decides which Cassandra hosts to contact for each new query. - * - * @param loadBalancingPolicy the {@link LoadBalancingPolicy} used by the new cluster. - */ - public void setLoadBalancingPolicy(LoadBalancingPolicy loadBalancingPolicy) { - this.loadBalancingPolicy = loadBalancingPolicy; - } - - /** - * Set the {@link ReconnectionPolicy} that decides how often the reconnection to a dead node is attempted. - * - * @param reconnectionPolicy the {@link ReconnectionPolicy} used by the new cluster. - */ - public void setReconnectionPolicy(ReconnectionPolicy reconnectionPolicy) { - this.reconnectionPolicy = reconnectionPolicy; - } - - /** - * Set the {@link RetryPolicy} that defines a default behavior to adopt when a request fails. - * - * @param retryPolicy the {@link RetryPolicy} used by the new cluster. - */ - public void setRetryPolicy(RetryPolicy retryPolicy) { - this.retryPolicy = retryPolicy; - } - - /** - * Set whether metrics are enabled. Default is {@literal true}, see {@link #DEFAULT_METRICS_ENABLED}. - */ - public void setMetricsEnabled(boolean metricsEnabled) { - this.metricsEnabled = metricsEnabled; - } - - /** - * Set a {@link List} of {@link CreateKeyspaceSpecification create keyspace specifications} that are executed when - * this factory is {@link #afterPropertiesSet() initialized}. {@link CreateKeyspaceSpecification Create keyspace - * specifications} are executed on a system session with no keyspace set, before executing - * {@link #setStartupScripts(List)}. - * - * @param specifications the {@link List} of {@link CreateKeyspaceSpecification create keyspace specifications}. - */ - public void setKeyspaceCreations(List specifications) { - this.keyspaceCreations = specifications; - } - - /** - * @return {@link List} of {@link CreateKeyspaceSpecification create keyspace specifications}. - */ - public List getKeyspaceCreations() { - return keyspaceCreations; - } - - /** - * Set a {@link List} of {@link DropKeyspaceSpecification drop keyspace specifications} that are executed when this - * factory is {@link #destroy() destroyed}. {@link DropKeyspaceSpecification Drop keyspace specifications} are - * executed on a system session with no keyspace set, before executing {@link #setShutdownScripts(List)}. - * - * @param specifications the {@link List} of {@link DropKeyspaceSpecification drop keyspace specifications}. - */ - public void setKeyspaceDrops(List specifications) { - this.keyspaceDrops = specifications; - } - - /** - * @return the {@link List} of {@link DropKeyspaceSpecification drop keyspace specifications}. - */ - public List getKeyspaceDrops() { - return keyspaceDrops; - } - - /** - * Set a {@link List} of raw {@link String CQL statements} that are executed when this factory is - * {@link #afterPropertiesSet() initialized}. Scripts are executed on a system session with no keyspace set, after - * executing {@link #setKeyspaceCreations(List)}. - * - * @param scripts the scripts to execute on startup - */ - public void setStartupScripts(List scripts) { - this.startupScripts = scripts; - } - - /** - * @return the startup scripts - */ - public List getStartupScripts() { - return startupScripts; - } - - /** - * Set a {@link List} of raw {@link String CQL statements} that are executed when this factory is {@link #destroy() - * destroyed}. {@link DropKeyspaceSpecification Drop keyspace specifications} are executed on a system session with no - * keyspace set, after executing {@link #setKeyspaceDrops(List)}. - * - * @param scripts the scripts to execute on shutdown - */ - public void setShutdownScripts(List scripts) { - this.shutdownScripts = scripts; - } - - /** - * @return the shutdown scripts - */ - public List getShutdownScripts() { - return shutdownScripts; - } - - /** - * @param keyspaceSpecifications The {@link KeyspaceActionSpecification} to set. - */ - public void setKeyspaceSpecifications(Set> keyspaceSpecifications) { - this.keyspaceSpecifications = keyspaceSpecifications; - } - - /** - * @return the {@link KeyspaceActionSpecification} associated with this factory. - */ - public Set> getKeyspaceSpecifications() { - return keyspaceSpecifications; - } - - /** - * Set the username to use with {@link com.datastax.driver.core.PlainTextAuthProvider}. - * - * @param username The username to set. - */ - public void setUsername(String username) { - this.username = username; - } - - /** - * Set the username to use with {@link com.datastax.driver.core.PlainTextAuthProvider}. - * - * @param password The password to set. - */ - public void setPassword(String password) { - this.password = password; - } - - /** - * Set whether to use JMX reporting. Default is {@literal false}, see {@link #DEFAULT_JMX_REPORTING_ENABLED}. - * - * @param jmxReportingEnabled The jmxReportingEnabled to set. - */ - public void setJmxReportingEnabled(boolean jmxReportingEnabled) { - this.jmxReportingEnabled = jmxReportingEnabled; - } - - /** - * Set whether to use SSL. Default is plain, see {@link #DEFAULT_SSL_ENABLED}. - * - * @param sslEnabled The sslEnabled to set. - */ - public void setSslEnabled(boolean sslEnabled) { - this.sslEnabled = sslEnabled; - } - - /** - * @param sslOptions The sslOptions to set. - */ - public void setSslOptions(SSLOptions sslOptions) { - this.sslOptions = sslOptions; - } - - /** - * @param hostStateListener The hostStateListener to set. - */ - public void setHostStateListener(Host.StateListener hostStateListener) { - this.hostStateListener = hostStateListener; - } - - /** - * @param latencyTracker The latencyTracker to set. - */ - public void setLatencyTracker(LatencyTracker latencyTracker) { - this.latencyTracker = latencyTracker; - } - - /** - * Configures the address translator used by the new cluster to translate IP addresses received from Cassandra nodes - * into locally query-able addresses. - * - * @param addressTranslator {@link AddressTranslator} used by the new cluster. - * @see com.datastax.driver.core.Cluster.Builder#withAddressTranslator(AddressTranslator) - * @see com.datastax.driver.core.policies.AddressTranslator - * @since 1.5 - */ - public void setAddressTranslator(AddressTranslator addressTranslator) { - this.addressTranslator = addressTranslator; - } - - /** - * Sets the {@link ClusterBuilderConfigurer} used to apply additional configuration logic to the - * {@link com.datastax.driver.core.Cluster.Builder}. {@link ClusterBuilderConfigurer} is invoked after all provided - * options are configured. The factory will {@link Builder#build()} the {@link Cluster} after applying - * {@link ClusterBuilderConfigurer}. - * - * @param clusterBuilderConfigurer {@link ClusterBuilderConfigurer} used to configure the - * {@link com.datastax.driver.core.Cluster.Builder}. - * @see org.springframework.data.cql.config.ClusterBuilderConfigurer - */ - public void setClusterBuilderConfigurer(ClusterBuilderConfigurer clusterBuilderConfigurer) { - this.clusterBuilderConfigurer = clusterBuilderConfigurer; - } - - /** - * An optional name for the cluster instance. This name appears in JMX metrics. Defaults to the bean name. - * - * @param clusterName optional name for the cluster. - * @see com.datastax.driver.core.Cluster.Builder#withClusterName(String) - * @since 1.5 - */ - public void setClusterName(String clusterName) { - this.clusterName = clusterName; - } - - /** - * Sets the maximum time to wait for schema agreement before returning from a DDL query. The timeout is used to wait - * for all currently up hosts in the cluster to agree on the schema. - * - * @param seconds max schema agreement wait in seconds. - * @see com.datastax.driver.core.Cluster.Builder#withMaxSchemaAgreementWaitSeconds(int) - * @since 1.5 - */ - public void setMaxSchemaAgreementWaitSeconds(int seconds) { - this.maxSchemaAgreementWaitSeconds = seconds; - } - - /** - * Configures the speculative execution policy to use for the new cluster. - * - * @param speculativeExecutionPolicy {@link SpeculativeExecutionPolicy} to use with the new cluster. - * @see com.datastax.driver.core.Cluster.Builder#withSpeculativeExecutionPolicy(SpeculativeExecutionPolicy) - * @see com.datastax.driver.core.policies.SpeculativeExecutionPolicy - * @since 1.5 - */ - public void setSpeculativeExecutionPolicy(SpeculativeExecutionPolicy speculativeExecutionPolicy) { - this.speculativeExecutionPolicy = speculativeExecutionPolicy; - } - - /** - * Configures the generator that will produce the client-side timestamp sent with each query. - * - * @param timestampGenerator {@link TimestampGenerator} used to produce a client-side timestamp sent with each query. - * @see com.datastax.driver.core.Cluster.Builder#withTimestampGenerator(TimestampGenerator) - * @see com.datastax.driver.core.TimestampGenerator - * @since 1.5 - */ - public void setTimestampGenerator(TimestampGenerator timestampGenerator) { - this.timestampGenerator = timestampGenerator; - } - - private static Compression convertCompressionType(CompressionType type) { - - switch (type) { - case NONE: - return Compression.NONE; - case SNAPPY: - return Compression.SNAPPY; - case LZ4: - return Compression.LZ4; - } - - throw new IllegalArgumentException(String.format("Unknown compression type [%s]", type)); - } -} diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/package-info.java deleted file mode 100644 index fc77868df..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/java/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring Java configuration for Spring CQL. - */ -package org.springframework.data.cql.config.java; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/package-info.java deleted file mode 100644 index 3fc0d860a..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring CQL {@link org.springframework.beans.factory.FactoryBean factory beans} and configuration. - */ -package org.springframework.data.cql.config; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/package-info.java deleted file mode 100644 index 51cb7c69c..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring XML namespace configuration for Spring CQL. - */ -package org.springframework.data.cql.config.xml; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CassandraUncategorizedDataAccessException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CassandraUncategorizedDataAccessException.java deleted file mode 100644 index c33767b6f..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CassandraUncategorizedDataAccessException.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2013-2017 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 - * - * http://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.cql.core; - -import org.springframework.dao.UncategorizedDataAccessException; - -/** - * Wrapper for all non RuntimeExceptions throws by the Cassandra Driver - * - * @author David Webb - */ -public class CassandraUncategorizedDataAccessException extends UncategorizedDataAccessException { - - private static final long serialVersionUID = -155082875466458401L; - - /** - * Create the Exception - * - * @param message - * @param cause - */ - public CassandraUncategorizedDataAccessException(String message, Throwable cause) { - super(message, cause); - } - -} diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplateSupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplateSupport.java deleted file mode 100644 index 45ccb3aee..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplateSupport.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright 2017 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 - * - * http://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.cql.core; - -import java.util.Map; -import java.util.Optional; -import java.util.stream.StreamSupport; - -import org.springframework.data.cql.support.CassandraAccessor; - -import com.datastax.driver.core.ResultSet; - -/** - * Support class for CQL template implementation providing utility methods and overridable hook methods. - * - * @author Mark Paluch - * @since 2.0 - */ -public abstract class CqlTemplateSupport extends CassandraAccessor { - - /** - * Create a new arg-based PreparedStatementSetter using the args passed in. By default, we'll create an - * {@link ArgumentPreparedStatementBinder}. This method allows for the creation to be overridden by subclasses. - * - * @param args object array with arguments - * @return the new {@link PreparedStatementBinder} to use - */ - protected PreparedStatementBinder newPreparedStatementBinder(Object[] args) { - return new ArgumentPreparedStatementBinder(args); - } - - /** - * Constructs a new instance of the {@link ResultSetExtractor} initialized with and adapting the given - * {@link RowCallbackHandler}. - * - * @param rowCallbackHandler {@link RowCallbackHandler} to adapt as a {@link ResultSetExtractor}. - * @return a {@link ResultSetExtractor} implementation adapting an instance of the {@link RowCallbackHandler}. - * @see org.springframework.data.cql.core.AsyncCqlTemplate.RowCallbackHandlerResultSetExtractor - * @see org.springframework.data.cql.core.ResultSetExtractor - * @see org.springframework.data.cql.core.RowCallbackHandler - */ - protected RowCallbackHandlerResultSetExtractor newResultSetExtractor(RowCallbackHandler rowCallbackHandler) { - return new RowCallbackHandlerResultSetExtractor(rowCallbackHandler); - } - - /** - * Constructs a new instance of the {@link ResultSetExtractor} initialized with and adapting the given - * {@link RowMapper}. - * - * @param rowMapper {@link RowMapper} to adapt as a {@link ResultSetExtractor}. - * @return a {@link ResultSetExtractor} implementation adapting an instance of the {@link RowMapper}. - * @see org.springframework.data.cql.core.ResultSetExtractor - * @see org.springframework.data.cql.core.RowMapper - * @see org.springframework.data.cql.core.RowMapperResultSetExtractor - */ - protected RowMapperResultSetExtractor newResultSetExtractor(RowMapper rowMapper) { - return new RowMapperResultSetExtractor<>(rowMapper); - } - - /** - * Constructs a new instance of the {@link ResultSetExtractor} initialized with and adapting the given - * {@link RowMapper}. - * - * @param rowMapper {@link RowMapper} to adapt as a {@link ResultSetExtractor}. - * @param rowsExpected number of expected rows in the {@link ResultSet}. - * @return a {@link ResultSetExtractor} implementation adapting an instance of the {@link RowMapper}. - * @see org.springframework.data.cql.core.ResultSetExtractor - * @see org.springframework.data.cql.core.RowMapper - * @see org.springframework.data.cql.core.RowMapperResultSetExtractor - */ - protected RowMapperResultSetExtractor newResultSetExtractor(RowMapper rowMapper, int rowsExpected) { - return new RowMapperResultSetExtractor<>(rowMapper, rowsExpected); - } - - /** - * Create a new RowMapper for reading columns as key-value pairs. - * - * @return the RowMapper to use - * @see ColumnMapRowMapper - */ - protected RowMapper> newColumnMapRowMapper() { - return new ColumnMapRowMapper(); - } - - /** - * Create a new RowMapper for reading result objects from a single column. - * - * @param requiredType the type that each result object is expected to match - * @return the RowMapper to use - * @see SingleColumnRowMapper - */ - protected RowMapper newSingleColumnRowMapper(Class requiredType) { - return SingleColumnRowMapper.newInstance(requiredType); - } - - /** - * Determine CQL from potential provider object. - * - * @param cqlProvider object that's potentially a {@link CqlProvider} - * @return the CQL string, or {@code null} - * @see CqlProvider - */ - protected static String toCql(Object cqlProvider) { - return Optional.ofNullable(cqlProvider) // - .filter(o -> o instanceof CqlProvider) // - .map(o -> (CqlProvider) o) // - .map(CqlProvider::getCql) // - .orElse(null); - } - - /** - * Adapter to enable use of a {@link RowCallbackHandler} inside a {@link ResultSetExtractor}. - */ - protected static class RowCallbackHandlerResultSetExtractor implements ResultSetExtractor { - - private final RowCallbackHandler rowCallbackHandler; - - protected RowCallbackHandlerResultSetExtractor(RowCallbackHandler rowCallbackHandler) { - this.rowCallbackHandler = rowCallbackHandler; - } - - /* (non-Javadoc) - * - @see org.springframework.data.cql.core.ResultSetExtractor#extractData(com.datastax.driver.core.ResultSet) - */ - @Override - public Object extractData(ResultSet resultSet) { - - StreamSupport.stream(resultSet.spliterator(), false).forEach(rowCallbackHandler::processRow); - - return null; - } - } - -} diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/package-info.java deleted file mode 100644 index 4558d99a2..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * CQL specific converters. - */ -package org.springframework.data.cql.core.converter; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/package-info.java deleted file mode 100644 index 61e9a0c55..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * CQL generators for Keyspace object actions. - */ -package org.springframework.data.cql.core.generator; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/package-info.java deleted file mode 100644 index 0e0253f71..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * CQL core support. - */ -package org.springframework.data.cql.core; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/package-info.java deleted file mode 100644 index 9f85ef514..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Provides a strategy for looking up {@link org.springframework.data.cql.core.session.SessionFactory}. - * - * @author Mark Paluch - */ -package org.springframework.data.cql.core.session.lookup; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/package-info.java deleted file mode 100644 index 8f7bf978b..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring Data's CQL abstraction. - */ -package org.springframework.data.cql; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/package-info.java deleted file mode 100644 index 2375db5b3..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/exception/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring Data's Cassandra specific Data Access Exceptions. - */ -package org.springframework.data.cql.support.exception; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/package-info.java deleted file mode 100644 index 0c1c6f299..000000000 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * CQL support classes and Exception translation. - */ -package org.springframework.data.cql.support; diff --git a/spring-data-cassandra/src/main/resources/META-INF/spring.handlers b/spring-data-cassandra/src/main/resources/META-INF/spring.handlers index 696050158..a3228f979 100644 --- a/spring-data-cassandra/src/main/resources/META-INF/spring.handlers +++ b/spring-data-cassandra/src/main/resources/META-INF/spring.handlers @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/cql=org.springframework.data.cql.config.xml.CassandraNamespaceHandler -http\://www.springframework.org/schema/data/cassandra=org.springframework.data.cassandra.config.xml.CassandraNamespaceHandler +http\://www.springframework.org/schema/cql=org.springframework.data.cassandra.config.CqlNamespaceHandler +http\://www.springframework.org/schema/data/cassandra=org.springframework.data.cassandra.config.CassandraNamespaceHandler diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-2.0.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-2.0.xsd index 280a3f0e0..b78f1f630 100644 --- a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-2.0.xsd +++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-2.0.xsd @@ -194,7 +194,8 @@ to the com.datastax.driver.core.Cluster.Builder. - + @@ -866,7 +867,7 @@ The reference to a CassandraTemplate. Will default to 'cqlTemplate'. + type="org.springframework.data.cassandra.core.cql.CqlTemplate"/> diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.5.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.5.xsd index 43a697e50..eca25c283 100644 --- a/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.5.xsd +++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.5.xsd @@ -51,7 +51,7 @@ Defines a CassandraTemplate. + type="org.springframework.data.cassandra.core.cql.CqlTemplate"/> diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-2.0.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-2.0.xsd index 72ce39602..6040b4f06 100644 --- a/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-2.0.xsd +++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-2.0.xsd @@ -51,7 +51,7 @@ Defines a CassandraTemplate. + type="org.springframework.data.cassandra.core.cql.CqlTemplate"/> @@ -187,7 +187,8 @@ to the com.datastax.driver.core.Cluster.Builder. - + diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/AbstractClusterConfigurationUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/AbstractClusterConfigurationUnitTests.java similarity index 95% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/AbstractClusterConfigurationUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/AbstractClusterConfigurationUnitTests.java index 2a58adc50..76a512c77 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/AbstractClusterConfigurationUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/AbstractClusterConfigurationUnitTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.cql.config.java; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.isA; @@ -24,11 +24,8 @@ import java.util.Collections; import java.util.List; import org.junit.Test; -import org.springframework.data.cql.config.CassandraCqlClusterFactoryBean; -import org.springframework.data.cql.config.ClusterBuilderConfigurer; -import org.springframework.data.cql.config.CompressionType; -import org.springframework.data.cql.core.keyspace.CreateKeyspaceSpecification; -import org.springframework.data.cql.core.keyspace.DropKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.CreateKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropKeyspaceSpecification; import com.datastax.driver.core.AuthProvider; import com.datastax.driver.core.Cluster; @@ -61,7 +58,7 @@ public class AbstractClusterConfigurationUnitTests { @Test // DATACASS-226 public void shouldInitializeWithoutAnyOptions() throws Exception { - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.afterPropertiesSet(); AbstractClusterConfiguration clusterConfiguration = new AbstractClusterConfiguration() {}; @@ -392,7 +389,7 @@ public class AbstractClusterConfigurationUnitTests { } private Cluster getCluster(AbstractClusterConfiguration clusterConfiguration) throws Exception { - CassandraCqlClusterFactoryBean cluster = clusterConfiguration.cluster(); + CassandraClusterFactoryBean cluster = clusterConfiguration.cluster(); cluster.afterPropertiesSet(); return cluster.getObject(); } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/CassandraCqlClusterFactoryBeanUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBeanUnitTests.java similarity index 79% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/CassandraCqlClusterFactoryBeanUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBeanUnitTests.java index acf359d23..671e27749 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/CassandraCqlClusterFactoryBeanUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBeanUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; @@ -22,7 +22,7 @@ import static org.mockito.Mockito.*; import static org.mockito.Mockito.anyString; import org.junit.Test; -import org.springframework.data.cql.support.IntegrationTestNettyOptions; +import org.springframework.data.cassandra.support.IntegrationTestNettyOptions; import org.springframework.test.util.ReflectionTestUtils; import com.datastax.driver.core.*; @@ -36,17 +36,17 @@ import com.datastax.driver.core.policies.RoundRobinPolicy; import com.datastax.driver.core.policies.SpeculativeExecutionPolicy; /** - * Unit tests for {@link CassandraCqlClusterFactoryBean}. + * Unit tests for {@link CassandraClusterFactoryBean}. * * @author Mark Paluch * @author John Blum */ -public class CassandraCqlClusterFactoryBeanUnitTests { +public class CassandraClusterFactoryBeanUnitTests { @Test // DATACASS-226 public void shouldInitializeWithoutAnyOptions() throws Exception { - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.afterPropertiesSet(); assertThat(bean.getObject()).isNotNull(); @@ -58,7 +58,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { @Test // DATACASS-226 public void shouldShutdownClusterInstance() throws Exception { - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.afterPropertiesSet(); bean.destroy(); @@ -70,7 +70,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { CompressionType compressionType = CompressionType.LZ4; - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setCompressionType(compressionType); bean.afterPropertiesSet(); @@ -82,7 +82,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { CompressionType compressionType = CompressionType.SNAPPY; - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setCompressionType(compressionType); bean.afterPropertiesSet(); @@ -94,7 +94,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { PoolingOptions poolingOptions = new PoolingOptions(); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setPoolingOptions(poolingOptions); bean.afterPropertiesSet(); @@ -106,7 +106,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { SocketOptions socketOptions = new SocketOptions(); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setSocketOptions(socketOptions); bean.afterPropertiesSet(); @@ -118,7 +118,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { QueryOptions queryOptions = new QueryOptions(); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setQueryOptions(queryOptions); bean.afterPropertiesSet(); @@ -130,7 +130,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { QueryOptions queryOptions = new QueryOptions(); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.afterPropertiesSet(); assertThat(getConfiguration(bean).getQueryOptions()).isNotNull(); @@ -142,7 +142,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { AuthProvider authProvider = new PlainTextAuthProvider("x", "y"); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setAuthProvider(authProvider); bean.afterPropertiesSet(); @@ -154,7 +154,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { AuthProvider authProvider = new PlainTextAuthProvider("x", "y"); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setAuthProvider(authProvider); bean.afterPropertiesSet(); @@ -165,7 +165,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { @Test // DATACASS-226, DATACASS-263 public void shouldSetAuthentication() throws Exception { - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setUsername("user"); bean.setPassword("password"); bean.afterPropertiesSet(); @@ -181,7 +181,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { LoadBalancingPolicy loadBalancingPolicy = new RoundRobinPolicy(); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setLoadBalancingPolicy(loadBalancingPolicy); bean.afterPropertiesSet(); @@ -193,7 +193,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { ReconnectionPolicy reconnectionPolicy = new ExponentialReconnectionPolicy(1, 2); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setReconnectionPolicy(reconnectionPolicy); bean.afterPropertiesSet(); @@ -203,7 +203,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { @Test // DATACASS-226 public void shouldSetProtocolVersion() throws Exception { - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setProtocolVersion(ProtocolVersion.V2); bean.afterPropertiesSet(); @@ -216,7 +216,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { SSLOptions sslOptions = RemoteEndpointAwareJdkSSLOptions.builder().build(); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setSslEnabled(true); bean.setSslOptions(sslOptions); bean.afterPropertiesSet(); @@ -227,7 +227,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { @Test // DATACASS-226 public void shouldDisableMetrics() throws Exception { - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setMetricsEnabled(false); bean.afterPropertiesSet(); @@ -237,7 +237,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { @Test // DATACASS-226 public void shouldDisableJmxReporting() throws Exception { - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setJmxReportingEnabled(false); bean.afterPropertiesSet(); @@ -248,7 +248,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { public void shouldCallClusterBuilderConfigurer() throws Exception { ClusterBuilderConfigurer mockClusterBuilderConfigurer = mock(ClusterBuilderConfigurer.class); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setClusterBuilderConfigurer(mockClusterBuilderConfigurer); bean.afterPropertiesSet(); @@ -260,7 +260,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { public void shouldSetAddressTranslator() throws Exception { AddressTranslator mockAddressTranslator = mock(AddressTranslator.class); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setAddressTranslator(mockAddressTranslator); bean.afterPropertiesSet(); @@ -277,7 +277,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { when(mockClusterBuilder.addContactPoints(anyString())).thenReturn(mockClusterBuilder); when(mockClusterBuilder.build()).thenReturn(mockCluster); - CassandraCqlClusterFactoryBean bean = spy(new CassandraCqlClusterFactoryBean()); + CassandraClusterFactoryBean bean = spy(new CassandraClusterFactoryBean()); when(bean.newClusterBuilder()).thenReturn(mockClusterBuilder); @@ -298,7 +298,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { when(mockClusterBuilder.addContactPoints(anyString())).thenReturn(mockClusterBuilder); when(mockClusterBuilder.build()).thenReturn(mockCluster); - CassandraCqlClusterFactoryBean bean = spy(new CassandraCqlClusterFactoryBean()); + CassandraClusterFactoryBean bean = spy(new CassandraClusterFactoryBean()); when(bean.newClusterBuilder()).thenReturn(mockClusterBuilder); @@ -313,7 +313,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { @Test // DATACASS-319 public void shouldSetMaxSchemaAgreementWaitSeconds() throws Exception { - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setMaxSchemaAgreementWaitSeconds(20); bean.afterPropertiesSet(); @@ -325,7 +325,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { public void shouldSetSpeculativeExecutionPolicy() throws Exception { SpeculativeExecutionPolicy mockSpeculativeExecutionPolicy = mock(SpeculativeExecutionPolicy.class); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setSpeculativeExecutionPolicy(mockSpeculativeExecutionPolicy); bean.afterPropertiesSet(); @@ -337,7 +337,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { public void shouldSetTimestampGenerator() throws Exception { TimestampGenerator mockTimestampGenerator = mock(TimestampGenerator.class); - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setTimestampGenerator(mockTimestampGenerator); bean.afterPropertiesSet(); @@ -348,7 +348,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests { @Test public void configuredProtocolVersionShouldBeSet() throws Exception { - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.setNettyOptions(IntegrationTestNettyOptions.INSTANCE); bean.setProtocolVersion(ProtocolVersion.V2); @@ -360,30 +360,30 @@ public class CassandraCqlClusterFactoryBeanUnitTests { @Test public void defaultProtocolVersionShouldBeSet() throws Exception { - CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean(); + CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean(); bean.afterPropertiesSet(); assertThat(getProtocolVersionEnum(bean)).isNull(); } - private ProtocolVersion getProtocolVersionEnum(CassandraCqlClusterFactoryBean cassandraCqlClusterFactoryBean) + private ProtocolVersion getProtocolVersionEnum(CassandraClusterFactoryBean cassandraClusterFactoryBean) throws Exception { // initialize connection factory return (ProtocolVersion) ReflectionTestUtils.getField( - cassandraCqlClusterFactoryBean.getObject().getConfiguration().getProtocolOptions(), "initialProtocolVersion"); + cassandraClusterFactoryBean.getObject().getConfiguration().getProtocolOptions(), "initialProtocolVersion"); } - private Policies getPolicies(CassandraCqlClusterFactoryBean bean) throws Exception { + private Policies getPolicies(CassandraClusterFactoryBean bean) throws Exception { return getConfiguration(bean).getPolicies(); } - private ProtocolOptions getProtocolOptions(CassandraCqlClusterFactoryBean bean) throws Exception { + private ProtocolOptions getProtocolOptions(CassandraClusterFactoryBean bean) throws Exception { return getConfiguration(bean).getProtocolOptions(); } - private Configuration getConfiguration(CassandraCqlClusterFactoryBean bean) throws Exception { + private Configuration getConfiguration(CassandraClusterFactoryBean bean) throws Exception { return bean.getObject().getConfiguration(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/CassandraCqlClusterParserUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraCqlClusterParserUnitTests.java similarity index 96% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/CassandraCqlClusterParserUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraCqlClusterParserUnitTests.java index 4515306dc..547bb43bc 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/CassandraCqlClusterParserUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraCqlClusterParserUnitTests.java @@ -1,24 +1,24 @@ /* - * Copyright 2013-2017 the original author or authors + * Copyright 2013-2017 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 + * 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 * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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. + * 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.cql.config.xml; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; -import static org.springframework.data.cql.support.BeanDefinitionTestUtils.*; +import static org.springframework.data.cassandra.support.BeanDefinitionTestUtils.*; import java.util.List; @@ -33,9 +33,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.beans.factory.xml.XmlReaderContext; -import org.springframework.data.cql.config.CassandraCqlClusterFactoryBean; -import org.springframework.data.cql.config.PoolingOptionsFactoryBean; -import org.springframework.data.cql.config.SocketOptionsFactoryBean; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -109,7 +106,7 @@ public class CassandraCqlClusterParserUnitTests { mockParserContext(mockContainingBeanDefinition)); assertThat(beanDefinition).isNotNull(); - assertThat(beanDefinition.getBeanClassName()).isEqualTo(CassandraCqlClusterFactoryBean.class.getName()); + assertThat(beanDefinition.getBeanClassName()).isEqualTo(CassandraClusterFactoryBean.class.getName()); assertThat(beanDefinition.getDestroyMethodName()).isEqualTo("destroy"); assertThat((Element) beanDefinition.getSource()).isEqualTo(mockElement); assertThat(beanDefinition.isLazyInit()).isFalse(); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/CassandraCqlSessionFactoryBeanUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraCqlSessionFactoryBeanUnitTests.java similarity index 92% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/CassandraCqlSessionFactoryBeanUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraCqlSessionFactoryBeanUnitTests.java index edaa7fa0e..dc8ebdaba 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/CassandraCqlSessionFactoryBeanUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraCqlSessionFactoryBeanUnitTests.java @@ -1,20 +1,20 @@ /* - * Copyright 2013-2017 the original author or authors + * Copyright 2013-2017 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 + * 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 * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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. + * 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.cql.config; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyString; @@ -35,7 +35,7 @@ import org.junit.runner.RunWith; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.data.cql.core.CqlOperations; +import org.springframework.data.cassandra.core.cql.CqlOperations; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; @@ -45,7 +45,7 @@ import com.datastax.driver.core.Session; * functionality of the {@link CassandraCqlSessionFactoryBean} class. * * @author John Blum - * @see org.springframework.data.cql.config.CassandraCqlSessionFactoryBean + * @see CassandraCqlSessionFactoryBean */ @RunWith(MockitoJUnitRunner.class) public class CassandraCqlSessionFactoryBeanUnitTests { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraNamespaceIntegrationTests.java similarity index 96% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraNamespaceIntegrationTests.java index 53cc723a1..8f80a3fe7 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraNamespaceIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.config.xml; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; @@ -22,10 +22,10 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.cassandra.core.CassandraTemplate; +import org.springframework.data.cassandra.core.cql.CqlTemplate; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver; import org.springframework.data.cassandra.repository.support.AbstractSpringDataEmbeddedCassandraIntegrationTest; -import org.springframework.data.cql.core.CqlTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.util.ReflectionTestUtils; @@ -39,7 +39,7 @@ import com.datastax.driver.core.SocketOptions; /** * Integration tests for XML-based Cassandra configuration using the Cassandra namespace parsed with - * {@link CassandraNamespaceHandler}. + * {@link CqlNamespaceHandler}. * * @author Mark Paluch */ diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBeanUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBeanUnitTests.java index d654c042d..944311f77 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBeanUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBeanUnitTests.java @@ -30,7 +30,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.cassandra.core.convert.CassandraConverter; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/ConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/ConfigIntegrationTests.java similarity index 88% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/ConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/ConfigIntegrationTests.java index a63d72311..237114b00 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/ConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/ConfigIntegrationTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.java; +package org.springframework.data.cassandra.config; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.support.AbstractTestJavaConfig; +import org.springframework.data.cassandra.support.AbstractTestJavaConfig; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/CqlTemplateConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CqlTemplateConfigIntegrationTests.java similarity index 87% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/CqlTemplateConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CqlTemplateConfigIntegrationTests.java index 64a6fa004..8b639cce2 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/CqlTemplateConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CqlTemplateConfigIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.java; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; @@ -23,9 +23,9 @@ import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; -import org.springframework.data.cql.AbstractEmbeddedCassandraIntegrationTest; -import org.springframework.data.cql.core.CqlTemplate; -import org.springframework.data.cql.support.IntegrationTestNettyOptions; +import org.springframework.data.cassandra.core.cql.CqlTemplate; +import org.springframework.data.cassandra.support.IntegrationTestNettyOptions; +import org.springframework.data.cassandra.test.util.AbstractEmbeddedCassandraIntegrationTest; import com.datastax.driver.core.NettyOptions; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java similarity index 87% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java index b5f54bad3..cc447f0f4 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.xml; +package org.springframework.data.cassandra.config; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.cql.AbstractEmbeddedCassandraIntegrationTest; -import org.springframework.data.cql.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.test.util.AbstractEmbeddedCassandraIntegrationTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/KeyspaceCreatingJavaConfigIntegrationTests.java similarity index 81% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/KeyspaceCreatingJavaConfigIntegrationTests.java index d0466fb7f..0902cb933 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/KeyspaceCreatingJavaConfigIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.java; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; @@ -24,12 +24,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.keyspace.CreateKeyspaceSpecification; -import org.springframework.data.cql.core.keyspace.KeyspaceAttributes; -import org.springframework.data.cql.core.keyspace.KeyspaceOption; -import org.springframework.data.cql.support.AbstractTestJavaConfig; -import org.springframework.data.cql.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.core.cql.keyspace.CreateKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceAttributes; +import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceOption; +import org.springframework.data.cassandra.support.AbstractTestJavaConfig; +import org.springframework.data.cassandra.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java similarity index 85% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java index e11e1c7b9..1bb228eb9 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.xml; +package org.springframework.data.cassandra.config; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.cql.AbstractEmbeddedCassandraIntegrationTest; -import org.springframework.data.cql.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.test.util.AbstractEmbeddedCassandraIntegrationTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/MinimalXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/MinimalXmlConfigIntegrationTests.java similarity index 84% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/MinimalXmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/MinimalXmlConfigIntegrationTests.java index 312b2cc55..2b64a0137 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/MinimalXmlConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/MinimalXmlConfigIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.xml; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; @@ -23,10 +23,10 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.cql.AbstractEmbeddedCassandraIntegrationTest; -import org.springframework.data.cql.KeyspaceRule; -import org.springframework.data.cql.core.CqlOperations; -import org.springframework.data.cql.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.core.cql.CqlOperations; +import org.springframework.data.cassandra.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.test.util.AbstractEmbeddedCassandraIntegrationTest; +import org.springframework.data.cassandra.test.util.KeyspaceRule; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/ParsingUtilsUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/ParsingUtilsUnitTests.java similarity index 86% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/ParsingUtilsUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/ParsingUtilsUnitTests.java index ee7971ebe..1e2970082 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/ParsingUtilsUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/ParsingUtilsUnitTests.java @@ -1,23 +1,23 @@ /* - * Copyright 2013-2017 the original author or authors + * Copyright 2013-2017 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 + * 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 * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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. + * 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.cql.config.xml; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.cql.support.BeanDefinitionTestUtils.*; +import static org.springframework.data.cassandra.support.BeanDefinitionTestUtils.*; import org.junit.Rule; import org.junit.Test; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/PoolingOptionsFactoryBeanUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/PoolingOptionsFactoryBeanUnitTests.java similarity index 99% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/PoolingOptionsFactoryBeanUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/PoolingOptionsFactoryBeanUnitTests.java index 614019efa..cb6eaf5fb 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/PoolingOptionsFactoryBeanUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/PoolingOptionsFactoryBeanUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java similarity index 92% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java index ee264c11b..090717c1a 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.xml; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.cql.AbstractEmbeddedCassandraIntegrationTest; -import org.springframework.data.cql.core.CqlOperations; -import org.springframework.data.cql.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.core.cql.CqlOperations; +import org.springframework.data.cassandra.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.test.util.AbstractEmbeddedCassandraIntegrationTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/SchemaActionIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/SchemaActionIntegrationTests.java index 7521ecec5..93bdd2e75 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/SchemaActionIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/SchemaActionIntegrationTests.java @@ -30,12 +30,10 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.cassandra.config.java.AbstractCassandraConfiguration; +import org.springframework.data.cassandra.core.cql.SessionCallback; import org.springframework.data.cassandra.domain.Person; -import org.springframework.data.cql.AbstractEmbeddedCassandraIntegrationTest; -import org.springframework.data.cql.KeyspaceRule; -import org.springframework.data.cql.config.CassandraCqlClusterFactoryBean; -import org.springframework.data.cql.core.SessionCallback; +import org.springframework.data.cassandra.test.util.AbstractEmbeddedCassandraIntegrationTest; +import org.springframework.data.cassandra.test.util.KeyspaceRule; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.KeyspaceMetadata; @@ -218,8 +216,8 @@ public class SchemaActionIntegrationTests extends AbstractEmbeddedCassandraInteg @Bean @Override - public CassandraCqlClusterFactoryBean cluster() { - return new CassandraCqlClusterFactoryBean() { + public CassandraClusterFactoryBean cluster() { + return new CassandraClusterFactoryBean() { @Override public void afterPropertiesSet() throws Exception { // avoid Cassandra Cluster creation; use embedded diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/TestHostStateListener.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/TestHostStateListener.java similarity index 97% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/TestHostStateListener.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/TestHostStateListener.java index f955e2fb3..f8c039c67 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/TestHostStateListener.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/TestHostStateListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.xml; +package org.springframework.data.cassandra.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/TestLatencyTracker.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/TestLatencyTracker.java similarity index 97% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/TestLatencyTracker.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/TestLatencyTracker.java index cc8c7c1e8..164d42ffe 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/TestLatencyTracker.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/TestLatencyTracker.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.xml; +package org.springframework.data.cassandra.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/XmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/XmlConfigIntegrationTests.java similarity index 95% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/XmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/XmlConfigIntegrationTests.java index cdba909cf..057ec9f38 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/config/xml/XmlConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/XmlConfigIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.config.xml; +package org.springframework.data.cassandra.config; import static org.assertj.core.api.Assertions.*; @@ -26,10 +26,9 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.cql.AbstractEmbeddedCassandraIntegrationTest; -import org.springframework.data.cql.KeyspaceRule; -import org.springframework.data.cql.config.ClusterBuilderConfigurer; -import org.springframework.data.cql.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.support.KeyspaceTestUtils; +import org.springframework.data.cassandra.test.util.AbstractEmbeddedCassandraIntegrationTest; +import org.springframework.data.cassandra.test.util.KeyspaceRule; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.HostDistance; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateIntegrationTests.java index 036ddcba2..8f4616f02 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateIntegrationTests.java @@ -22,6 +22,7 @@ import java.util.concurrent.Future; import org.junit.Before; import org.junit.Test; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.cql.AsyncCqlTemplate; import org.springframework.data.cassandra.core.query.Columns; import org.springframework.data.cassandra.core.query.Criteria; import org.springframework.data.cassandra.core.query.Query; @@ -29,8 +30,7 @@ import org.springframework.data.cassandra.core.query.Update; import org.springframework.data.cassandra.domain.User; import org.springframework.data.cassandra.domain.UserToken; import org.springframework.data.cassandra.repository.support.SchemaTestUtils; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.AsyncCqlTemplate; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.data.domain.Sort; import org.springframework.util.concurrent.ListenableFuture; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateUnitTests.java index b5c204d4b..42dc8c58c 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateUnitTests.java @@ -36,8 +36,8 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.data.cassandra.CassandraConnectionFailureException; import org.springframework.data.cassandra.domain.User; -import org.springframework.data.cql.support.exception.CassandraConnectionFailureException; import org.springframework.util.concurrent.ListenableFuture; import com.datastax.driver.core.ColumnDefinitions; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraAdminTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraAdminTemplateIntegrationTests.java index c085e77f3..3bb488e3a 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraAdminTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraAdminTemplateIntegrationTests.java @@ -22,11 +22,11 @@ import java.util.Collection; import org.junit.Before; import org.junit.Test; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.generator.DropTableCqlGenerator; +import org.springframework.data.cassandra.core.cql.keyspace.DropTableSpecification; import org.springframework.data.cassandra.domain.User; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.generator.DropTableCqlGenerator; -import org.springframework.data.cql.core.keyspace.DropTableSpecification; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import com.datastax.driver.core.KeyspaceMetadata; import com.datastax.driver.core.Metadata; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraBatchTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraBatchTemplateIntegrationTests.java index d4e099b8f..a3707e4b7 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraBatchTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraBatchTemplateIntegrationTests.java @@ -24,12 +24,12 @@ import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; +import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.data.cassandra.domain.FlatGroup; import org.springframework.data.cassandra.domain.Group; import org.springframework.data.cassandra.domain.GroupKey; import org.springframework.data.cassandra.repository.support.SchemaTestUtils; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.WriteOptions; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreatorUnitTests.java index c601d8924..f118bf940 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreatorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreatorUnitTests.java @@ -28,9 +28,9 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.data.cassandra.core.cql.CqlOperations; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.UserDefinedType; -import org.springframework.data.cql.core.CqlOperations; /** * Unit tests for {@link CassandraPersistentEntitySchemaCreator}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropperUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropperUnitTests.java index 8fb6581fa..b4e681541 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropperUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropperUnitTests.java @@ -29,10 +29,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.annotation.Id; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.Table; import org.springframework.data.cassandra.core.mapping.UserDefinedType; -import org.springframework.data.cql.core.CqlIdentifier; import com.datastax.driver.core.KeyspaceMetadata; import com.datastax.driver.core.TableMetadata; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateIntegrationTests.java index 7138568cd..5bf10badc 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateIntegrationTests.java @@ -27,6 +27,8 @@ import java.util.stream.Stream; import org.junit.Before; import org.junit.Test; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.cql.CqlTemplate; +import org.springframework.data.cassandra.core.mapping.BasicMapId; import org.springframework.data.cassandra.core.query.Columns; import org.springframework.data.cassandra.core.query.Criteria; import org.springframework.data.cassandra.core.query.Query; @@ -34,11 +36,9 @@ import org.springframework.data.cassandra.core.query.Update; import org.springframework.data.cassandra.domain.BookReference; import org.springframework.data.cassandra.domain.User; import org.springframework.data.cassandra.domain.UserToken; -import org.springframework.data.cassandra.repository.support.BasicMapId; import org.springframework.data.cassandra.repository.support.SchemaTestUtils; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.CqlTemplate; -import org.springframework.data.cql.support.CassandraVersion; +import org.springframework.data.cassandra.support.CassandraVersion; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.data.domain.Sort; import org.springframework.data.util.Version; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/template/CassandraTemplateMapIdIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateMapIdIntegrationTest.java similarity index 86% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/template/CassandraTemplateMapIdIntegrationTest.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateMapIdIntegrationTest.java index 5005d9734..beae5e7b4 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/template/CassandraTemplateMapIdIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateMapIdIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2017 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. @@ -13,22 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.mapping.mapid.template; +package org.springframework.data.cassandra.core; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.cassandra.repository.support.BasicMapId.*; +import static org.springframework.data.cassandra.core.mapping.BasicMapId.*; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cassandra.core.CassandraOperations; -import org.springframework.data.cassandra.core.CassandraTemplate; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.Column; +import org.springframework.data.cassandra.core.mapping.MapId; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -import org.springframework.data.cassandra.repository.MapId; import org.springframework.data.cassandra.repository.support.SchemaTestUtils; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; /** * Integration tests for {@link org.springframework.data.cassandra.core.CassandraTemplate} with {@link MapId}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/proxy/CassandraTemplateMapIdProxyDelegateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateMapIdProxyDelegateIntegrationTests.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/proxy/CassandraTemplateMapIdProxyDelegateIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateMapIdProxyDelegateIntegrationTests.java index ac32fb4b3..6d41d851f 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/proxy/CassandraTemplateMapIdProxyDelegateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateMapIdProxyDelegateIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2017 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. @@ -13,22 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.mapping.mapid.proxy; +package org.springframework.data.cassandra.core; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.cassandra.repository.support.MapIdFactory.*; +import static org.springframework.data.cassandra.core.mapping.MapIdFactory.*; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cassandra.core.CassandraOperations; -import org.springframework.data.cassandra.core.CassandraTemplate; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.Column; +import org.springframework.data.cassandra.core.mapping.MapId; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -import org.springframework.data.cassandra.repository.MapId; import org.springframework.data.cassandra.repository.support.SchemaTestUtils; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; /** * Integration tests for {@link org.springframework.data.cassandra.core.CassandraTemplate} using {@link MapId}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateUnitTests.java index ed0d8686a..c05c12d01 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateUnitTests.java @@ -33,8 +33,8 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.data.cassandra.CassandraConnectionFailureException; import org.springframework.data.cassandra.domain.User; -import org.springframework.data.cql.support.exception.CassandraConnectionFailureException; import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplateIntegrationTests.java index 8aeeb8da2..f782a90b5 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplateIntegrationTests.java @@ -25,6 +25,8 @@ import reactor.test.StepVerifier.FirstStep; import org.junit.Before; import org.junit.Test; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.cql.ReactiveCqlTemplate; +import org.springframework.data.cassandra.core.cql.session.DefaultBridgedReactiveSession; import org.springframework.data.cassandra.core.query.Columns; import org.springframework.data.cassandra.core.query.Criteria; import org.springframework.data.cassandra.core.query.Query; @@ -32,9 +34,7 @@ import org.springframework.data.cassandra.core.query.Update; import org.springframework.data.cassandra.domain.User; import org.springframework.data.cassandra.domain.UserToken; import org.springframework.data.cassandra.repository.support.SchemaTestUtils; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.ReactiveCqlTemplate; -import org.springframework.data.cql.core.session.DefaultBridgedReactiveSession; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.data.domain.Sort; import com.datastax.driver.core.utils.UUIDs; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplateUnitTests.java index 13de91a02..e18ca1841 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplateUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplateUnitTests.java @@ -34,9 +34,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.data.cassandra.ReactiveResultSet; +import org.springframework.data.cassandra.ReactiveSession; import org.springframework.data.cassandra.domain.User; -import org.springframework.data.cql.core.session.ReactiveResultSet; -import org.springframework.data.cql.core.session.ReactiveSession; import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CassandraTypeMappingIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CassandraTypeMappingIntegrationTest.java index 6edf4e0ab..ce3e25904 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CassandraTypeMappingIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CassandraTypeMappingIntegrationTest.java @@ -41,8 +41,8 @@ import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.domain.AllPossibleTypes; import org.springframework.data.cassandra.repository.support.SchemaTestUtils; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.support.CassandraVersion; +import org.springframework.data.cassandra.support.CassandraVersion; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.data.util.Version; import com.datastax.driver.core.Duration; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/ColumnReaderUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/ColumnReaderUnitTests.java index 10a2becaa..f39138132 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/ColumnReaderUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/ColumnReaderUnitTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.Row; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CustomConversionIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CustomConversionIntegrationTests.java index 682245a51..13156887f 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CustomConversionIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CustomConversionIntegrationTests.java @@ -36,8 +36,8 @@ import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.Table; import org.springframework.data.cassandra.repository.support.SchemaTestUtils; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.data.convert.CustomConversions; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.util.StringUtils; import com.datastax.driver.core.Row; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverterUDTIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverterUDTIntegrationTests.java index f4a0854d1..b43060dfa 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverterUDTIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverterUDTIntegrationTests.java @@ -35,6 +35,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; import org.springframework.data.annotation.Id; import org.springframework.data.cassandra.config.SchemaAction; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver; import org.springframework.data.cassandra.core.mapping.Table; @@ -44,7 +45,6 @@ import org.springframework.data.cassandra.domain.AllPossibleTypes; import org.springframework.data.cassandra.repository.support.AbstractSpringDataEmbeddedCassandraIntegrationTest; import org.springframework.data.cassandra.repository.support.IntegrationTestConfig; import org.springframework.data.convert.CustomConversions; -import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverterUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverterUnitTests.java index 867bd6a75..0b85eaf5d 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverterUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverterUnitTests.java @@ -17,8 +17,8 @@ package org.springframework.data.cassandra.core.convert; import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; -import static org.springframework.data.cassandra.RowMockUtil.*; -import static org.springframework.data.cassandra.repository.support.BasicMapId.*; +import static org.springframework.data.cassandra.core.mapping.BasicMapId.*; +import static org.springframework.data.cassandra.test.util.RowMockUtil.*; import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; @@ -49,7 +49,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.core.SpringVersion; import org.springframework.core.convert.ConverterNotFoundException; -import org.springframework.data.cassandra.RowMockUtil; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraType; import org.springframework.data.cassandra.core.mapping.PrimaryKey; @@ -62,7 +62,7 @@ import org.springframework.data.cassandra.domain.TypeWithKeyClass; import org.springframework.data.cassandra.domain.TypeWithMapId; import org.springframework.data.cassandra.domain.User; import org.springframework.data.cassandra.domain.UserToken; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.test.util.RowMockUtil; import org.springframework.data.util.Version; import org.springframework.test.util.ReflectionTestUtils; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/QueryMapperUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/QueryMapperUnitTests.java index 9221161d3..205c09f96 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/QueryMapperUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/QueryMapperUnitTests.java @@ -33,6 +33,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.annotation.Id; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.Column; @@ -48,7 +49,6 @@ import org.springframework.data.cassandra.core.query.Filter; import org.springframework.data.cassandra.core.query.Query; import org.springframework.data.cassandra.domain.TypeWithKeyClass; import org.springframework.data.cassandra.support.UserTypeBuilder; -import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Direction; import org.springframework.data.domain.Sort.Order; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/AsyncCqlTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateIntegrationTests.java similarity index 97% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/AsyncCqlTemplateIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateIntegrationTests.java index 0ba061dd6..886b67c95 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/AsyncCqlTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import com.datastax.driver.core.querybuilder.QueryBuilder; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/AsyncCqlTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateUnitTests.java similarity index 99% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/AsyncCqlTemplateUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateUnitTests.java index b69f63afb..6dd1a58cc 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/AsyncCqlTemplateUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; @@ -38,8 +38,8 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; -import org.springframework.data.cql.support.exception.CassandraConnectionFailureException; -import org.springframework.data.cql.support.exception.CassandraInvalidQueryException; +import org.springframework.data.cassandra.CassandraConnectionFailureException; +import org.springframework.data.cassandra.CassandraInvalidQueryException; import org.springframework.scheduling.annotation.AsyncResult; import org.springframework.util.concurrent.ListenableFuture; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CachedPreparedStatementCreatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreatorUnitTests.java similarity index 98% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CachedPreparedStatementCreatorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreatorUnitTests.java index 3be38f4f3..b0669433e 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CachedPreparedStatementCreatorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreatorUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static edu.umd.cs.mtc.TestFramework.*; import static org.assertj.core.api.Assertions.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraAccessorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CassandraAccessorUnitTests.java similarity index 82% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraAccessorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CassandraAccessorUnitTests.java index f13326a8d..fe1db4b74 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraAccessorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CassandraAccessorUnitTests.java @@ -1,19 +1,19 @@ /* * Copyright 2016-2017 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 + * 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 * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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. + * 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.cql.support; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraExceptionTranslatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslatorUnitTests.java similarity index 98% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraExceptionTranslatorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslatorUnitTests.java index bdc3b021a..42da1d783 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraExceptionTranslatorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslatorUnitTests.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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, @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; @@ -26,8 +26,8 @@ import org.junit.Test; import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.TransientDataAccessResourceException; -import org.springframework.data.cql.support.exception.*; -import org.springframework.data.cql.support.exception.CassandraSchemaElementExistsException.ElementType; +import org.springframework.data.cassandra.*; +import org.springframework.data.cassandra.CassandraSchemaElementExistsException.ElementType; import org.springframework.util.ClassUtils; import com.datastax.driver.core.ConsistencyLevel; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CqlIdentifierUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlIdentifierUnitTests.java similarity index 94% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CqlIdentifierUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlIdentifierUnitTests.java index c8e61914a..1b045e7ca 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CqlIdentifierUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlIdentifierUnitTests.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; import org.junit.Test; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CqlTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateIntegrationTests.java similarity index 97% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CqlTemplateIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateIntegrationTests.java index e14fc9d7f..b2c1dc896 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CqlTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import com.datastax.driver.core.querybuilder.QueryBuilder; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CqlTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateUnitTests.java similarity index 99% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CqlTemplateUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateUnitTests.java index fd75a7f7c..b83558ff0 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/CqlTemplateUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; @@ -34,8 +34,8 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; -import org.springframework.data.cql.support.exception.CassandraConnectionFailureException; -import org.springframework.data.cql.support.exception.CassandraInvalidQueryException; +import org.springframework.data.cassandra.CassandraConnectionFailureException; +import org.springframework.data.cassandra.CassandraInvalidQueryException; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.ColumnDefinitions; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/DefaultBridgedReactiveSessionIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/DefaultBridgedReactiveSessionIntegrationTests.java similarity index 91% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/DefaultBridgedReactiveSessionIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/DefaultBridgedReactiveSessionIntegrationTests.java index 7209723a8..0b82765cf 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/DefaultBridgedReactiveSessionIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/DefaultBridgedReactiveSessionIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; @@ -23,9 +23,9 @@ import reactor.test.StepVerifier; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.session.DefaultBridgedReactiveSession; -import org.springframework.data.cql.core.session.ReactiveResultSet; +import org.springframework.data.cassandra.ReactiveResultSet; +import org.springframework.data.cassandra.core.cql.session.DefaultBridgedReactiveSession; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import com.datastax.driver.core.KeyspaceMetadata; import com.datastax.driver.core.exceptions.SyntaxError; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/DefaultBridgedReactiveSessionUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/DefaultBridgedReactiveSessionUnitTests.java similarity index 96% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/DefaultBridgedReactiveSessionUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/DefaultBridgedReactiveSessionUnitTests.java index 2973ae8cd..05421ec6c 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/DefaultBridgedReactiveSessionUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/DefaultBridgedReactiveSessionUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -28,7 +28,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.data.cql.core.session.DefaultBridgedReactiveSession; +import org.springframework.data.cassandra.core.cql.session.DefaultBridgedReactiveSession; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.PreparedStatement; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/QueryOptionsUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/QueryOptionsUnitTests.java similarity index 97% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/QueryOptionsUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/QueryOptionsUnitTests.java index 14ab004ae..9f9730c00 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/QueryOptionsUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/QueryOptionsUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/QueryOptionsUtilUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/QueryOptionsUtilUnitTests.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/QueryOptionsUtilUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/QueryOptionsUtilUnitTests.java index 98bc9163b..145ab4ac7 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/QueryOptionsUtilUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/QueryOptionsUtilUnitTests.java @@ -1,19 +1,19 @@ /* * Copyright 2016-2017 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 + * 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 * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://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. + * 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.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.mockito.Mockito.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/ReactiveCqlTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateIntegrationTests.java similarity index 91% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/ReactiveCqlTemplateIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateIntegrationTests.java index 78e79a20f..787d9f1a6 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/ReactiveCqlTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; @@ -24,10 +24,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.session.DefaultBridgedReactiveSession; -import org.springframework.data.cql.core.session.DefaultReactiveSessionFactory; -import org.springframework.data.cql.core.session.ReactiveSession; +import org.springframework.data.cassandra.ReactiveSession; +import org.springframework.data.cassandra.core.cql.session.DefaultBridgedReactiveSession; +import org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessionFactory; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import com.datastax.driver.core.querybuilder.QueryBuilder; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/ReactiveCqlTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateUnitTests.java similarity index 98% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/ReactiveCqlTemplateUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateUnitTests.java index 9dae6d60f..ccae9abf6 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/ReactiveCqlTemplateUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; @@ -34,12 +34,12 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.dao.IncorrectResultSizeDataAccessException; -import org.springframework.data.cql.core.session.DefaultReactiveSessionFactory; -import org.springframework.data.cql.core.session.ReactiveResultSet; -import org.springframework.data.cql.core.session.ReactiveSession; -import org.springframework.data.cql.core.session.ReactiveSessionFactory; -import org.springframework.data.cql.support.exception.CassandraConnectionFailureException; -import org.springframework.data.cql.support.exception.CassandraInvalidQueryException; +import org.springframework.data.cassandra.CassandraConnectionFailureException; +import org.springframework.data.cassandra.CassandraInvalidQueryException; +import org.springframework.data.cassandra.ReactiveResultSet; +import org.springframework.data.cassandra.ReactiveSession; +import org.springframework.data.cassandra.ReactiveSessionFactory; +import org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessionFactory; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.ColumnDefinitions; @@ -78,7 +78,7 @@ public class ReactiveCqlTemplateUnitTests { } // ------------------------------------------------------------------------- - // Tests dealing with a plain org.springframework.data.cql.core.ReactiveSession + // Tests dealing with a plain org.springframework.data.cassandra.core.cql.ReactiveSession // ------------------------------------------------------------------------- @Test // DATACASS-335 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/SingleColumnRowMapperUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/SingleColumnRowMapperUnitTests.java similarity index 96% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/SingleColumnRowMapperUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/SingleColumnRowMapperUnitTests.java index 0b1c97f58..2c4caf74e 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/SingleColumnRowMapperUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/SingleColumnRowMapperUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -24,7 +24,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.dao.TypeMismatchDataAccessException; -import org.springframework.data.cql.support.exception.IncorrectResultSetColumnCountException; import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/WriteOptionsUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/WriteOptionsUnitTests.java similarity index 97% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/WriteOptionsUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/WriteOptionsUnitTests.java index 2ae522e2d..a0d1c0555 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/WriteOptionsUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/WriteOptionsUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core; +package org.springframework.data.cassandra.core.cql; import static org.assertj.core.api.Assertions.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AbstractIndexOperationCqlGeneratorTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AbstractIndexOperationCqlGeneratorTest.java similarity index 91% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AbstractIndexOperationCqlGeneratorTest.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AbstractIndexOperationCqlGeneratorTest.java index 7d1436bed..18e64937a 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AbstractIndexOperationCqlGeneratorTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AbstractIndexOperationCqlGeneratorTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.IndexNameSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.IndexNameSpecification; /** * Useful test class that specifies just about as much as you can for a CQL generation test. Intended to be extended by diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AbstractKeyspaceOperationCqlGeneratorTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AbstractKeyspaceOperationCqlGeneratorTest.java similarity index 90% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AbstractKeyspaceOperationCqlGeneratorTest.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AbstractKeyspaceOperationCqlGeneratorTest.java index a08627aac..406f53053 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AbstractKeyspaceOperationCqlGeneratorTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AbstractKeyspaceOperationCqlGeneratorTest.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import java.util.UUID; import org.apache.commons.lang3.StringUtils; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.KeyspaceActionSpecification; -import org.springframework.data.cql.core.keyspace.TableNameSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceActionSpecification; /** * Useful test class that specifies just about as much as you can for a CQL generation test. Intended to be extended by diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AbstractTableOperationCqlGeneratorTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AbstractTableOperationCqlGeneratorTest.java similarity index 91% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AbstractTableOperationCqlGeneratorTest.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AbstractTableOperationCqlGeneratorTest.java index dc11457dd..c6e98cf74 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AbstractTableOperationCqlGeneratorTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AbstractTableOperationCqlGeneratorTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; -import org.springframework.data.cql.core.keyspace.TableNameSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.TableNameSpecification; /** * Useful test class that specifies just about as much as you can for a CQL generation test. Intended to be extended by diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterKeyspaceCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterKeyspaceCqlGeneratorUnitTests.java similarity index 90% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterKeyspaceCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterKeyspaceCqlGeneratorUnitTests.java index 656568ff0..46503f8a3 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterKeyspaceCqlGeneratorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterKeyspaceCqlGeneratorUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; @@ -21,11 +21,11 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.AlterKeyspaceSpecification; -import org.springframework.data.cql.core.keyspace.DefaultOption; -import org.springframework.data.cql.core.keyspace.KeyspaceOption; -import org.springframework.data.cql.core.keyspace.Option; -import org.springframework.data.cql.support.RandomKeySpaceName; +import org.springframework.data.cassandra.core.cql.keyspace.AlterKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DefaultOption; +import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceOption; +import org.springframework.data.cassandra.core.cql.keyspace.Option; +import org.springframework.data.cassandra.support.RandomKeySpaceName; /** * Unit tests for {@link AlterKeyspaceCqlGenerator}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterTableCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java similarity index 90% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterTableCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java index ae5a10bf8..084c223cb 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterTableCqlGeneratorIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; @@ -23,12 +23,12 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.keyspace.AlterTableSpecification; -import org.springframework.data.cql.core.keyspace.TableOption; -import org.springframework.data.cql.core.keyspace.TableOption.CachingOption; -import org.springframework.data.cql.core.keyspace.TableOption.KeyCachingOption; -import org.springframework.data.cql.support.CassandraVersion; +import org.springframework.data.cassandra.core.cql.keyspace.AlterTableSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption.CachingOption; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption.KeyCachingOption; +import org.springframework.data.cassandra.support.CassandraVersion; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.data.util.Version; import com.datastax.driver.core.ColumnMetadata; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterTableCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGeneratorUnitTests.java similarity index 91% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterTableCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGeneratorUnitTests.java index 69c5735f7..e726f6198 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterTableCqlGeneratorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGeneratorUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; @@ -21,10 +21,10 @@ import java.util.LinkedHashMap; import java.util.Map; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.AlterTableSpecification; -import org.springframework.data.cql.core.keyspace.TableOption; -import org.springframework.data.cql.core.keyspace.TableOption.CachingOption; -import org.springframework.data.cql.core.keyspace.TableOption.KeyCachingOption; +import org.springframework.data.cassandra.core.cql.keyspace.AlterTableSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption.CachingOption; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption.KeyCachingOption; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorIntegrationTests.java similarity index 86% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorIntegrationTests.java index fb5fb8d4d..507c03c3d 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGeneratorIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorIntegrationTests.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.junit.Assume.*; -import static org.springframework.data.cql.core.generator.AlterUserTypeCqlGenerator.*; +import static org.springframework.data.cassandra.core.cql.generator.AlterUserTypeCqlGenerator.*; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.keyspace.AlterUserTypeSpecification; -import org.springframework.data.cql.support.CassandraVersion; +import org.springframework.data.cassandra.core.cql.keyspace.AlterUserTypeSpecification; +import org.springframework.data.cassandra.support.CassandraVersion; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.data.util.Version; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorUnitTests.java similarity index 90% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorUnitTests.java index 05df600fe..c97053fe4 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/AlterUserTypeCqlGeneratorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorUnitTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.cql.core.generator.AlterUserTypeCqlGenerator.*; +import static org.springframework.data.cassandra.core.cql.generator.AlterUserTypeCqlGenerator.*; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.AlterUserTypeSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.AlterUserTypeSpecification; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CqlIndexSpecificationAssertions.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CqlIndexSpecificationAssertions.java similarity index 93% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CqlIndexSpecificationAssertions.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CqlIndexSpecificationAssertions.java index 0a9c92dd4..84c4a12fb 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CqlIndexSpecificationAssertions.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CqlIndexSpecificationAssertions.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; -import org.springframework.data.cql.core.keyspace.IndexDescriptor; +import org.springframework.data.cassandra.core.cql.keyspace.IndexDescriptor; import com.datastax.driver.core.IndexMetadata; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CqlKeyspaceSpecificationAssertions.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CqlKeyspaceSpecificationAssertions.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CqlKeyspaceSpecificationAssertions.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CqlKeyspaceSpecificationAssertions.java index 0eaa904d0..0581f1915 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CqlKeyspaceSpecificationAssertions.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CqlKeyspaceSpecificationAssertions.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; import java.util.Map; -import org.springframework.data.cql.core.keyspace.KeyspaceDescriptor; -import org.springframework.data.cql.core.keyspace.Option; +import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceDescriptor; +import org.springframework.data.cassandra.core.cql.keyspace.Option; import com.datastax.driver.core.KeyspaceMetadata; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CqlTableSpecificationAssertions.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CqlTableSpecificationAssertions.java similarity index 93% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CqlTableSpecificationAssertions.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CqlTableSpecificationAssertions.java index 04d818c7b..23746c933 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CqlTableSpecificationAssertions.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CqlTableSpecificationAssertions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; @@ -22,11 +22,11 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.data.cql.core.CqlStringUtils; -import org.springframework.data.cql.core.keyspace.ColumnSpecification; -import org.springframework.data.cql.core.keyspace.DropTableSpecification; -import org.springframework.data.cql.core.keyspace.TableDescriptor; -import org.springframework.data.cql.core.keyspace.TableOption; +import org.springframework.data.cassandra.core.cql.CqlStringUtils; +import org.springframework.data.cassandra.core.cql.keyspace.ColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropTableSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.TableDescriptor; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption; import com.datastax.driver.core.ColumnMetadata; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateIndexCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java similarity index 80% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateIndexCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java index 77c0e13f6..0054dd190 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateIndexCqlGeneratorIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import org.junit.Test; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.generator.CreateIndexCqlGeneratorUnitTests.BasicTest; -import org.springframework.data.cql.core.generator.CreateIndexCqlGeneratorUnitTests.CreateIndexTest; -import org.springframework.data.cql.support.CqlDataSet; +import org.springframework.data.cassandra.core.cql.generator.CreateIndexCqlGeneratorUnitTests.BasicTest; +import org.springframework.data.cassandra.core.cql.generator.CreateIndexCqlGeneratorUnitTests.CreateIndexTest; +import org.springframework.data.cassandra.support.CqlDataSet; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; /** * Integration tests that reuse unit tests. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateIndexCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java similarity index 93% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateIndexCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java index 9b9168464..8db40c865 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateIndexCqlGeneratorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.CreateIndexSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.CreateIndexSpecification; /** * Unit tests for {@link CreateIndexCqlGenerator}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java similarity index 77% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java index a5eb0aca0..ed5ea1899 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import org.junit.Test; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.generator.CreateKeyspaceCqlGeneratorUnitTests.BasicTest; -import org.springframework.data.cql.core.generator.CreateKeyspaceCqlGeneratorUnitTests.CreateKeyspaceTest; -import org.springframework.data.cql.core.generator.CreateKeyspaceCqlGeneratorUnitTests.NetworkTopologyTest; +import org.springframework.data.cassandra.core.cql.generator.CreateKeyspaceCqlGeneratorUnitTests.BasicTest; +import org.springframework.data.cassandra.core.cql.generator.CreateKeyspaceCqlGeneratorUnitTests.CreateKeyspaceTest; +import org.springframework.data.cassandra.core.cql.generator.CreateKeyspaceCqlGeneratorUnitTests.NetworkTopologyTest; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; /** * Integration tests that reuse unit tests. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateKeyspaceCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorUnitTests.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateKeyspaceCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorUnitTests.java index a50c59283..9ce4b4bad 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateKeyspaceCqlGeneratorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.CreateKeyspaceSpecification; -import org.springframework.data.cql.core.keyspace.DefaultOption; -import org.springframework.data.cql.core.keyspace.KeyspaceAttributes; -import org.springframework.data.cql.core.keyspace.KeyspaceOption; -import org.springframework.data.cql.core.keyspace.Option; -import org.springframework.data.cql.support.RandomKeySpaceName; +import org.springframework.data.cassandra.core.cql.keyspace.CreateKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DefaultOption; +import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceAttributes; +import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceOption; +import org.springframework.data.cassandra.core.cql.keyspace.Option; +import org.springframework.data.cassandra.support.RandomKeySpaceName; /** * Unit tests for {@link CreateKeyspaceCqlGenerator}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateTableCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java similarity index 78% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateTableCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java index abe5a5e4b..bc086ffb0 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateTableCqlGeneratorIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import org.junit.Test; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.generator.CreateTableCqlGeneratorUnitTests.BasicTest; -import org.springframework.data.cql.core.generator.CreateTableCqlGeneratorUnitTests.CompositePartitionKeyTest; -import org.springframework.data.cql.core.generator.CreateTableCqlGeneratorUnitTests.CreateTableTest; +import org.springframework.data.cassandra.core.cql.generator.CreateTableCqlGeneratorUnitTests.BasicTest; +import org.springframework.data.cassandra.core.cql.generator.CreateTableCqlGeneratorUnitTests.CompositePartitionKeyTest; +import org.springframework.data.cassandra.core.cql.generator.CreateTableCqlGeneratorUnitTests.CreateTableTest; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; /** * Integration tests that reuse unit tests. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateTableCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java similarity index 92% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateTableCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java index 4aecda868..e085471f0 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateTableCqlGeneratorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; import java.util.ArrayList; import java.util.Arrays; @@ -29,15 +29,15 @@ import java.util.stream.Collectors; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.ReservedKeyword; -import org.springframework.data.cql.core.keyspace.CreateTableSpecification; -import org.springframework.data.cql.core.keyspace.Option; -import org.springframework.data.cql.core.keyspace.TableOption; -import org.springframework.data.cql.core.keyspace.TableOption.CachingOption; -import org.springframework.data.cql.core.keyspace.TableOption.CompactionOption; -import org.springframework.data.cql.core.keyspace.TableOption.CompressionOption; -import org.springframework.data.cql.core.keyspace.TableOption.KeyCachingOption; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.ReservedKeyword; +import org.springframework.data.cassandra.core.cql.keyspace.CreateTableSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.Option; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption.CachingOption; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption.CompactionOption; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption.CompressionOption; +import org.springframework.data.cassandra.core.cql.keyspace.TableOption.KeyCachingOption; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateUserTypeCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorIntegrationTests.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateUserTypeCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorIntegrationTests.java index e7557cbec..5c438de37 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateUserTypeCqlGeneratorIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorIntegrationTests.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.cql.core.generator.CreateUserTypeCqlGenerator.*; +import static org.springframework.data.cassandra.core.cql.generator.CreateUserTypeCqlGenerator.*; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.keyspace.CreateUserTypeSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.CreateUserTypeSpecification; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import com.datastax.driver.core.DataType; import com.datastax.driver.core.KeyspaceMetadata; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateUserTypeCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorUnitTests.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateUserTypeCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorUnitTests.java index 21560c9d0..54284b628 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/CreateUserTypeCqlGeneratorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorUnitTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.cql.core.generator.CreateUserTypeCqlGenerator.*; +import static org.springframework.data.cassandra.core.cql.generator.CreateUserTypeCqlGenerator.*; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.CreateUserTypeSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.CreateUserTypeSpecification; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropIndexCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropIndexCqlGeneratorUnitTests.java similarity index 93% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropIndexCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropIndexCqlGeneratorUnitTests.java index 29dd850ac..6a211d028 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropIndexCqlGeneratorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropIndexCqlGeneratorUnitTests.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.DropIndexSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropIndexSpecification; /** * Unit tests for {@link DropIndexCqlGenerator}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropKeyspaceCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropKeyspaceCqlGeneratorUnitTests.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropKeyspaceCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropKeyspaceCqlGeneratorUnitTests.java index cbb91070b..b95e720ca 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropKeyspaceCqlGeneratorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropKeyspaceCqlGeneratorUnitTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.DropKeyspaceSpecification; -import org.springframework.data.cql.support.RandomKeySpaceName; +import org.springframework.data.cassandra.core.cql.keyspace.DropKeyspaceSpecification; +import org.springframework.data.cassandra.support.RandomKeySpaceName; /** * Unit tests for {@link DropKeyspaceCqlGenerator}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropTableCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropTableCqlGeneratorUnitTests.java similarity index 92% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropTableCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropTableCqlGeneratorUnitTests.java index 9c3e8ced4..2bcd54b48 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropTableCqlGeneratorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropTableCqlGeneratorUnitTests.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.DropTableSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropTableSpecification; /** * Unit tests for {@link DropTableCqlGenerator}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropUserTypeCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropUserTypeCqlGeneratorUnitTests.java similarity index 83% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropUserTypeCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropUserTypeCqlGeneratorUnitTests.java index 98ddd05d5..a236bce2d 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/DropUserTypeCqlGeneratorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/DropUserTypeCqlGeneratorUnitTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.cql.core.generator.DropUserTypeCqlGenerator.*; +import static org.springframework.data.cassandra.core.cql.generator.DropUserTypeCqlGenerator.*; import org.junit.Test; -import org.springframework.data.cql.core.keyspace.DropUserTypeSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropUserTypeSpecification; /** * Unit tests for {@link DropUserTypeCqlGenerator}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/IndexLifecycleCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java similarity index 92% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/IndexLifecycleCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java index d141cce03..4a686929e 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/IndexLifecycleCqlGeneratorIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; /** * Integration tests that reuse unit tests. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/TableLifecycleIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/TableLifecycleIntegrationTests.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/TableLifecycleIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/TableLifecycleIntegrationTests.java index be3d42294..54bc61d68 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/TableLifecycleIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/TableLifecycleIntegrationTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.keyspace.DropTableSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropTableSpecification; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; /** * Test CREATE TABLE / ALTER TABLE / DROP TABLE diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/TableOptionsIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/TableOptionsIntegrationTests.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/TableOptionsIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/TableOptionsIntegrationTests.java index 4084b1d66..d8b55c015 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/generator/TableOptionsIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/TableOptionsIntegrationTests.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.generator; +package org.springframework.data.cassandra.core.cql.generator; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; /** * Test CREATE TABLE for all Options and assert against C* TableMetaData diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/keyspace/OptionUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/keyspace/OptionUnitTests.java similarity index 98% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/keyspace/OptionUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/keyspace/OptionUnitTests.java index 7eb12358a..2fb605191 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/keyspace/OptionUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/keyspace/OptionUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.keyspace; +package org.springframework.data.cassandra.core.cql.keyspace; import static org.assertj.core.api.Assertions.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactoryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/AbstractRoutingSessionFactoryUnitTests.java similarity index 91% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactoryUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/AbstractRoutingSessionFactoryUnitTests.java index bae14d9dd..1a4abaa0d 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactoryUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/AbstractRoutingSessionFactoryUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session.lookup; +package org.springframework.data.cassandra.core.cql.lookup; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; @@ -26,7 +26,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.data.cql.core.session.DefaultSessionFactory; +import org.springframework.data.cassandra.core.cql.session.DefaultSessionFactory; +import org.springframework.data.cassandra.core.cql.session.lookup.AbstractRoutingSessionFactory; +import org.springframework.data.cassandra.core.cql.session.lookup.MapSessionFactoryLookup; +import org.springframework.data.cassandra.core.cql.session.lookup.SessionFactoryLookupFailureException; import com.datastax.driver.core.Session; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookupUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/BeanFactorySessionFactoryLookupUnitTests.java similarity index 88% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookupUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/BeanFactorySessionFactoryLookupUnitTests.java index a24f892c4..9c2685cad 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookupUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/BeanFactorySessionFactoryLookupUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session.lookup; +package org.springframework.data.cassandra.core.cql.lookup; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -24,7 +24,9 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; +import org.springframework.data.cassandra.core.cql.session.lookup.BeanFactorySessionFactoryLookup; +import org.springframework.data.cassandra.core.cql.session.lookup.SessionFactoryLookupFailureException; /** * Unit test for {@link BeanFactorySessionFactoryLookup}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookupUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/MapSessionFactoryLookupUnitTests.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookupUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/MapSessionFactoryLookupUnitTests.java index 08239e2b0..b9a2ced85 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookupUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/MapSessionFactoryLookupUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session.lookup; +package org.springframework.data.cassandra.core.cql.lookup; import static org.assertj.core.api.Assertions.*; @@ -23,7 +23,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; +import org.springframework.data.cassandra.core.cql.session.lookup.MapSessionFactoryLookup; +import org.springframework.data.cassandra.core.cql.session.lookup.SessionFactoryLookupFailureException; /** * Unit tests for {@link MapSessionFactoryLookup}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookupUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/SingleSessionFactoryLookupUnitTests.java similarity index 86% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookupUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/SingleSessionFactoryLookupUnitTests.java index aed7e9e02..ab0f6dd6b 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookupUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/lookup/SingleSessionFactoryLookupUnitTests.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.session.lookup; +package org.springframework.data.cassandra.core.cql.lookup; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Test; -import org.springframework.data.cql.core.session.SessionFactory; +import org.springframework.data.cassandra.SessionFactory; +import org.springframework.data.cassandra.core.cql.session.lookup.SingleSessionFactoryLookup; /** * Unit tests for {@link SingleSessionFactoryLookup}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/support/CachedPreparedStatementCreatorIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreatorIntegrationTest.java similarity index 92% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/support/CachedPreparedStatementCreatorIntegrationTest.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreatorIntegrationTest.java index bacb6caee..9d34776d7 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/support/CachedPreparedStatementCreatorIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreatorIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.support; +package org.springframework.data.cassandra.core.cql.support; import static com.datastax.driver.core.querybuilder.QueryBuilder.*; import static org.assertj.core.api.Assertions.*; @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.querybuilder.Insert; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/support/CachedPreparedStatementCreatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreatorUnitTests.java similarity index 99% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/core/support/CachedPreparedStatementCreatorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreatorUnitTests.java index 14f2bf346..afe671d5f 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/support/CachedPreparedStatementCreatorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreatorUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.core.support; +package org.springframework.data.cassandra.core.cql.support; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityMetadataVerifierUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityMetadataVerifierUnitTests.java index 67d20eea7..128d5b347 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityMetadataVerifierUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityMetadataVerifierUnitTests.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.cql.core.Ordering; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.core.cql.Ordering; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.mapping.MappingException; /** diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java index 4f5c73a85..64f6e8dd7 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java @@ -32,7 +32,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.core.annotation.AliasFor; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.util.ClassTypeInformation; /** diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentPropertyUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentPropertyUnitTests.java index e7671e224..5f8b12253 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentPropertyUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentPropertyUnitTests.java @@ -26,7 +26,7 @@ import java.util.UUID; import org.junit.Test; import org.springframework.core.annotation.AliasFor; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.mapping.model.Property; import org.springframework.data.util.ClassTypeInformation; import org.springframework.util.ReflectionUtils; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicMapIdUnitTests.java similarity index 90% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicMapIdUnitTests.java index 69173b732..bf405992b 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicMapIdUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2017 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.repository.support; +package org.springframework.data.cassandra.core.mapping; import static org.assertj.core.api.Assertions.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraCompositePrimaryKeyUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraCompositePrimaryKeyUnitTests.java index ebd0bbc82..5f45aaaa1 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraCompositePrimaryKeyUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraCompositePrimaryKeyUnitTests.java @@ -26,9 +26,9 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cql.core.PrimaryKeyType; -import org.springframework.data.cql.core.keyspace.ColumnSpecification; -import org.springframework.data.cql.core.keyspace.CreateTableSpecification; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; +import org.springframework.data.cassandra.core.cql.keyspace.ColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.CreateTableSpecification; import org.springframework.data.mapping.model.Property; import org.springframework.data.util.ClassTypeInformation; import org.springframework.util.ReflectionUtils; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java index 10e0f0c04..1fb256c9f 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java @@ -30,12 +30,12 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.annotation.Id; import org.springframework.data.cassandra.core.convert.CassandraCustomConversions; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.Ordering; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; +import org.springframework.data.cassandra.core.cql.keyspace.ColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.CreateTableSpecification; import org.springframework.data.convert.WritingConverter; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.Ordering; -import org.springframework.data.cql.core.PrimaryKeyType; -import org.springframework.data.cql.core.keyspace.ColumnSpecification; -import org.springframework.data.cql.core.keyspace.CreateTableSpecification; import org.springframework.data.mapping.MappingException; import org.springframework.data.util.ClassTypeInformation; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentEntityOrderPropertiesUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentEntityOrderPropertiesUnitTests.java index 856ce0baf..6f7bde195 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentEntityOrderPropertiesUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentEntityOrderPropertiesUnitTests.java @@ -24,7 +24,7 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.mapping.PropertyHandler; /** diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparatorUnitTests.java index a8ae2715a..3e7ac07e2 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparatorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparatorUnitTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; /** * The CassandraPersistentPropertyComparatorUnitTests class is a test suite of test cases testing the contract and diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPrimaryKeyColumnAnnotationComparatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPrimaryKeyColumnAnnotationComparatorUnitTests.java index 3bfbb5d80..fb6f23a74 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPrimaryKeyColumnAnnotationComparatorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPrimaryKeyColumnAnnotationComparatorUnitTests.java @@ -23,8 +23,8 @@ import java.util.UUID; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.data.cql.core.Ordering; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.core.cql.Ordering; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; /** * The CassandraPrimaryKeyColumnAnnotationComparatorUnitTests class is a test suite of test cases testing the contract diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntityUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntityUnitTests.java index a8744bad6..c1c86a7ac 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntityUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntityUnitTests.java @@ -27,7 +27,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.core.annotation.AliasFor; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.util.ClassTypeInformation; /** diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifierUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifierUnitTests.java index 922aac958..e49cdee11 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifierUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifierUnitTests.java @@ -21,8 +21,8 @@ import static org.assertj.core.api.Fail.fail; import org.junit.Before; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.cql.core.Ordering; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.core.cql.Ordering; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.mapping.MappingException; /** diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompoundPrimaryKeyUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompoundPrimaryKeyUnitTests.java index 8d2b13318..35b24dc35 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompoundPrimaryKeyUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompoundPrimaryKeyUnitTests.java @@ -22,7 +22,7 @@ import java.util.Date; import org.junit.Before; import org.junit.Test; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.mapping.model.Property; import org.springframework.data.util.ClassTypeInformation; import org.springframework.util.ReflectionUtils; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java index 9ec0db39d..8905b79e4 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java @@ -34,10 +34,10 @@ import org.junit.Test; import org.springframework.core.convert.converter.Converter; import org.springframework.data.annotation.Id; import org.springframework.data.cassandra.core.convert.CassandraCustomConversions; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.keyspace.ColumnSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.CreateTableSpecification; import org.springframework.data.cassandra.domain.AllPossibleTypes; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.keyspace.ColumnSpecification; -import org.springframework.data.cql.core.keyspace.CreateTableSpecification; import org.springframework.util.StringUtils; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/ForceQuotedPropertiesSimpleUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/ForceQuotedPropertiesSimpleUnitTests.java index c3bd44b50..849054106 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/ForceQuotedPropertiesSimpleUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/ForceQuotedPropertiesSimpleUnitTests.java @@ -16,13 +16,13 @@ package org.springframework.data.cassandra.core.mapping; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.cql.core.CqlIdentifier.*; +import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*; import java.io.Serializable; import org.junit.Test; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; /** * Unit tests for {@link CassandraMappingContext}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/MapIdFactoryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/MapIdFactoryUnitTests.java similarity index 96% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/MapIdFactoryUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/MapIdFactoryUnitTests.java index 78320c626..408e25e23 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/MapIdFactoryUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/MapIdFactoryUnitTests.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.data.cassandra.repository.support; +package org.springframework.data.cassandra.core.mapping; import static org.assertj.core.api.Assertions.*; +import static org.springframework.data.cassandra.core.mapping.MapIdFactory.*; import static org.springframework.data.cassandra.repository.support.IdInterfaceValidator.*; -import static org.springframework.data.cassandra.repository.support.MapIdFactory.*; import java.io.Serializable; import java.util.Random; import org.junit.Test; -import org.springframework.data.cassandra.repository.MapId; +import org.springframework.data.cassandra.repository.support.IdInterfaceExceptions; /** * Unit tests for {@link MapIdFactory}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifierUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifierUnitTests.java index 6c7b05764..6fc4893bc 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifierUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifierUnitTests.java @@ -21,8 +21,8 @@ import static org.assertj.core.api.Fail.fail; import org.junit.Before; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.cql.core.Ordering; -import org.springframework.data.cql.core.PrimaryKeyType; +import org.springframework.data.cassandra.core.cql.Ordering; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.mapping.MappingException; /** diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/query/ColumnNameUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/query/ColumnNameUnitTests.java index c726df33f..a6fa7e936 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/query/ColumnNameUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/query/ColumnNameUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.cassandra.core.query; import static org.assertj.core.api.Assertions.*; import org.junit.Test; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; /** * Unit tests for {@link ColumnName}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/query/ColumnsUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/query/ColumnsUnitTests.java index 2c855896c..909b6d040 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/query/ColumnsUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/query/ColumnsUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.cassandra.core.query; import static org.assertj.core.api.Assertions.*; import org.junit.Test; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; /** * Unit tests for {@link Columns}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/CompositeKey.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/CompositeKey.java index b1b4929aa..9032c89f9 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/CompositeKey.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/CompositeKey.java @@ -19,9 +19,9 @@ import lombok.Data; import java.io.Serializable; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.PrimaryKeyClass; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Mark Paluch diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/FlatGroup.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/FlatGroup.java index 5396620a5..7741c605d 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/FlatGroup.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/FlatGroup.java @@ -17,9 +17,9 @@ package org.springframework.data.cassandra.domain; import lombok.Data; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Mark Paluch diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/GroupKey.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/GroupKey.java index e78588b61..2928e916a 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/GroupKey.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/GroupKey.java @@ -21,9 +21,9 @@ import lombok.NoArgsConstructor; import java.io.Serializable; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.PrimaryKeyClass; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Mark Paluch diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/Person.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/Person.java index 73553b604..6ff731436 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/Person.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/Person.java @@ -24,9 +24,9 @@ import java.time.ZoneId; import java.util.Date; import java.util.List; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Mark Paluch diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/TypeWithCompositeKey.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/TypeWithCompositeKey.java index 902720455..66e6ea07d 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/TypeWithCompositeKey.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/TypeWithCompositeKey.java @@ -17,9 +17,9 @@ package org.springframework.data.cassandra.domain; import lombok.Data; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Mark Paluch diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/TypeWithMapId.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/TypeWithMapId.java index 6a3d24676..67af5d3df 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/TypeWithMapId.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/TypeWithMapId.java @@ -17,12 +17,12 @@ package org.springframework.data.cassandra.domain; import lombok.Data; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; +import org.springframework.data.cassandra.core.mapping.BasicMapId; +import org.springframework.data.cassandra.core.mapping.MapId; +import org.springframework.data.cassandra.core.mapping.MapIdentifiable; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -import org.springframework.data.cassandra.repository.MapId; -import org.springframework.data.cassandra.repository.MapIdentifiable; -import org.springframework.data.cassandra.repository.support.BasicMapId; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Mark Paluch diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/UserToken.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/UserToken.java index 80d9aac39..a982ba72f 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/UserToken.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/UserToken.java @@ -17,12 +17,11 @@ package org.springframework.data.cassandra.domain; import java.util.UUID; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import lombok.Data; - import org.springframework.data.cassandra.core.mapping.Column; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Mark Paluch diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/BigIntParamIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/BigIntParamIntegrationTests.java index b7d7977f0..10599317b 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/BigIntParamIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/BigIntParamIntegrationTests.java @@ -33,12 +33,12 @@ import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.data.cassandra.config.SchemaAction; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories; import org.springframework.data.cassandra.repository.support.AbstractSpringDataEmbeddedCassandraIntegrationTest; import org.springframework.data.cassandra.repository.support.IntegrationTestConfig; -import org.springframework.data.cql.core.PrimaryKeyType; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ConvertingReactiveCassandraRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ConvertingReactiveCassandraRepositoryTests.java index fd832fd1a..201dd78e8 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ConvertingReactiveCassandraRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ConvertingReactiveCassandraRepositoryTests.java @@ -39,7 +39,7 @@ import org.springframework.data.cassandra.core.ReactiveCassandraTemplate; import org.springframework.data.cassandra.domain.User; import org.springframework.data.cassandra.repository.config.EnableReactiveCassandraRepositories; import org.springframework.data.cassandra.repository.support.IntegrationTestConfig; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.data.repository.reactive.ReactiveCrudRepository; import org.springframework.data.repository.reactive.RxJava1CrudRepository; import org.springframework.data.repository.reactive.RxJava2CrudRepository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/DateKeyIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/DateKeyIntegrationTests.java index 0d2d38b72..a3ff7abfb 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/DateKeyIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/DateKeyIntegrationTests.java @@ -32,12 +32,12 @@ import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.data.cassandra.config.SchemaAction; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories; import org.springframework.data.cassandra.repository.support.AbstractSpringDataEmbeddedCassandraIntegrationTest; import org.springframework.data.cassandra.repository.support.IntegrationTestConfig; -import org.springframework.data.cql.core.PrimaryKeyType; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/IntParamIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/IntParamIntegrationTests.java index d137ae116..288fd0a9b 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/IntParamIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/IntParamIntegrationTests.java @@ -31,12 +31,12 @@ import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.data.cassandra.config.SchemaAction; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories; import org.springframework.data.cassandra.repository.support.AbstractSpringDataEmbeddedCassandraIntegrationTest; import org.springframework.data.cassandra.repository.support.IntegrationTestConfig; -import org.springframework.data.cql.core.PrimaryKeyType; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/QueryDerivationIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/QueryDerivationIntegrationTests.java index 05b324d6e..c32c7a955 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/QueryDerivationIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/QueryDerivationIntegrationTests.java @@ -43,7 +43,7 @@ import org.springframework.data.cassandra.repository.QueryDerivationIntegrationT import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories; import org.springframework.data.cassandra.repository.support.AbstractSpringDataEmbeddedCassandraIntegrationTest; import org.springframework.data.cassandra.repository.support.IntegrationTestConfig; -import org.springframework.data.cql.support.CassandraVersion; +import org.springframework.data.cassandra.support.CassandraVersion; import org.springframework.data.domain.Sort; import org.springframework.data.util.Version; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepositoryIntegrationTests.java index d62d5a4f4..46ffdb9fc 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepositoryIntegrationTests.java @@ -40,7 +40,7 @@ import org.springframework.data.cassandra.domain.User; import org.springframework.data.cassandra.repository.support.IntegrationTestConfig; import org.springframework.data.cassandra.repository.support.ReactiveCassandraRepositoryFactory; import org.springframework.data.cassandra.repository.support.SimpleReactiveCassandraRepository; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Direction; import org.springframework.data.repository.query.DefaultEvaluationContextProvider; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CassandraOperationsProducer.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CassandraOperationsProducer.java index c2b2c22dc..bd78e1a06 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CassandraOperationsProducer.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CassandraOperationsProducer.java @@ -28,16 +28,16 @@ import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.CassandraPersistentEntitySchemaCreator; import org.springframework.data.cassandra.core.CassandraPersistentEntitySchemaDropper; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.cql.generator.CreateKeyspaceCqlGenerator; +import org.springframework.data.cassandra.core.cql.generator.DropKeyspaceCqlGenerator; +import org.springframework.data.cassandra.core.cql.keyspace.CreateKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropKeyspaceSpecification; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver; import org.springframework.data.cassandra.domain.User; -import org.springframework.data.cql.core.generator.CreateKeyspaceCqlGenerator; -import org.springframework.data.cql.core.generator.DropKeyspaceCqlGenerator; -import org.springframework.data.cql.core.keyspace.CreateKeyspaceSpecification; -import org.springframework.data.cql.core.keyspace.DropKeyspaceSpecification; -import org.springframework.data.cql.support.CassandraConnectionProperties; -import org.springframework.data.cql.support.RandomKeySpaceName; +import org.springframework.data.cassandra.support.CassandraConnectionProperties; +import org.springframework.data.cassandra.support.RandomKeySpaceName; import com.datastax.driver.core.Cluster; import com.google.common.collect.Sets; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryTests.java index eca1478f8..eaa85c85f 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryTests.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.data.cassandra.domain.User; -import org.springframework.data.cql.AbstractEmbeddedCassandraIntegrationTest; +import org.springframework.data.cassandra.test.util.AbstractEmbeddedCassandraIntegrationTest; /** * @author Mohsin Husen diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoriesRegistrarUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoriesRegistrarUnitTests.java index f2b6499ed..c36bc53c3 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoriesRegistrarUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/config/ReactiveCassandraRepositoriesRegistrarUnitTests.java @@ -25,13 +25,13 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; +import org.springframework.data.cassandra.ReactiveSession; import org.springframework.data.cassandra.core.ReactiveCassandraTemplate; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.UserTypeResolver; import org.springframework.data.cassandra.domain.Person; import org.springframework.data.cassandra.repository.ReactiveCassandraRepository; -import org.springframework.data.cql.core.session.ReactiveSession; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/conversion/ParameterConversionTestSupport.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/conversion/ParameterConversionTestSupport.java index 4559c0826..0d6f16f5b 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/conversion/ParameterConversionTestSupport.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/conversion/ParameterConversionTestSupport.java @@ -28,13 +28,13 @@ import org.springframework.data.cassandra.config.SchemaAction; import org.springframework.data.cassandra.core.CassandraAdminOperations; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.convert.CassandraCustomConversions; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver; import org.springframework.data.cassandra.core.mapping.UserTypeResolver; import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories; import org.springframework.data.cassandra.repository.support.AbstractSpringDataEmbeddedCassandraIntegrationTest; import org.springframework.data.cassandra.repository.support.IntegrationTestConfig; import org.springframework.data.convert.CustomConversions; -import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.util.StringUtils; import com.datastax.driver.core.Cluster; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/CompositeKeyCrudIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/CompositeKeyCrudIntegrationTests.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/CompositeKeyCrudIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/CompositeKeyCrudIntegrationTests.java index aa04c8afe..c6e7fa8a1 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/CompositeKeyCrudIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/CompositeKeyCrudIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey; import static org.assertj.core.api.Assertions.*; @@ -26,10 +26,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.CassandraTemplate; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.repository.forcequote.compositeprimarykey.entity.CorrelationEntity; import org.springframework.data.cassandra.repository.support.SchemaTestUtils; -import org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey.entity.CorrelationEntity; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; -import org.springframework.data.cql.core.QueryOptions; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import com.datastax.driver.core.ConsistencyLevel; import com.datastax.driver.core.policies.DowngradingConsistencyRetryPolicy; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/Explicit.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/Explicit.java similarity index 94% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/Explicit.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/Explicit.java index eb63c4ec6..8647514c2 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/Explicit.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/Explicit.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey; import java.util.UUID; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ExplicitKey.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ExplicitKey.java similarity index 91% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ExplicitKey.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ExplicitKey.java index c29ce955c..826b9639e 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ExplicitKey.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ExplicitKey.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey; import java.io.Serializable; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.PrimaryKeyClass; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Matthew T. Adams diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ExplicitRepository.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ExplicitRepository.java similarity index 90% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ExplicitRepository.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ExplicitRepository.java index 2e9393954..29e28f4d6 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ExplicitRepository.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ExplicitRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey; import org.springframework.data.cassandra.repository.CassandraRepository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryIntegrationTestsDelegator.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryIntegrationTestsDelegator.java similarity index 95% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryIntegrationTestsDelegator.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryIntegrationTestsDelegator.java index c115369c8..e114c118e 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryIntegrationTestsDelegator.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryIntegrationTestsDelegator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey; import org.junit.Before; import org.junit.Test; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryJavaConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryJavaConfigIntegrationTests.java similarity index 94% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryJavaConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryJavaConfigIntegrationTests.java index 93b8084f4..b7198f0d9 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryJavaConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryJavaConfigIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey; import org.junit.Test; import org.springframework.context.annotation.Configuration; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java similarity index 97% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java index 8a98b09bf..08660da6d 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey; import static org.assertj.core.api.Assertions.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests.java similarity index 92% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests.java index 9122d1696..542a03e54 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey; import org.junit.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/Implicit.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/Implicit.java similarity index 93% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/Implicit.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/Implicit.java index 57662be06..800ad2d47 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/Implicit.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/Implicit.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey; import java.util.UUID; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ImplicitKey.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ImplicitKey.java similarity index 89% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ImplicitKey.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ImplicitKey.java index 281becd42..afe4c713e 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ImplicitKey.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ImplicitKey.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey; import java.io.Serializable; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.PrimaryKeyClass; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Matthew T. Adams diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ImplicitRepository.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ImplicitRepository.java similarity index 90% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ImplicitRepository.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ImplicitRepository.java index c2b0dade0..6039a9769 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ImplicitRepository.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ImplicitRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey; import org.springframework.data.cassandra.repository.CassandraRepository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/entity/CorrelationEntity.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/entity/CorrelationEntity.java similarity index 97% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/entity/CorrelationEntity.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/entity/CorrelationEntity.java index b93baf07f..57cb0497f 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/entity/CorrelationEntity.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/entity/CorrelationEntity.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.compositeprimarykey.entity; +package org.springframework.data.cassandra.repository.forcequote.compositeprimarykey.entity; import java.io.Serializable; import java.util.Date; import java.util.Map; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.Column; import org.springframework.data.cassandra.core.mapping.PrimaryKey; import org.springframework.data.cassandra.core.mapping.PrimaryKeyClass; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Matthew T. Adams diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/Explicit.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/Explicit.java similarity index 94% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/Explicit.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/Explicit.java index a8e23b27e..112e67fef 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/Explicit.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/Explicit.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import java.util.UUID; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ExplicitProperties.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ExplicitProperties.java similarity index 95% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ExplicitProperties.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ExplicitProperties.java index 7b95590e9..3e5df5982 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ExplicitProperties.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ExplicitProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import java.util.UUID; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ExplicitPropertiesRepository.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ExplicitPropertiesRepository.java similarity index 91% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ExplicitPropertiesRepository.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ExplicitPropertiesRepository.java index 6afad0e94..56fa3a1c7 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ExplicitPropertiesRepository.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ExplicitPropertiesRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import org.springframework.data.cassandra.repository.CassandraRepository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ExplicitRepository.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ExplicitRepository.java similarity index 91% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ExplicitRepository.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ExplicitRepository.java index 4a5d0262b..cc949aac7 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ExplicitRepository.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ExplicitRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import org.springframework.data.cassandra.repository.CassandraRepository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryIntegrationTests.java similarity index 97% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryIntegrationTests.java index fc59b9059..0c75708a4 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import org.junit.Before; import org.junit.Test; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryJavaConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryJavaConfigIntegrationTests.java similarity index 95% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryJavaConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryJavaConfigIntegrationTests.java index 3438a31bf..430c2ad92 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryJavaConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryJavaConfigIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import org.junit.Test; import org.springframework.context.annotation.Configuration; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryTests.java similarity index 98% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryTests.java index f13973d0e..d3a6839c3 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import static org.assertj.core.api.Assertions.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests.java similarity index 93% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests.java index 86f234fd2..31947b5ac 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import org.junit.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/Implicit.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/Implicit.java similarity index 94% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/Implicit.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/Implicit.java index 2d56a14be..cd314b521 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/Implicit.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/Implicit.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import java.util.UUID; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ImplicitProperties.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ImplicitProperties.java similarity index 94% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ImplicitProperties.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ImplicitProperties.java index 54343602c..ccf8e0ae1 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ImplicitProperties.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ImplicitProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import java.util.UUID; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ImplicitPropertiesRepository.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ImplicitPropertiesRepository.java similarity index 91% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ImplicitPropertiesRepository.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ImplicitPropertiesRepository.java index 9a65e15bf..9439897c2 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ImplicitPropertiesRepository.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ImplicitPropertiesRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import org.springframework.data.cassandra.repository.CassandraRepository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ImplicitRepository.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ImplicitRepository.java similarity index 91% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ImplicitRepository.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ImplicitRepository.java index 9cce2cfce..0adca0cad 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ImplicitRepository.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/forcequote/config/ImplicitRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.forcequote.config; +package org.springframework.data.cassandra.repository.forcequote.config; import org.springframework.data.cassandra.repository.CassandraRepository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryQueryMethodParameterTypesIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryQueryMethodParameterTypesIntegrationTests.java index 95da8765b..9c6a85526 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryQueryMethodParameterTypesIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryQueryMethodParameterTypesIntegrationTests.java @@ -34,6 +34,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; +import org.springframework.data.cassandra.CassandraInvalidQueryException; import org.springframework.data.cassandra.config.SchemaAction; import org.springframework.data.cassandra.core.convert.CassandraCustomConversions; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; @@ -45,7 +46,6 @@ import org.springframework.data.cassandra.repository.config.EnableCassandraRepos import org.springframework.data.cassandra.repository.support.AbstractSpringDataEmbeddedCassandraIntegrationTest; import org.springframework.data.cassandra.repository.support.IntegrationTestConfig; import org.springframework.data.convert.CustomConversions; -import org.springframework.data.cql.support.exception.CassandraInvalidQueryException; import org.springframework.data.repository.CrudRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/MultiPrimaryKeyColumns.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/MultiPrimaryKeyColumns.java similarity index 88% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/MultiPrimaryKeyColumns.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/MultiPrimaryKeyColumns.java index 00a432c9e..a0ea696ab 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/MultiPrimaryKeyColumns.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/MultiPrimaryKeyColumns.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2017 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. @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.mapping.mapid.repo; +package org.springframework.data.cassandra.repository.mapid; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.Column; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Matthew T. Adams diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/MultiPrimaryKeyColumnsRepository.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/MultiPrimaryKeyColumnsRepository.java similarity index 85% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/MultiPrimaryKeyColumnsRepository.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/MultiPrimaryKeyColumnsRepository.java index d583e583b..41b385742 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/MultiPrimaryKeyColumnsRepository.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/MultiPrimaryKeyColumnsRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2017 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.mapping.mapid.repo; +package org.springframework.data.cassandra.repository.mapid; import org.springframework.data.cassandra.repository.MapIdCassandraRepository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/RepositoryMapIdIntegrationTests.java similarity index 94% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/RepositoryMapIdIntegrationTests.java index cb4fb8773..2efd62992 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/RepositoryMapIdIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2017 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. @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.mapping.mapid.repo; +package org.springframework.data.cassandra.repository.mapid; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.cassandra.repository.support.BasicMapId.*; +import static org.springframework.data.cassandra.core.mapping.BasicMapId.*; import org.junit.Before; import org.junit.Test; @@ -24,7 +24,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.data.cassandra.core.CassandraOperations; -import org.springframework.data.cassandra.repository.MapId; +import org.springframework.data.cassandra.core.mapping.MapId; import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories; import org.springframework.data.cassandra.repository.support.AbstractSpringDataEmbeddedCassandraIntegrationTest; import org.springframework.data.cassandra.repository.support.IntegrationTestConfig; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/SinglePrimaryKecColumnRepository.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/SinglePrimaryKecColumnRepository.java similarity index 85% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/SinglePrimaryKecColumnRepository.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/SinglePrimaryKecColumnRepository.java index 09870b447..622379777 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/SinglePrimaryKecColumnRepository.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/SinglePrimaryKecColumnRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2017 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.mapping.mapid.repo; +package org.springframework.data.cassandra.repository.mapid; import org.springframework.data.cassandra.repository.MapIdCassandraRepository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/SinglePrimaryKeyColumn.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/SinglePrimaryKeyColumn.java similarity index 86% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/SinglePrimaryKeyColumn.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/SinglePrimaryKeyColumn.java index 31b4c9847..1f6026e2c 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/SinglePrimaryKeyColumn.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/mapid/SinglePrimaryKeyColumn.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2017 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. @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra.test.integration.mapping.mapid.repo; +package org.springframework.data.cassandra.repository.mapid; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.Column; import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.core.mapping.Table; -import org.springframework.data.cql.core.PrimaryKeyType; /** * @author Matthew T. Adams diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreatorUnitTests.java index 62a7c6fb3..7021dd441 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreatorUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreatorUnitTests.java @@ -35,6 +35,7 @@ import org.springframework.data.cassandra.core.StatementFactory; import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; import org.springframework.data.cassandra.core.convert.UpdateMapper; +import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.Column; @@ -46,7 +47,6 @@ import org.springframework.data.cassandra.core.mapping.UserTypeResolver; import org.springframework.data.cassandra.core.query.Query; import org.springframework.data.cassandra.domain.Person; import org.springframework.data.cassandra.repository.support.MappingCassandraEntityInformation; -import org.springframework.data.cql.core.PrimaryKeyType; import org.springframework.data.repository.query.parser.PartTree; import com.datastax.driver.core.RegularStatement; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java index 8f6427038..f2722b2a8 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java @@ -34,6 +34,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.UserTypeResolver; import org.springframework.data.cassandra.domain.AddressType; @@ -42,7 +43,6 @@ import org.springframework.data.cassandra.domain.Person; import org.springframework.data.cassandra.repository.AllowFiltering; import org.springframework.data.cassandra.repository.MapIdCassandraRepository; import org.springframework.data.cassandra.repository.Query; -import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.projection.SpelAwareProxyProjectionFactory; import org.springframework.data.repository.core.support.DefaultRepositoryMetadata; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ReactiveStringBasedCassandraQueryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ReactiveStringBasedCassandraQueryUnitTests.java index 58ac508dc..cd3afdf89 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ReactiveStringBasedCassandraQueryUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ReactiveStringBasedCassandraQueryUnitTests.java @@ -24,13 +24,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.data.cassandra.ReactiveSession; import org.springframework.data.cassandra.core.ReactiveCassandraOperations; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.cql.ReactiveCqlOperations; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.domain.Person; import org.springframework.data.cassandra.repository.Query; -import org.springframework.data.cql.core.ReactiveCqlOperations; -import org.springframework.data.cql.core.session.ReactiveSession; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.projection.SpelAwareProxyProjectionFactory; import org.springframework.data.repository.Repository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryUnitTests.java index 0ef91e8d6..29cc4a306 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryUnitTests.java @@ -34,13 +34,13 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.UserTypeResolver; import org.springframework.data.cassandra.domain.AddressType; import org.springframework.data.cassandra.domain.Person; import org.springframework.data.cassandra.repository.Query; import org.springframework.data.cassandra.support.UserTypeBuilder; -import org.springframework.data.cql.core.CqlIdentifier; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.projection.SpelAwareProxyProjectionFactory; import org.springframework.data.repository.Repository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java index fd88cc949..b3666171e 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java @@ -20,7 +20,7 @@ import java.util.stream.Stream; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; -import org.springframework.data.cql.AbstractEmbeddedCassandraIntegrationTest; +import org.springframework.data.cassandra.test.util.AbstractEmbeddedCassandraIntegrationTest; /** * Base class to support integration tests and provide a {@link CassandraOperations} instance. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/IntegrationTestConfig.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/IntegrationTestConfig.java index fbdf6d246..09a88c3ff 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/IntegrationTestConfig.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/IntegrationTestConfig.java @@ -15,19 +15,19 @@ */ package org.springframework.data.cassandra.repository.support; -import static org.springframework.data.cql.core.keyspace.CreateKeyspaceSpecification.*; +import static org.springframework.data.cassandra.core.cql.keyspace.CreateKeyspaceSpecification.*; import java.util.Collections; import java.util.List; import org.springframework.context.annotation.Configuration; +import org.springframework.data.cassandra.config.AbstractReactiveCassandraConfiguration; import org.springframework.data.cassandra.config.SchemaAction; -import org.springframework.data.cassandra.config.java.AbstractReactiveCassandraConfiguration; -import org.springframework.data.cql.core.keyspace.CreateKeyspaceSpecification; -import org.springframework.data.cql.core.keyspace.DropKeyspaceSpecification; -import org.springframework.data.cql.support.CassandraConnectionProperties; -import org.springframework.data.cql.support.IntegrationTestNettyOptions; -import org.springframework.data.cql.support.RandomKeySpaceName; +import org.springframework.data.cassandra.core.cql.keyspace.CreateKeyspaceSpecification; +import org.springframework.data.cassandra.core.cql.keyspace.DropKeyspaceSpecification; +import org.springframework.data.cassandra.support.CassandraConnectionProperties; +import org.springframework.data.cassandra.support.IntegrationTestNettyOptions; +import org.springframework.data.cassandra.support.RandomKeySpaceName; import com.datastax.driver.core.NettyOptions; import com.datastax.driver.core.QueryOptions; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SchemaTestUtils.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SchemaTestUtils.java index 6f9bfe7e1..5700b6519 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SchemaTestUtils.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SchemaTestUtils.java @@ -16,11 +16,11 @@ package org.springframework.data.cassandra.repository.support; import org.springframework.data.cassandra.core.CassandraOperations; +import org.springframework.data.cassandra.core.cql.SessionCallback; +import org.springframework.data.cassandra.core.cql.generator.CreateTableCqlGenerator; +import org.springframework.data.cassandra.core.cql.keyspace.CreateTableSpecification; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; -import org.springframework.data.cql.core.SessionCallback; -import org.springframework.data.cql.core.generator.CreateTableCqlGenerator; -import org.springframework.data.cql.core.keyspace.CreateTableSpecification; import com.datastax.driver.core.KeyspaceMetadata; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryIntegrationTests.java index 76bc37cd8..6fcf524e8 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryIntegrationTests.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.domain.User; import org.springframework.data.cassandra.repository.CassandraRepository; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.data.repository.query.DefaultEvaluationContextProvider; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryUnitTests.java index 01c4f1cd4..6d6295800 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryUnitTests.java @@ -32,12 +32,12 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.annotation.Id; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlOperations; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.UserTypeResolver; import org.springframework.data.cassandra.domain.Person; -import org.springframework.data.cql.core.CqlIdentifier; -import org.springframework.data.cql.core.CqlOperations; import com.datastax.driver.core.UserType; import com.datastax.driver.core.querybuilder.Insert; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepositoryIntegrationTests.java index 52a138542..3714a06d0 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepositoryIntegrationTests.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.cassandra.core.ReactiveCassandraOperations; import org.springframework.data.cassandra.domain.User; import org.springframework.data.cassandra.repository.ReactiveCassandraRepository; -import org.springframework.data.cql.AbstractKeyspaceCreatingIntegrationTest; +import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.data.repository.query.DefaultEvaluationContextProvider; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/AbstractTestJavaConfig.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/AbstractTestJavaConfig.java similarity index 92% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/support/AbstractTestJavaConfig.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/AbstractTestJavaConfig.java index a55eda94a..e1c89dff5 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/AbstractTestJavaConfig.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/AbstractTestJavaConfig.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.support; import org.springframework.context.annotation.Configuration; -import org.springframework.data.cql.config.java.AbstractSessionConfiguration; +import org.springframework.data.cassandra.config.AbstractSessionConfiguration; import com.datastax.driver.core.NettyOptions; import com.datastax.driver.core.QueryOptions; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/BeanDefinitionTestUtils.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/BeanDefinitionTestUtils.java similarity index 98% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/support/BeanDefinitionTestUtils.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/BeanDefinitionTestUtils.java index 81bd60d7d..0c9c61a20 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/BeanDefinitionTestUtils.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/BeanDefinitionTestUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.support; import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraConnectionProperties.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CassandraConnectionProperties.java similarity index 98% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraConnectionProperties.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CassandraConnectionProperties.java index c9f6ef506..d4a542931 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraConnectionProperties.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CassandraConnectionProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.support; import java.io.InputStream; import java.util.Properties; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraVersion.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CassandraVersion.java similarity index 96% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraVersion.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CassandraVersion.java index 9e3045f12..51b30c06d 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CassandraVersion.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CassandraVersion.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.support; import lombok.experimental.UtilityClass; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CqlDataSet.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CqlDataSet.java similarity index 97% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CqlDataSet.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CqlDataSet.java index 5abe654ad..fab942b19 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/CqlDataSet.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/CqlDataSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.support; import lombok.SneakyThrows; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/IntegrationTestNettyOptions.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/IntegrationTestNettyOptions.java similarity index 97% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/support/IntegrationTestNettyOptions.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/IntegrationTestNettyOptions.java index 028ccece3..9c987d385 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/IntegrationTestNettyOptions.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/IntegrationTestNettyOptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.support; import io.netty.channel.EventLoopGroup; import io.netty.util.Timer; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/KeyspaceTestUtils.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/KeyspaceTestUtils.java similarity index 94% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/support/KeyspaceTestUtils.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/KeyspaceTestUtils.java index 9c401e591..9731e05ec 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/KeyspaceTestUtils.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/KeyspaceTestUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.support; import static org.assertj.core.api.Assertions.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/RandomKeySpaceName.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/RandomKeySpaceName.java similarity index 95% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/support/RandomKeySpaceName.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/RandomKeySpaceName.java index cd422860f..c73afaa18 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/support/RandomKeySpaceName.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/RandomKeySpaceName.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql.support; +package org.springframework.data.cassandra.support; import java.util.UUID; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/UserTypeBuilder.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/UserTypeBuilder.java index be1bbf1c8..8ae29a570 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/UserTypeBuilder.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/support/UserTypeBuilder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.springframework.data.cql.core.CqlIdentifier; +import org.springframework.data.cassandra.core.cql.CqlIdentifier; import com.datastax.driver.core.CodecRegistry; import com.datastax.driver.core.DataType; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/AbstractEmbeddedCassandraIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/AbstractEmbeddedCassandraIntegrationTest.java similarity index 95% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/AbstractEmbeddedCassandraIntegrationTest.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/AbstractEmbeddedCassandraIntegrationTest.java index 807ef3ad9..c42f8fa1d 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/AbstractEmbeddedCassandraIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/AbstractEmbeddedCassandraIntegrationTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql; +package org.springframework.data.cassandra.test.util; import java.util.UUID; import org.junit.ClassRule; import org.junit.Rule; -import org.springframework.data.cql.support.CqlDataSet; +import org.springframework.data.cassandra.support.CqlDataSet; import com.datastax.driver.core.Cluster; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/AbstractKeyspaceCreatingIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/AbstractKeyspaceCreatingIntegrationTest.java similarity index 98% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/AbstractKeyspaceCreatingIntegrationTest.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/AbstractKeyspaceCreatingIntegrationTest.java index 30434f615..256724721 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/AbstractKeyspaceCreatingIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/AbstractKeyspaceCreatingIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql; +package org.springframework.data.cassandra.test.util; import org.junit.ClassRule; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/CassandraRule.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraRule.java similarity index 96% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/CassandraRule.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraRule.java index 1a7e6c946..4e84c5641 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/CassandraRule.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraRule.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql; +package org.springframework.data.cassandra.test.util; -import static org.springframework.data.cql.CassandraRule.InvocationMode.*; +import static org.springframework.data.cassandra.test.util.CassandraRule.InvocationMode.*; import java.util.ArrayList; import java.util.HashMap; @@ -24,10 +24,10 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import org.junit.rules.ExternalResource; -import org.springframework.data.cql.core.SessionCallback; -import org.springframework.data.cql.support.CassandraConnectionProperties; -import org.springframework.data.cql.support.CqlDataSet; -import org.springframework.data.cql.support.IntegrationTestNettyOptions; +import org.springframework.data.cassandra.core.cql.SessionCallback; +import org.springframework.data.cassandra.support.CassandraConnectionProperties; +import org.springframework.data.cassandra.support.CqlDataSet; +import org.springframework.data.cassandra.support.IntegrationTestNettyOptions; import org.springframework.util.Assert; import org.springframework.util.SocketUtils; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/EmbeddedCassandraServerHelper.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/EmbeddedCassandraServerHelper.java similarity index 99% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/EmbeddedCassandraServerHelper.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/EmbeddedCassandraServerHelper.java index 15db79ae8..cf706104c 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/EmbeddedCassandraServerHelper.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/EmbeddedCassandraServerHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql; +package org.springframework.data.cassandra.test.util; import static java.util.concurrent.TimeUnit.*; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/KeyspaceRule.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/KeyspaceRule.java similarity index 96% rename from spring-data-cassandra/src/test/java/org/springframework/data/cql/KeyspaceRule.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/KeyspaceRule.java index 761d39567..b39bcd69e 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/KeyspaceRule.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/KeyspaceRule.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cql; +package org.springframework.data.cassandra.test.util; import org.junit.rules.ExternalResource; -import org.springframework.data.cql.support.RandomKeySpaceName; +import org.springframework.data.cassandra.support.RandomKeySpaceName; import org.springframework.util.Assert; import com.datastax.driver.core.Cluster; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/RowMockUtil.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/RowMockUtil.java similarity index 98% rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/RowMockUtil.java rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/RowMockUtil.java index 6197423f1..1cd596731 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/RowMockUtil.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/RowMockUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.cassandra; +package org.springframework.data.cassandra.test.util; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; diff --git a/spring-data-cassandra/src/test/resources/config/spring-data-cassandra-basic.xml b/spring-data-cassandra/src/test/resources/config/spring-data-cassandra-basic.xml index fde0a2017..d16c93295 100644 --- a/spring-data-cassandra/src/test/resources/config/spring-data-cassandra-basic.xml +++ b/spring-data-cassandra/src/test/resources/config/spring-data-cassandra-basic.xml @@ -10,10 +10,10 @@ "> - + - + diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/CassandraNamespaceIntegrationTests-context.xml similarity index 91% rename from spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/CassandraNamespaceIntegrationTests-context.xml index 86f30e646..39108c114 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/xml/CassandraNamespaceIntegrationTests-context.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/CassandraNamespaceIntegrationTests-context.xml @@ -8,10 +8,10 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/cql http://www.springframework.org/schema/cql/spring-cql.xsd"> - + + location="classpath:/config/cassandra-connection.properties,classpath:/org/springframework/data/cassandra/config/cassandra.properties"/> diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml similarity index 89% rename from spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml index 43078af98..fca03cdc8 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml @@ -8,9 +8,9 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + location="classpath:/config/cassandra-connection.properties,classpath:/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.properties"/> - + + location="classpath:/org/springframework/data/cassandra/config/ppncxct.properties"/> - + @@ -29,10 +29,10 @@ class="com.datastax.driver.core.policies.DowngradingConsistencyRetryPolicy"/> + class="org.springframework.data.cassandra.config.TestHostStateListener"/> + class="org.springframework.data.cassandra.config.TestLatencyTracker"/> - + diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/XmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/XmlConfigIntegrationTests-context.xml similarity index 89% rename from spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/XmlConfigIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/XmlConfigIntegrationTests-context.xml index b4c68f7e3..4841c06a6 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/XmlConfigIntegrationTests-context.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/XmlConfigIntegrationTests-context.xml @@ -18,13 +18,13 @@ + class="org.springframework.data.cassandra.config.XmlConfigIntegrationTests.TestClusterBuilderConfigurer"/> - + - + diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/xml/cassandra.properties b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/cassandra.properties similarity index 100% rename from spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/xml/cassandra.properties rename to spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/cassandra.properties diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/ppncxct.properties b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/ppncxct.properties similarity index 100% rename from spring-data-cassandra/src/test/resources/org/springframework/data/cql/config/xml/ppncxct.properties rename to spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/ppncxct.properties diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests-context.xml similarity index 72% rename from spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests-context.xml index 6f6f38f25..140961593 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests-context.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests-context.xml @@ -9,18 +9,18 @@ + entity-base-packages="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey"> + class="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey.Implicit"> + class="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey.Explicit"> + class="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey.ExplicitKey"> @@ -37,5 +37,5 @@ + base-package="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey"/> diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests-context.xml similarity index 76% rename from spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests-context.xml index 5f11f092a..d2f72a402 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests-context.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests-context.xml @@ -9,25 +9,25 @@ + entity-base-packages="org.springframework.data.cassandra.repository.forcequote.config"> + class="org.springframework.data.cassandra.repository.forcequote.config.Implicit"> + class="org.springframework.data.cassandra.repository.forcequote.config.Explicit"> + class="org.springframework.data.cassandra.repository.forcequote.config.ImplicitProperties"> + class="org.springframework.data.cassandra.repository.forcequote.config.ExplicitProperties"> @@ -47,5 +47,5 @@ + base-package="org.springframework.data.cassandra.repository.forcequote.config"/> diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryXmlConfigIntegrationTests-context.xml deleted file mode 100644 index 9b119eac1..000000000 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryXmlConfigIntegrationTests-context.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/minimal/config/AbsoluteMinimumXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/minimal/config/AbsoluteMinimumXmlConfigIntegrationTests-context.xml deleted file mode 100644 index eeccc7749..000000000 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/minimal/config/AbsoluteMinimumXmlConfigIntegrationTests-context.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryXmlConfigIntegrationTests-context.xml deleted file mode 100644 index 8156d0609..000000000 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryXmlConfigIntegrationTests-context.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -