This is an automated email from the ASF dual-hosted git repository.
djkevincr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gora.git
The following commit(s) were added to refs/heads/master by this push:
new 8faaa4a Remove code duplecate introduced by PR #156
new 40fec32 Merge pull request #166 from djkevincr/remove_duplicated_code
8faaa4a is described below
commit 8faaa4a902c9c9981f9e5b2219e0a437813d7849
Author: Kevin Ratnasekera <djkevi...@yahoo.com>
AuthorDate: Fri May 3 13:18:16 2019 +0530
Remove code duplecate introduced by PR #156
---
.../gora/cassandra/serializers/AvroSerializer.java | 21 ---------------------
.../cassandra/serializers/CassandraSerializer.java | 22 +++++++++++++++++++++-
.../cassandra/serializers/NativeSerializer.java | 22 ----------------------
3 files changed, 21 insertions(+), 44 deletions(-)
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java
index fe51a7f..b2d273e 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java
@@ -466,25 +466,4 @@ class AvroSerializer<K, T extends PersistentBase> extends
CassandraSerializer {
}
}
- @Override
- public boolean exists(Object key) throws GoraException {
- try {
- ArrayList<String> cassandraKeys = new ArrayList<>();
- ArrayList<Object> cassandraValues = new ArrayList<>();
- AvroCassandraUtils.processKeys(mapping, key, cassandraKeys,
cassandraValues);
- String cqlQuery = CassandraQueryFactory.getCheckExistsQuery(mapping,
cassandraKeys);
- SimpleStatement statement = new SimpleStatement(cqlQuery,
cassandraValues.toArray());
- if (readConsistencyLevel != null) {
-
statement.setConsistencyLevel(ConsistencyLevel.valueOf(readConsistencyLevel));
- }
- ResultSet resultSet = client.getSession().execute(statement);
- Iterator<Row> iterator = resultSet.iterator();
- Row next = iterator.next();
- long aInt = next.getLong(0);
- return aInt != 0;
- } catch (Exception e) {
- throw new GoraException(e);
- }
- }
-
}
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java
index 11047bf..478f71a 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java
@@ -17,6 +17,7 @@
package org.apache.gora.cassandra.serializers;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -36,6 +37,7 @@ import org.slf4j.LoggerFactory;
import com.datastax.driver.core.ConsistencyLevel;
import com.datastax.driver.core.KeyspaceMetadata;
import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.Row;
import com.datastax.driver.core.SimpleStatement;
import com.datastax.driver.core.TableMetadata;
@@ -186,7 +188,25 @@ public abstract class CassandraSerializer<K, T extends
Persistent> {
* @param key key value
* @return true/false
*/
- public abstract boolean exists(K key) throws GoraException;
+ public boolean exists(Object key) throws GoraException {
+ try {
+ ArrayList<String> cassandraKeys = new ArrayList<>();
+ ArrayList<Object> cassandraValues = new ArrayList<>();
+ AvroCassandraUtils.processKeys(mapping, key, cassandraKeys,
cassandraValues);
+ String cqlQuery = CassandraQueryFactory.getCheckExistsQuery(mapping,
cassandraKeys);
+ SimpleStatement statement = new SimpleStatement(cqlQuery,
cassandraValues.toArray());
+ if (readConsistencyLevel != null) {
+
statement.setConsistencyLevel(ConsistencyLevel.valueOf(readConsistencyLevel));
+ }
+ ResultSet resultSet = client.getSession().execute(statement);
+ Iterator<Row> iterator = resultSet.iterator();
+ Row next = iterator.next();
+ long count = next.getLong(0);
+ return count != 0;
+ } catch (Exception e) {
+ throw new GoraException(e);
+ }
+ }
/**
* Deletes persistent value according to the key
diff --git
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java
index edf1173..dd3b3ed 100644
---
a/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java
+++
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java
@@ -36,7 +36,6 @@ import org.slf4j.LoggerFactory;
import com.datastax.driver.core.ConsistencyLevel;
import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.Row;
import com.datastax.driver.core.SimpleStatement;
import com.datastax.driver.mapping.Mapper;
import com.datastax.driver.mapping.MappingManager;
@@ -260,25 +259,4 @@ class NativeSerializer<K, T extends Persistent> extends
CassandraSerializer {
return key;
}
- @Override
- public boolean exists(Object key) throws GoraException {
- try {
- ArrayList<String> cassandraKeys = new ArrayList<>();
- ArrayList<Object> cassandraValues = new ArrayList<>();
- AvroCassandraUtils.processKeys(mapping, key, cassandraKeys,
cassandraValues);
- String cqlQuery = CassandraQueryFactory.getCheckExistsQuery(mapping,
cassandraKeys);
- SimpleStatement statement = new SimpleStatement(cqlQuery,
cassandraValues.toArray());
- if (readConsistencyLevel != null) {
-
statement.setConsistencyLevel(ConsistencyLevel.valueOf(readConsistencyLevel));
- }
- ResultSet resultSet = client.getSession().execute(statement);
- Iterator<Row> iterator = resultSet.iterator();
- Row next = iterator.next();
- long aInt = next.getLong(0);
- return aInt != 0;
- } catch (Exception e) {
- throw new GoraException(e);
- }
- }
-
}
