simplify enum comparisons - and avoid possible npes

hector-client · Oct 17, 2011 · e45b71c · e45b71c
1 parent 562b61f
commit e45b71c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/core/src/main/java/me/prettyprint/cassandra/model/ConfigurableConsistencyLevel.java b/core/src/main/java/me/prettyprint/cassandra/model/ConfigurableConsistencyLevel.java
@@ -24,12 +24,12 @@ public class ConfigurableConsistencyLevel implements ConsistencyLevelPolicy {
 
   @Override
   public HConsistencyLevel get(OperationType op) {
-    return op.equals(OperationType.READ) ? defaultReadConsistencyLevel : defaultWriteConsistencyLevel;
+    return (op == OperationType.READ) ? defaultReadConsistencyLevel : defaultWriteConsistencyLevel;
   }
 
   @Override
   public HConsistencyLevel get(OperationType op, String cfName) {
-    if (op.equals(OperationType.READ)) {
+    if (op == OperationType.READ) {
       HConsistencyLevel rcf = readCfConsistencyLevels.get(cfName);
       return rcf != null ? rcf : defaultReadConsistencyLevel;
     } else {
@@ -49,7 +49,7 @@ public void setWriteCfConsistencyLevels(Map<String, HConsistencyLevel> columnFam
   public void setConsistencyLevelForCfOperation(HConsistencyLevel consistencyLevel,
       String columnFamily,
       OperationType operationType) {
-    if ( operationType.equals(OperationType.READ)) {
+    if (operationType == OperationType.READ) {
       readCfConsistencyLevels.put(columnFamily, consistencyLevel);
     } else {
       writeCfConsistencyLevels.put(columnFamily, consistencyLevel);

diff --git a/core/src/main/java/me/prettyprint/cassandra/model/CqlRows.java b/core/src/main/java/me/prettyprint/cassandra/model/CqlRows.java
@@ -57,7 +57,7 @@ public CqlRows() {
    * @return
    */
   public int getAsCount() {
-    if ( !resultType.equals(CqlResultType.INT)) 
+    if (resultType != CqlResultType.INT) 
       throw new IllegalArgumentException("Attempted to extract count from the wrong type of CQL query: " + resultType.toString());
     return count;
   }

diff --git a/core/src/main/java/me/prettyprint/cassandra/service/Operation.java b/core/src/main/java/me/prettyprint/cassandra/service/Operation.java
@@ -42,7 +42,7 @@ public abstract class Operation<T> {
   public final OperationType operationType;
 
   public Operation(OperationType operationType) {
-    this.failCounter = operationType.equals(OperationType.READ) ? Counter.READ_FAIL :
+    this.failCounter = (operationType == OperationType.READ) ? Counter.READ_FAIL :
       Counter.WRITE_FAIL;
     this.operationType = operationType;
     this.stopWatchTagName = operationType.name();
@@ -53,7 +53,7 @@ public Operation(OperationType operationType, Map<String, String> credentials) {
   }
 
   public Operation(OperationType operationType, FailoverPolicy failoverPolicy, String keyspaceName, Map<String, String> credentials) {
-    this.failCounter = operationType.equals(OperationType.READ) ? Counter.READ_FAIL :
+    this.failCounter = (operationType == OperationType.READ) ? Counter.READ_FAIL :
       Counter.WRITE_FAIL;
     this.operationType = operationType;
     this.stopWatchTagName = operationType.name();