DATACASS-446 - Resolve package cycles.

* Resolve cycle between o.s.d.c.cql.core and o.s.d.c.cql.support via CassandraAccessor.
* Resolve cycle between o.s.d.c.cql.core.support and o.s.d.c.cql.support via CQLExceptionTranslator.
* Resolve cycle between o.s.d.c.cql.config and o.s.d.c.cql.core.keyspace via KeyspaceAttributes/DataCenterReplication.

Author: mp911de

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

@@ -38,7 +38,7 @@
 import org.springframework.data.cql.core.WriteOptions;
 import org.springframework.data.cql.core.session.DefaultSessionFactory;
 import org.springframework.data.cql.core.session.SessionFactory;
-import org.springframework.data.cql.core.support.CQLExceptionTranslator;
+import org.springframework.data.cql.support.CqlExceptionTranslator;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.concurrent.ListenableFuture;
@@ -87,7 +87,7 @@ public class AsyncCassandraTemplate implements AsyncCassandraOperations {
 
 	private final CassandraMappingContext mappingContext;
 
-	private final CQLExceptionTranslator exceptionTranslator;
+	private final CqlExceptionTranslator exceptionTranslator;
 
 	private final StatementFactory statementFactory;
 

spring-data-cassandra/src/main/java/org/springframework/data/cql/config/xml/CassandraCqlClusterParser.java

@@ -30,11 +30,11 @@
 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.KeyspaceAttributes;
 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.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;

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

@@ -24,7 +24,6 @@
 import org.springframework.dao.support.DataAccessUtils;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.cql.core.session.SessionFactory;
-import org.springframework.data.cql.support.CassandraAccessor;
 import org.springframework.util.Assert;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.SettableListenableFuture;
@@ -77,7 +76,7 @@
  * @see RowMapper
  * @see org.springframework.dao.support.PersistenceExceptionTranslator
  */
-public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOperations {
+public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOperations {
 
 	/**
 	 * Create a new, uninitialized {@link AsyncCqlTemplate}. Note: The {@link SessionFactory} has to be set before using

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

@@ -24,7 +24,6 @@
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.DataAccessUtils;
 import org.springframework.data.cql.core.session.SessionFactory;
-import org.springframework.data.cql.support.CassandraAccessor;
 import org.springframework.util.Assert;
 
 import com.datastax.driver.core.BoundStatement;
@@ -77,7 +76,7 @@
  * @see RowMapper
  * @see org.springframework.dao.support.PersistenceExceptionTranslator
  */
-public class CqlTemplate extends CassandraAccessor implements CqlOperations {
+public class CqlTemplate extends CqlTemplateSupport implements CqlOperations {
 
 	/**
 	 * Create a new, uninitialized {@link CqlTemplate}. Note: The {@link SessionFactory} has to be set before using the

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

@@ -0,0 +1,148 @@
+/*
+ * 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 <T> RowMapperResultSetExtractor<T> newResultSetExtractor(RowMapper<T> 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 <T> RowMapperResultSetExtractor<T> newResultSetExtractor(RowMapper<T> 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<Map<String, Object>> 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 <T> RowMapper<T> newSingleColumnRowMapper(Class<T> 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<Object> {
+
+		private final RowCallbackHandler rowCallbackHandler;
+
+		protected RowCallbackHandlerResultSetExtractor(RowCallbackHandler rowCallbackHandler) {
+			this.rowCallbackHandler = rowCallbackHandler;
+		}
+
+		/* (non-Javadoc)
+		 *
+		  @see org.springframework.cassandra.core.ResultSetExtractor#extractData(com.datastax.driver.core.ResultSet)
+		 */
+		@Override
+		public Object extractData(ResultSet resultSet) {
+
+			StreamSupport.stream(resultSet.spliterator(), false).forEach(rowCallbackHandler::processRow);
+
+			return null;
+		}
+	}
+
+}

spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/CreateKeyspaceCqlGenerator.java

@@ -19,8 +19,8 @@
 
 import java.util.Map;
 
-import org.springframework.data.cql.config.KeyspaceAttributes;
 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.core.keyspace.Option;
 

spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/CreateKeyspaceSpecification.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.cql.core.keyspace;
 
-import org.springframework.data.cql.config.DataCenterReplication;
 import org.springframework.data.cql.core.KeyspaceIdentifier;
 import org.springframework.data.cql.core.keyspace.KeyspaceOption.ReplicationStrategy;
 import org.springframework.data.cql.core.util.MapBuilder;

spring-data-cassandra/src/main/java/org/springframework/data/cql/config/DataCenterReplication.java renamed to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/DataCenterReplication.java

@@ -1,19 +1,19 @@
 /*
- * Copyright 2013-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.
  * 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.cql.config;
+package org.springframework.data.cql.core.keyspace;
 
 /**
  * Simple data structure to be used when setting the replication factor for a given data center.

spring-data-cassandra/src/main/java/org/springframework/data/cql/config/KeyspaceAttributes.java renamed to spring-data-cassandra/src/main/java/org/springframework/data/cql/core/keyspace/KeyspaceAttributes.java

@@ -1,27 +1,24 @@
 /*
- * Copyright 2013-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.
  * 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.cql.config;
+package org.springframework.data.cql.core.keyspace;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.data.cql.core.keyspace.DefaultOption;
-import org.springframework.data.cql.core.keyspace.KeyspaceOption;
 import org.springframework.data.cql.core.keyspace.KeyspaceOption.ReplicationStrategy;
-import org.springframework.data.cql.core.keyspace.Option;
 import org.springframework.data.cql.core.util.MapBuilder;
 
 /**