Projects information

Chunk

Conflicting content
/** * @author Alex Shvid */ <<<<<<< HEAD public final class BeanNames { private BeanNames() { } public static final String CASSANDRA_CLUSTER = "cassandra-cluster"; public static final String CASSANDRA_KEYSPACE = "cassandra-keyspace"; ======= public abstract class BeanNames { static final String CASSANDRA_CLUSTER = "cassandra-cluster"; static final String CASSANDRA_KEYSPACE = "cassandra-keyspace"; >>>>>>> be3ff7819358e4bb1caa3db09e87bd0d433ff52d }

Conflicting content

/**
 * @author Alex Shvid
 */
<<<<<<< HEAD
public final class BeanNames {

	private BeanNames() {
	}

	public static final String CASSANDRA_CLUSTER = "cassandra-cluster";
	public static final String CASSANDRA_KEYSPACE = "cassandra-keyspace";

=======
public abstract class BeanNames {

	static final String CASSANDRA_CLUSTER = "cassandra-cluster";
	static final String CASSANDRA_KEYSPACE = "cassandra-keyspace";

>>>>>>> be3ff7819358e4bb1caa3db09e87bd0d433ff52d
}

Solution content
/** * @author Alex Shvid */ public final class BeanNames { private BeanNames() { } public static final String CASSANDRA_CLUSTER = "cassandra-cluster"; public static final String CASSANDRA_KEYSPACE = "cassandra-keyspace"; }

Solution content

/**
 * @author Alex Shvid
 */
public final class BeanNames {

	private BeanNames() {
	}

	public static final String CASSANDRA_CLUSTER = "cassandra-cluster";
	public static final String CASSANDRA_KEYSPACE = "cassandra-keyspace";

}

File
BeanNames.java

Developer's decision
Version 1

Kind of conflict
Attribute
Class signature
Method declaration

Chunk

Conflicting content
import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; <<<<<<< HEAD import com.datastax.driver.core.exceptions.NoHostAvailableException; import com.datastax.driver.core.querybuilder.Batch; ======= >>>>>>> be3ff7819358e4bb1caa3db09e87bd0d433ff52d /** * The Cassandra Template is a convenience API for all Cassnadta DML Operations.

Conflicting content

import com.datastax.driver.core.ResultSetFuture;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
<<<<<<< HEAD
import com.datastax.driver.core.exceptions.NoHostAvailableException;
import com.datastax.driver.core.querybuilder.Batch;
=======
>>>>>>> be3ff7819358e4bb1caa3db09e87bd0d433ff52d

/**
 * The Cassandra Template is a convenience API for all Cassnadta DML Operations.

Solution content
import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.NoHostAvailableException; import com.datastax.driver.core.querybuilder.Batch; /** * The Cassandra Template is a convenience API for all Cassnadta DML Operations.

Solution content

import com.datastax.driver.core.ResultSetFuture;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.exceptions.NoHostAvailableException;
import com.datastax.driver.core.querybuilder.Batch;

/**
 * The Cassandra Template is a convenience API for all Cassnadta DML Operations.

File
CassandraTemplate.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
public String getTableName(Class entityClass) { return determineTableName(entityClass); } <<<<<<< HEAD /* (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List) / @Override public List insert(List entities) { String tableName = getTableName(entities.get(0).getClass()); Assert.notNull(tableName); return insert(entities, tableName); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String) / @Override public List insert(List entities, String tableName) { return insert(entities, tableName, new HashMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String, java.util.Map) / @Override public List insert(List entities, String tableName, Map optionsByName) { Assert.notNull(entities); Assert.notEmpty(entities); Assert.notNull(tableName); Assert.notNull(optionsByName); return doBatchInsert(tableName, entities, optionsByName, false); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String, org.springframework.data.cassandra.core.QueryOptions) / @Override public List insert(List entities, String tableName, QueryOptions options) { return insert(entities, tableName, options.toMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object) / @Override public T insert(T entity) { String tableName = determineTableName(entity); Assert.notNull(tableName); return insert(entity, tableName); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String) / @Override public T insert(T entity, String tableName) { return insert(entity, tableName, new HashMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String, java.util.Map) / @Override public T insert(T entity, String tableName, Map optionsByName) { Assert.notNull(entity); Assert.notNull(tableName); ensureNotIterable(entity); return doInsert(tableName, entity, optionsByName, false); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String, org.springframework.data.cassandra.core.QueryOptions) / @Override public T insert(T entity, String tableName, QueryOptions options) { return insert(entity, tableName, options.toMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List) / @Override public List insertAsynchronously(List entities) { String tableName = getTableName(entities.get(0).getClass()); Assert.notNull(tableName); return insertAsynchronously(entities, tableName); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String) / @Override public List insertAsynchronously(List entities, String tableName) { return insertAsynchronously(entities, tableName, new HashMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String, java.util.Map) / @Override public List insertAsynchronously(List entities, String tableName, Map optionsByName) { Assert.notNull(entities); Assert.notEmpty(entities); Assert.notNull(tableName); Assert.notNull(optionsByName); return doBatchInsert(tableName, entities, optionsByName, true); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String, org.springframework.data.cassandra.core.QueryOptions) / @Override public List insertAsynchronously(List entities, String tableName, QueryOptions options) { return insertAsynchronously(entities, tableName, options.toMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object) / @Override public T insertAsynchronously(T entity) { String tableName = determineTableName(entity); Assert.notNull(tableName); return insertAsynchronously(entity, tableName); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String) / @Override public T insertAsynchronously(T entity, String tableName) { return insertAsynchronously(entity, tableName, new HashMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String, java.util.Map) / @Override public T insertAsynchronously(T entity, String tableName, Map optionsByName) { Assert.notNull(entity); Assert.notNull(tableName); Assert.notNull(optionsByName); ensureNotIterable(entity); return doInsert(tableName, entity, optionsByName, true); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String, org.springframework.data.cassandra.core.QueryOptions) / @Override public T insertAsynchronously(T entity, String tableName, QueryOptions options) { return insertAsynchronously(entity, tableName, options.toMap()); ======= public ResultSet executeQuery(String query) { try { return session.execute(query); } catch (RuntimeException e) { throw potentiallyConvertRuntimeException(e); } >>>>>>> be3ff7819358e4bb1caa3db09e87bd0d433ff52d } / (non-Javadoc)

Conflicting content

	public String getTableName(Class entityClass) {
		return determineTableName(entityClass);
	}
<<<<<<< HEAD
	/* (non-Javadoc)

	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List)
	 */
	@Override
	public  List insert(List entities) {
		String tableName = getTableName(entities.get(0).getClass());
		Assert.notNull(tableName);
		return insert(entities, tableName);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String)
	 */
	@Override
	public  List insert(List entities, String tableName) {
		return insert(entities, tableName, new HashMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String, java.util.Map)
	 */
	@Override
	public  List insert(List entities, String tableName, Map optionsByName) {
		Assert.notNull(entities);
		Assert.notEmpty(entities);
		Assert.notNull(tableName);
		Assert.notNull(optionsByName);
		return doBatchInsert(tableName, entities, optionsByName, false);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String, org.springframework.data.cassandra.core.QueryOptions)
	 */
	@Override
	public  List insert(List entities, String tableName, QueryOptions options) {
		return insert(entities, tableName, options.toMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object)
	 */
	@Override
	public  T insert(T entity) {
		String tableName = determineTableName(entity);
		Assert.notNull(tableName);
		return insert(entity, tableName);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String)
	 */
	@Override
	public  T insert(T entity, String tableName) {
		return insert(entity, tableName, new HashMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String, java.util.Map)
	 */
	@Override
	public  T insert(T entity, String tableName, Map optionsByName) {
		Assert.notNull(entity);
		Assert.notNull(tableName);
		ensureNotIterable(entity);
		return doInsert(tableName, entity, optionsByName, false);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String, org.springframework.data.cassandra.core.QueryOptions)
	 */
	@Override
	public  T insert(T entity, String tableName, QueryOptions options) {
		return insert(entity, tableName, options.toMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List)
	 */
	@Override
	public  List insertAsynchronously(List entities) {
		String tableName = getTableName(entities.get(0).getClass());
		Assert.notNull(tableName);
		return insertAsynchronously(entities, tableName);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String)
	 */
	@Override
	public  List insertAsynchronously(List entities, String tableName) {
		return insertAsynchronously(entities, tableName, new HashMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String, java.util.Map)
	 */
	@Override
	public  List insertAsynchronously(List entities, String tableName, Map optionsByName) {
		Assert.notNull(entities);
		Assert.notEmpty(entities);
		Assert.notNull(tableName);
		Assert.notNull(optionsByName);
		return doBatchInsert(tableName, entities, optionsByName, true);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String, org.springframework.data.cassandra.core.QueryOptions)
	 */
	@Override
	public  List insertAsynchronously(List entities, String tableName, QueryOptions options) {
		return insertAsynchronously(entities, tableName, options.toMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object)
	 */
	@Override
	public  T insertAsynchronously(T entity) {
		String tableName = determineTableName(entity);
		Assert.notNull(tableName);
		return insertAsynchronously(entity, tableName);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String)
	 */
	@Override
	public  T insertAsynchronously(T entity, String tableName) {
		return insertAsynchronously(entity, tableName, new HashMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String, java.util.Map)
	 */
	@Override
	public  T insertAsynchronously(T entity, String tableName, Map optionsByName) {
		Assert.notNull(entity);
		Assert.notNull(tableName);
		Assert.notNull(optionsByName);

		ensureNotIterable(entity);

		return doInsert(tableName, entity, optionsByName, true);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String, org.springframework.data.cassandra.core.QueryOptions)
	 */
	@Override
	public  T insertAsynchronously(T entity, String tableName, QueryOptions options) {
		return insertAsynchronously(entity, tableName, options.toMap());
=======
	
	public ResultSet executeQuery(String query) {
		try {
			return session.execute(query);
		} catch (RuntimeException e) {
			throw potentiallyConvertRuntimeException(e);
		}
>>>>>>> be3ff7819358e4bb1caa3db09e87bd0d433ff52d
	}

	/* (non-Javadoc)

Solution content
} public String getTableName(Class entityClass) { return determineTableName(entityClass); } /* (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List) / @Override public List insert(List entities) { String tableName = getTableName(entities.get(0).getClass()); Assert.notNull(tableName); return insert(entities, tableName); / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String) / @Override public List insert(List entities, String tableName) { return insert(entities, tableName, new HashMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String, java.util.Map) / @Override public List insert(List entities, String tableName, Map optionsByName) { Assert.notNull(entities); Assert.notEmpty(entities); Assert.notNull(tableName); Assert.notNull(optionsByName); return doBatchInsert(tableName, entities, optionsByName, false); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String, org.springframework.data.cassandra.core.QueryOptions) / @Override public List insert(List entities, String tableName, QueryOptions options) { return insert(entities, tableName, options.toMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object) / @Override public T insert(T entity) { String tableName = determineTableName(entity); Assert.notNull(tableName); return insert(entity, tableName); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String) / @Override public T insert(T entity, String tableName) { return insert(entity, tableName, new HashMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String, java.util.Map) / @Override public T insert(T entity, String tableName, Map optionsByName) { Assert.notNull(entity); Assert.notNull(tableName); ensureNotIterable(entity); return doInsert(tableName, entity, optionsByName, false); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String, org.springframework.data.cassandra.core.QueryOptions) / @Override public T insert(T entity, String tableName, QueryOptions options) { return insert(entity, tableName, options.toMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List) / @Override public List insertAsynchronously(List entities) { String tableName = getTableName(entities.get(0).getClass()); Assert.notNull(tableName); return insertAsynchronously(entities, tableName); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String) / @Override public List insertAsynchronously(List entities, String tableName) { return insertAsynchronously(entities, tableName, new HashMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String, java.util.Map) / @Override public List insertAsynchronously(List entities, String tableName, Map optionsByName) { Assert.notNull(entities); Assert.notEmpty(entities); Assert.notNull(tableName); Assert.notNull(optionsByName); return doBatchInsert(tableName, entities, optionsByName, true); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String, org.springframework.data.cassandra.core.QueryOptions) / @Override public List insertAsynchronously(List entities, String tableName, QueryOptions options) { return insertAsynchronously(entities, tableName, options.toMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object) / @Override public T insertAsynchronously(T entity) { String tableName = determineTableName(entity); Assert.notNull(tableName); return insertAsynchronously(entity, tableName); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String) / @Override public T insertAsynchronously(T entity, String tableName) { return insertAsynchronously(entity, tableName, new HashMap()); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String, java.util.Map) / @Override public T insertAsynchronously(T entity, String tableName, Map optionsByName) { Assert.notNull(entity); Assert.notNull(tableName); Assert.notNull(optionsByName); ensureNotIterable(entity); return doInsert(tableName, entity, optionsByName, true); } / (non-Javadoc) * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String, org.springframework.data.cassandra.core.QueryOptions) / @Override public T insertAsynchronously(T entity, String tableName, QueryOptions options) { return insertAsynchronously(entity, tableName, options.toMap()); } / (non-Javadoc)

Solution content

	}
	public String getTableName(Class entityClass) {
		return determineTableName(entityClass);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List)
	 */
	@Override
	public  List insert(List entities) {
		String tableName = getTableName(entities.get(0).getClass());
		Assert.notNull(tableName);
		return insert(entities, tableName);

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String)
	 */
	@Override
	public  List insert(List entities, String tableName) {
		return insert(entities, tableName, new HashMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String, java.util.Map)
	 */
	@Override
	public  List insert(List entities, String tableName, Map optionsByName) {
		Assert.notNull(entities);
		Assert.notEmpty(entities);
		Assert.notNull(tableName);
		Assert.notNull(optionsByName);
		return doBatchInsert(tableName, entities, optionsByName, false);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.util.List, java.lang.String, org.springframework.data.cassandra.core.QueryOptions)
	 */
	@Override
	public  List insert(List entities, String tableName, QueryOptions options) {
		return insert(entities, tableName, options.toMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object)
	 */
	@Override
	public  T insert(T entity) {
		String tableName = determineTableName(entity);
		Assert.notNull(tableName);
		return insert(entity, tableName);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String)
	 */
	@Override
	public  T insert(T entity, String tableName) {
		return insert(entity, tableName, new HashMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String, java.util.Map)
	 */
	@Override
	public  T insert(T entity, String tableName, Map optionsByName) {
		Assert.notNull(entity);
		Assert.notNull(tableName);
		ensureNotIterable(entity);
		return doInsert(tableName, entity, optionsByName, false);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, java.lang.String, org.springframework.data.cassandra.core.QueryOptions)
	 */
	@Override
	public  T insert(T entity, String tableName, QueryOptions options) {
		return insert(entity, tableName, options.toMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List)
	 */
	@Override
	public  List insertAsynchronously(List entities) {
		String tableName = getTableName(entities.get(0).getClass());
		Assert.notNull(tableName);
		return insertAsynchronously(entities, tableName);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String)
	 */
	@Override
	public  List insertAsynchronously(List entities, String tableName) {
		return insertAsynchronously(entities, tableName, new HashMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String, java.util.Map)
	 */
	@Override
	public  List insertAsynchronously(List entities, String tableName, Map optionsByName) {
		Assert.notNull(entities);
		Assert.notEmpty(entities);
		Assert.notNull(tableName);
		Assert.notNull(optionsByName);
		return doBatchInsert(tableName, entities, optionsByName, true);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.util.List, java.lang.String, org.springframework.data.cassandra.core.QueryOptions)
	 */
	@Override
	public  List insertAsynchronously(List entities, String tableName, QueryOptions options) {
		return insertAsynchronously(entities, tableName, options.toMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object)
	 */
	@Override
	public  T insertAsynchronously(T entity) {
		String tableName = determineTableName(entity);
		Assert.notNull(tableName);
		return insertAsynchronously(entity, tableName);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String)
	 */
	@Override
	public  T insertAsynchronously(T entity, String tableName) {
		return insertAsynchronously(entity, tableName, new HashMap());
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String, java.util.Map)
	 */
	@Override
	public  T insertAsynchronously(T entity, String tableName, Map optionsByName) {
		Assert.notNull(entity);
		Assert.notNull(tableName);
		Assert.notNull(optionsByName);

		ensureNotIterable(entity);

		return doInsert(tableName, entity, optionsByName, true);
	}

	/* (non-Javadoc)
	 * @see org.springframework.data.cassandra.core.CassandraOperations#insertAsynchronously(java.lang.Object, java.lang.String, org.springframework.data.cassandra.core.QueryOptions)
	 */
	@Override
	public  T insertAsynchronously(T entity, String tableName, QueryOptions options) {
		return insertAsynchronously(entity, tableName, options.toMap());
	}

	/* (non-Javadoc)

File
CassandraTemplate.java

Developer's decision
Version 1

Kind of conflict
Annotation
Comment
Method declaration
Method invocation
Method signature
Return statement
Try statement

Projects >> spring-data-cassandra >>b2a0a0eab44916c6dd35a0949baaa78f2132a490