diff --git a/astyanax-cassandra/src/main/java/com/netflix/astyanax/AbstractColumnListMutation.java b/astyanax-cassandra/src/main/java/com/netflix/astyanax/AbstractColumnListMutation.java index acef02f19..a8050d703 100644 --- a/astyanax-cassandra/src/main/java/com/netflix/astyanax/AbstractColumnListMutation.java +++ b/astyanax-cassandra/src/main/java/com/netflix/astyanax/AbstractColumnListMutation.java @@ -37,7 +37,7 @@ */ public abstract class AbstractColumnListMutation implements ColumnListMutation { protected long timestamp; - protected Integer defaultTtl = null; + protected Integer defaultTtl; public AbstractColumnListMutation(long timestamp) { this.timestamp = timestamp; diff --git a/astyanax-cassandra/src/main/java/com/netflix/astyanax/AstyanaxContext.java b/astyanax-cassandra/src/main/java/com/netflix/astyanax/AstyanaxContext.java index c9b02e906..cce6eaa45 100644 --- a/astyanax-cassandra/src/main/java/com/netflix/astyanax/AstyanaxContext.java +++ b/astyanax-cassandra/src/main/java/com/netflix/astyanax/AstyanaxContext.java @@ -106,7 +106,7 @@ public NodeDiscoveryType getNodeDiscoveryType() { } protected ConnectionPool createConnectionPool(ConnectionFactory connectionFactory) { - ConnectionPool connectionPool = null; + ConnectionPool connectionPool; // HACK to get the CqlFamilyFactory working with AstyanaxContext if (connectionFactory.getClass().getName().contains("CqlFamilyFactory")) { diff --git a/astyanax-cassandra/src/main/java/com/netflix/astyanax/model/AbstractComposite.java b/astyanax-cassandra/src/main/java/com/netflix/astyanax/model/AbstractComposite.java index 3ff6f0d65..ab0bd51c7 100644 --- a/astyanax-cassandra/src/main/java/com/netflix/astyanax/model/AbstractComposite.java +++ b/astyanax-cassandra/src/main/java/com/netflix/astyanax/model/AbstractComposite.java @@ -103,8 +103,8 @@ public static ComponentEquality fromByte(byte equality) { final boolean dynamic; - List> serializersByPosition = null; - List comparatorsByPosition = null; + List> serializersByPosition; + List comparatorsByPosition; public class Component { final Serializer serializer; @@ -190,7 +190,7 @@ public String toString() { List> components = new ArrayList>(); - ByteBuffer serialized = null; + ByteBuffer serialized; public AbstractComposite(boolean dynamic) { this.dynamic = dynamic; @@ -680,7 +680,7 @@ public void deserialize(ByteBuffer b) { serialized = b.duplicate(); components = new ArrayList>(); - String comparator = null; + String comparator; int i = 0; while ((comparator = getComparator(i, b)) != null) { ByteBuffer data = getWithShortLength(b); diff --git a/astyanax-cassandra/src/main/java/com/netflix/astyanax/serializers/SerializerTypeInferer.java b/astyanax-cassandra/src/main/java/com/netflix/astyanax/serializers/SerializerTypeInferer.java index ef890b8e0..a09a595c3 100644 --- a/astyanax-cassandra/src/main/java/com/netflix/astyanax/serializers/SerializerTypeInferer.java +++ b/astyanax-cassandra/src/main/java/com/netflix/astyanax/serializers/SerializerTypeInferer.java @@ -19,7 +19,7 @@ public class SerializerTypeInferer { @SuppressWarnings({ "rawtypes", "unchecked" }) public static Serializer getSerializer(Object value) { - Serializer serializer = null; + Serializer serializer; if (value == null) { serializer = ByteBufferSerializer.get(); } diff --git a/astyanax-cassandra/src/main/java/com/netflix/astyanax/util/JsonRowsWriter.java b/astyanax-cassandra/src/main/java/com/netflix/astyanax/util/JsonRowsWriter.java index 3f60f9769..ba7c59f50 100644 --- a/astyanax-cassandra/src/main/java/com/netflix/astyanax/util/JsonRowsWriter.java +++ b/astyanax-cassandra/src/main/java/com/netflix/astyanax/util/JsonRowsWriter.java @@ -318,7 +318,7 @@ private int writeColumnsAsRows(String rowKey, ColumnList columns, boolean fir columnString = e.getMessage(); // this.errorValueText; } - String valueString = null; + String valueString; try { valueString = serializers.valueAsString(column.getRawName(), column.getByteBufferValue()); } @@ -412,7 +412,7 @@ private void writeColumns(ColumnList columns, boolean first) throws Exception if (this.dynamicNames != null) this.dynamicNames.add(columnString); - String valueString = null; + String valueString; try { valueString = serializers.valueAsString(column.getRawName(), column.getByteBufferValue()); } diff --git a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractExecuteWithFailoverImpl.java b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractExecuteWithFailoverImpl.java index 191238ebb..3678f36ac 100644 --- a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractExecuteWithFailoverImpl.java +++ b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractExecuteWithFailoverImpl.java @@ -51,7 +51,7 @@ * */ public abstract class AbstractExecuteWithFailoverImpl implements ExecuteWithFailover { - protected Connection connection = null; + protected Connection connection; private long startTime; private long poolStartTime; private int attemptCounter = 0; diff --git a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractExecutionImpl.java b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractExecutionImpl.java index 101e868e9..2cf73886e 100644 --- a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractExecutionImpl.java +++ b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractExecutionImpl.java @@ -17,7 +17,7 @@ */ public abstract class AbstractExecutionImpl implements Execution { public OperationResult executeWithRetry(RetryPolicy retry) throws ConnectionException { - ConnectionException lastException = null; + ConnectionException lastException; retry.begin(); do { try { diff --git a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractHostPartitionConnectionPool.java b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractHostPartitionConnectionPool.java index 3dd391944..66a8c8354 100644 --- a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractHostPartitionConnectionPool.java +++ b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/AbstractHostPartitionConnectionPool.java @@ -346,7 +346,7 @@ public OperationResult executeWithFailover(Operation op, RetryPoli } retry.begin(); - ConnectionException lastException = null; + ConnectionException lastException; do { try { OperationResult result = newExecuteWithFailover(op).tryOperation(op); diff --git a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/TokenAwareConnectionPoolImpl.java b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/TokenAwareConnectionPoolImpl.java index d74fe7c2d..74e8d5043 100644 --- a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/TokenAwareConnectionPoolImpl.java +++ b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/TokenAwareConnectionPoolImpl.java @@ -77,7 +77,7 @@ public ExecuteWithFailover newExecuteWithFailover(Operation op roundRobinCounter.set(0); } - AbstractExecuteWithFailoverImpl executeWithFailover = null; + AbstractExecuteWithFailoverImpl executeWithFailover; switch (config.getHostSelectorStrategy()) { case ROUND_ROBIN: executeWithFailover = new RoundRobinExecuteWithFailover(config, monitor, pools, isSorted ? 0 : index); diff --git a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlAbstractExecutionImpl.java b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlAbstractExecutionImpl.java index 7338694ce..9eb22be16 100644 --- a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlAbstractExecutionImpl.java +++ b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/CqlAbstractExecutionImpl.java @@ -82,7 +82,7 @@ public CqlAbstractExecutionImpl(KeyspaceContext ksContext, RetryPolicy retryPoli @Override public OperationResult execute() throws ConnectionException { - ConnectionException lastException = null; + ConnectionException lastException; retry.begin(); @@ -104,7 +104,7 @@ public OperationResult execute() throws ConnectionException { private OperationResult executeOp() throws ConnectionException { - CassandraOperationTracer tracer = null; + CassandraOperationTracer tracer; if (cf != null) { tracer = tracerFactory.newTracer(getOperationType(), cf); @@ -175,7 +175,7 @@ private RetryPolicy getRetryPolicy(RetryPolicy policy) { private ConsistencyLevel getDefaultCL(KeyspaceContext ksContext) { - ConsistencyLevel clLevel = ksContext.getConfig().getDefaultReadConsistencyLevel(); + ConsistencyLevel clLevel = ksContext.getConfig().getDefaultReadConsistencyLevel(); CassandraOperationCategory op = getOperationType().getCategory(); switch (op) { diff --git a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlColumnFamilyDefinitionImpl.java b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlColumnFamilyDefinitionImpl.java index fe325265e..3bd4d90af 100644 --- a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlColumnFamilyDefinitionImpl.java +++ b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/schema/CqlColumnFamilyDefinitionImpl.java @@ -205,13 +205,13 @@ private void createColumnDefinitions() { String defaultBytesType = ComparatorType.BYTESTYPE.getTypeName(); - keyClass = (keyClass == null) ? keyClass = defaultBytesType : keyClass; + keyClass = (keyClass == null) ? defaultBytesType : keyClass; String comparatorClass = (String) optionsMap.remove("comparator"); - comparatorClass = (comparatorClass == null) ? comparatorClass = defaultBytesType : comparatorClass; + comparatorClass = (comparatorClass == null) ? defaultBytesType : comparatorClass; String dataValidationClass = (String) optionsMap.remove("default_validator"); - dataValidationClass = (dataValidationClass == null) ? dataValidationClass = defaultBytesType : dataValidationClass; + dataValidationClass = (dataValidationClass == null) ? defaultBytesType : dataValidationClass; ColumnDefinition key = new CqlColumnDefinitionImpl().setName("key").setValidationClass(keyClass); partitionKeyList.add(key); @@ -311,8 +311,7 @@ private void readColDefinitions() { Collections.sort(tmpList); clusteringKeyList.addAll(tmpList); - tmpList = null; - + List allPrimaryKeyColNames = new ArrayList(); for (ColumnDefinition colDef : partitionKeyList) { allPrimaryKeyColNames.add(colDef.getName()); diff --git a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/util/ConsistencyLevelTransform.java b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/util/ConsistencyLevelTransform.java index 30ac1106f..4abbc1b90 100644 --- a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/util/ConsistencyLevelTransform.java +++ b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/util/ConsistencyLevelTransform.java @@ -12,7 +12,7 @@ public class ConsistencyLevelTransform { public static ConsistencyLevel getConsistencyLevel(com.netflix.astyanax.model.ConsistencyLevel level) { - ConsistencyLevel result = null; + ConsistencyLevel result; switch(level) { case CL_ONE: result = ConsistencyLevel.ONE; diff --git a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/util/CqlTypeMapping.java b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/util/CqlTypeMapping.java index fb3ae2c2f..7631cc72d 100644 --- a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/util/CqlTypeMapping.java +++ b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/util/CqlTypeMapping.java @@ -178,7 +178,7 @@ private static Object getCompositeColumn(Row row, AnnotatedCompositeSerializer clazz = compositeSerializer.getClazz(); - Object obj = null; + Object obj; try { obj = clazz.newInstance(); } catch (Exception e) { diff --git a/astyanax-entity-mapper/src/main/java/com/netflix/astyanax/entitystore/CompositeColumnMapper.java b/astyanax-entity-mapper/src/main/java/com/netflix/astyanax/entitystore/CompositeColumnMapper.java index 9298d8b86..9e9466d35 100644 --- a/astyanax-entity-mapper/src/main/java/com/netflix/astyanax/entitystore/CompositeColumnMapper.java +++ b/astyanax-entity-mapper/src/main/java/com/netflix/astyanax/entitystore/CompositeColumnMapper.java @@ -37,7 +37,7 @@ class CompositeColumnMapper extends AbstractColumnMapper { Column annotation = childField.getAnnotation(Column.class); if ((annotation != null)) { childField.setAccessible(true); - ColumnMapper columnMapper = null; + ColumnMapper columnMapper; Entity compositeAnnotation = childField.getType().getAnnotation(Entity.class); if(compositeAnnotation == null) { columnMapper = new LeafColumnMapper(childField); diff --git a/astyanax-entity-mapper/src/main/java/com/netflix/astyanax/entitystore/MappingUtils.java b/astyanax-entity-mapper/src/main/java/com/netflix/astyanax/entitystore/MappingUtils.java index 3ae3a332d..36499a647 100644 --- a/astyanax-entity-mapper/src/main/java/com/netflix/astyanax/entitystore/MappingUtils.java +++ b/astyanax-entity-mapper/src/main/java/com/netflix/astyanax/entitystore/MappingUtils.java @@ -11,7 +11,7 @@ public class MappingUtils { static com.netflix.astyanax.Serializer getSerializerForField(Field field) { - com.netflix.astyanax.Serializer serializer = null; + com.netflix.astyanax.Serializer serializer; // check if there is explicit @Serializer annotation first Serializer serializerAnnotation = field.getAnnotation(Serializer.class); if(serializerAnnotation != null) { diff --git a/astyanax-examples/src/main/java/com/netflix/astyanax/examples/AstClient.java b/astyanax-examples/src/main/java/com/netflix/astyanax/examples/AstClient.java index 681b839fc..d7709a03d 100644 --- a/astyanax-examples/src/main/java/com/netflix/astyanax/examples/AstClient.java +++ b/astyanax-examples/src/main/java/com/netflix/astyanax/examples/AstClient.java @@ -106,7 +106,7 @@ public void read(int empId) { logger.debug("emp"); for(Iterator> i = cols.iterator(); i.hasNext(); ) { Column c = i.next(); - Object v = null; + Object v; if(c.getName().endsWith("id")) // type induction hack v = c.getIntegerValue(); else diff --git a/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageConsumerImpl.java b/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageConsumerImpl.java index f3b67e001..8255ae5cc 100644 --- a/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageConsumerImpl.java +++ b/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageConsumerImpl.java @@ -114,7 +114,7 @@ List readMessagesFromShardUsingLockManager(String shardName, int List readMessagesFromShardUsingDefaultLock(String shardName, int itemsToPop) throws MessageQueueException, BusyLockException { MutationBatch m = null; MessageQueueEntry lockColumn = null; - ColumnListMutation rowMutation = null; + ColumnListMutation rowMutation; int lockColumnCount = 0; // Try locking first try { diff --git a/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageQueueDispatcher.java b/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageQueueDispatcher.java index a8e0a4398..9ea9b9a62 100644 --- a/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageQueueDispatcher.java +++ b/astyanax-queue/src/main/java/com/netflix/astyanax/recipes/queue/MessageQueueDispatcher.java @@ -243,7 +243,7 @@ public void run() { while (!terminate) { // Process events in a tight loop, until asked to terminate - Collection messages = null; + Collection messages; try { messages = consumer.readMessages(batchSize); if (messages.isEmpty()) { diff --git a/astyanax-recipes/src/main/java/com/netflix/astyanax/recipes/ReverseIndexQuery.java b/astyanax-recipes/src/main/java/com/netflix/astyanax/recipes/ReverseIndexQuery.java index e5a387d62..a6f936ff3 100644 --- a/astyanax-recipes/src/main/java/com/netflix/astyanax/recipes/ReverseIndexQuery.java +++ b/astyanax-recipes/src/main/java/com/netflix/astyanax/recipes/ReverseIndexQuery.java @@ -240,7 +240,7 @@ protected void internalRun() { } // Read the index shards - OperationResult> result = null; + OperationResult> result; try { result = ks.prepareQuery(cfIndex).setConsistencyLevel(consistencyLevel).withRetryPolicy(retry) .getKeySlice(keys).withColumnRange(range.setLimit(columnLimit).build()).execute(); @@ -293,7 +293,7 @@ private void paginateIndexShard(final ByteBuffer shard, final V value) { @Override protected void internalRun() { V nextValue = value; - ColumnList result = null; + ColumnList result; List batch = Lists.newArrayListWithCapacity(keyLimit); int pageSize = shardColumnLimit;