From 8af29de100bc4ce719d6549edcfb67355c5828c8 Mon Sep 17 00:00:00 2001 From: David Webb Date: Tue, 3 Dec 2013 08:55:27 -0500 Subject: [PATCH] DATACASS-48 : Changed default empty Map Creation. --- .../cassandra/core/CassandraTemplate.java | 47 +++++++++--------- .../cassandra/core/CassandraDataTemplate.java | 48 +++++++++---------- 2 files changed, 48 insertions(+), 47 deletions(-) diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraTemplate.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraTemplate.java index 88d45da7c..026f7ff4f 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraTemplate.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraTemplate.java @@ -17,6 +17,7 @@ package org.springframework.cassandra.core; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -90,7 +91,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public void execute(final String cql) throws DataAccessException { - doExecute(cql, new HashMap()); + doExecute(cql, Collections. emptyMap()); } /* (non-Javadoc) @@ -124,7 +125,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public T queryAsynchronously(final String cql, ResultSetFutureExtractor rse) throws DataAccessException { - return queryAsynchronously(cql, rse, new HashMap()); + return queryAsynchronously(cql, rse, Collections. emptyMap()); } /* (non-Javadoc) @@ -143,7 +144,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public T query(String cql, ResultSetExtractor rse) throws DataAccessException { - return query(cql, rse, new HashMap()); + return query(cql, rse, Collections. emptyMap()); } /* (non-Javadoc) @@ -176,7 +177,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe * @see org.springframework.cassandra.core.CassandraOperations#query(java.lang.String, org.springframework.cassandra.core.RowCallbackHandler) */ public void query(String cql, RowCallbackHandler rch) throws DataAccessException { - query(cql, rch, new HashMap()); + query(cql, rch, Collections. emptyMap()); } /* (non-Javadoc) @@ -202,42 +203,42 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe * @see org.springframework.cassandra.core.CassandraOperations#query(java.lang.String, org.springframework.cassandra.core.RowMapper) */ public List query(String cql, RowMapper rowMapper) throws DataAccessException { - return query(cql, rowMapper, new HashMap()); + return query(cql, rowMapper, Collections. emptyMap()); } /* (non-Javadoc) * @see org.springframework.cassandra.core.CassandraOperations#queryForList(java.lang.String) */ public List> queryForListOfMap(String cql) throws DataAccessException { - return processListOfMap(doExecute(cql, new HashMap())); + return processListOfMap(doExecute(cql, Collections. emptyMap())); } /* (non-Javadoc) * @see org.springframework.cassandra.core.CassandraOperations#queryForList(java.lang.String, java.lang.Class) */ public List queryForList(String cql, Class elementType) throws DataAccessException { - return processList(doExecute(cql, new HashMap()), elementType); + return processList(doExecute(cql, Collections. emptyMap()), elementType); } /* (non-Javadoc) * @see org.springframework.cassandra.core.CassandraOperations#queryForMap(java.lang.String) */ public Map queryForMap(String cql) throws DataAccessException { - return processMap(doExecute(cql, new HashMap())); + return processMap(doExecute(cql, Collections. emptyMap())); } /* (non-Javadoc) * @see org.springframework.cassandra.core.CassandraOperations#queryForObject(java.lang.String, java.lang.Class) */ public T queryForObject(String cql, Class requiredType) throws DataAccessException { - return processOne(doExecute(cql, new HashMap()), requiredType); + return processOne(doExecute(cql, Collections. emptyMap()), requiredType); } /* (non-Javadoc) * @see org.springframework.cassandra.core.CassandraOperations#queryForObject(java.lang.String, org.springframework.cassandra.core.RowMapper) */ public T queryForObject(String cql, RowMapper rowMapper) throws DataAccessException { - return processOne(doExecute(cql, new HashMap()), rowMapper); + return processOne(doExecute(cql, Collections. emptyMap()), rowMapper); } /** @@ -551,7 +552,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public T query(PreparedStatementCreator psc, ResultSetExtractor rse) throws DataAccessException { - return query(psc, rse, new HashMap()); + return query(psc, rse, Collections. emptyMap()); } /* (non-Javadoc) @@ -579,7 +580,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public void query(PreparedStatementCreator psc, RowCallbackHandler rch) throws DataAccessException { - query(psc, rch, new HashMap()); + query(psc, rch, Collections. emptyMap()); } /* (non-Javadoc) @@ -607,7 +608,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public List query(PreparedStatementCreator psc, RowMapper rowMapper) throws DataAccessException { - return query(psc, rowMapper, new HashMap()); + return query(psc, rowMapper, Collections. emptyMap()); } /* (non-Javadoc) @@ -659,7 +660,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public T query(String cql, PreparedStatementBinder psb, ResultSetExtractor rse) throws DataAccessException { - return query(cql, psb, rse, new HashMap()); + return query(cql, psb, rse, Collections. emptyMap()); } /* (non-Javadoc) @@ -687,7 +688,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public void query(String cql, PreparedStatementBinder psb, RowCallbackHandler rch) throws DataAccessException { - query(cql, psb, rch, new HashMap()); + query(cql, psb, rch, Collections. emptyMap()); } /* (non-Javadoc) @@ -715,7 +716,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public List query(String cql, PreparedStatementBinder psb, RowMapper rowMapper) throws DataAccessException { - return query(cql, psb, rowMapper, new HashMap()); + return query(cql, psb, rowMapper, Collections. emptyMap()); } /* (non-Javadoc) @@ -797,7 +798,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public void ingest(String cql, RowIterator rowIterator) { - ingest(cql, rowIterator, new HashMap()); + ingest(cql, rowIterator, Collections. emptyMap()); } /* (non-Javadoc) @@ -834,7 +835,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public void ingest(String cql, List> rows) { - ingest(cql, rows, new HashMap()); + ingest(cql, rows, Collections. emptyMap()); } /* (non-Javadoc) @@ -876,7 +877,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ @Override public void ingest(String cql, final Object[][] rows) { - ingest(cql, rows, new HashMap()); + ingest(cql, rows, Collections. emptyMap()); } /* (non-Javadoc) @@ -885,7 +886,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe @Override public void truncate(String tableName) throws DataAccessException { Truncate truncate = QueryBuilder.truncate(tableName); - doExecute(truncate.getQueryString(), new HashMap()); + doExecute(truncate.getQueryString(), Collections. emptyMap()); } /** @@ -956,7 +957,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe @Override public T query(PreparedStatementCreator psc, PreparedStatementBinder psb, ResultSetExtractor rse) throws DataAccessException { - return query(psc, psb, rse, new HashMap()); + return query(psc, psb, rse, Collections. emptyMap()); } /* (non-Javadoc) @@ -975,7 +976,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe @Override public void query(PreparedStatementCreator psc, PreparedStatementBinder psb, RowCallbackHandler rch) throws DataAccessException { - query(psc, psb, rch, new HashMap()); + query(psc, psb, rch, Collections. emptyMap()); } /* (non-Javadoc) @@ -994,7 +995,7 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe @Override public List query(PreparedStatementCreator psc, PreparedStatementBinder psb, RowMapper rowMapper) throws DataAccessException { - return query(psc, psb, rowMapper, new HashMap()); + return query(psc, psb, rowMapper, Collections. emptyMap()); } } \ No newline at end of file diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataTemplate.java index 84e933f3a..e5d878536 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataTemplate.java @@ -175,8 +175,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public void delete(List entities, String tableName) { - Map defaultOptions = Collections.emptyMap(); - delete(entities, tableName, defaultOptions); + + delete(entities, tableName, Collections. emptyMap()); } /* (non-Javadoc) @@ -234,8 +234,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public void delete(T entity, String tableName) { - Map defaultOptions = Collections.emptyMap(); - delete(entity, tableName, defaultOptions); + + delete(entity, tableName, Collections. emptyMap()); } /* (non-Javadoc) @@ -292,8 +292,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public void deleteAsynchronously(List entities, String tableName) { - Map defaultOptions = Collections.emptyMap(); - insertAsynchronously(entities, tableName, defaultOptions); + + insertAsynchronously(entities, tableName, Collections. emptyMap()); } /* (non-Javadoc) @@ -351,8 +351,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public void deleteAsynchronously(T entity, String tableName) { - Map defaultOptions = Collections.emptyMap(); - deleteAsynchronously(entity, tableName, defaultOptions); + + deleteAsynchronously(entity, tableName, Collections. emptyMap()); } /* (non-Javadoc) @@ -444,8 +444,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public List insert(List entities, String tableName) { - Map defaultOptions = Collections.emptyMap(); - return insert(entities, tableName, defaultOptions); + + return insert(entities, tableName, Collections. emptyMap()); } /* (non-Javadoc) @@ -503,8 +503,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public T insert(T entity, String tableName) { - Map defaultOptions = Collections.emptyMap(); - return insert(entity, tableName, defaultOptions); + + return insert(entity, tableName, Collections. emptyMap()); } /* (non-Javadoc) @@ -561,8 +561,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public List insertAsynchronously(List entities, String tableName) { - Map defaultOptions = Collections.emptyMap(); - return insertAsynchronously(entities, tableName, defaultOptions); + + return insertAsynchronously(entities, tableName, Collections. emptyMap()); } /* (non-Javadoc) @@ -620,8 +620,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public T insertAsynchronously(T entity, String tableName) { - Map defaultOptions = Collections.emptyMap(); - return insertAsynchronously(entity, tableName, defaultOptions); + + return insertAsynchronously(entity, tableName, Collections. emptyMap()); } /* (non-Javadoc) @@ -713,8 +713,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public List update(List entities, String tableName) { - Map defaultOptions = Collections.emptyMap(); - return update(entities, tableName, defaultOptions); + + return update(entities, tableName, Collections. emptyMap()); } /* (non-Javadoc) @@ -772,8 +772,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public T update(T entity, String tableName) { - Map defaultOptions = Collections.emptyMap(); - return update(entity, tableName, defaultOptions); + + return update(entity, tableName, Collections. emptyMap()); } /* (non-Javadoc) @@ -830,8 +830,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public List updateAsynchronously(List entities, String tableName) { - Map defaultOptions = Collections.emptyMap(); - return updateAsynchronously(entities, tableName, defaultOptions); + + return updateAsynchronously(entities, tableName, Collections. emptyMap()); } /* (non-Javadoc) @@ -889,8 +889,8 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr */ @Override public T updateAsynchronously(T entity, String tableName) { - Map defaultOptions = Collections.emptyMap(); - return updateAsynchronously(entity, tableName, defaultOptions); + + return updateAsynchronously(entity, tableName, Collections. emptyMap()); } /* (non-Javadoc)