From 56f35dbf79e33c9fdc2c7350ee663cc72499e7ec Mon Sep 17 00:00:00 2001 From: Dave Brosius Date: Sat, 6 Apr 2013 17:57:19 -0400 Subject: [PATCH] unused imports warnings cleanups --- .../thrift/AuthorizationException.java | 23 ++++++------------- .../cassandra/config/DatabaseDescriptor.java | 1 - .../apache/cassandra/cql3/AbstractMarker.java | 2 -- .../apache/cassandra/cql3/CFDefinition.java | 1 - .../cassandra/cql3/ColumnNameBuilder.java | 3 --- .../org/apache/cassandra/cql3/Constants.java | 3 --- src/java/org/apache/cassandra/cql3/Maps.java | 1 - src/java/org/apache/cassandra/cql3/Term.java | 5 ---- .../cql3/functions/AbstractFunction.java | 2 -- .../cql3/functions/FunctionCall.java | 1 - .../cassandra/cql3/functions/Functions.java | 2 -- .../cql3/functions/TimeuuidFcts.java | 4 ---- .../cassandra/cql3/functions/TokenFct.java | 2 -- .../cql3/statements/DeleteStatement.java | 1 - .../cql3/statements/ListUsersStatement.java | 1 - .../cql3/statements/SelectStatement.java | 2 -- .../org/apache/cassandra/db/DefsTable.java | 1 - .../org/apache/cassandra/db/Directories.java | 7 +++--- .../org/apache/cassandra/db/ReadCommand.java | 1 - .../org/apache/cassandra/db/SystemTable.java | 5 ---- src/java/org/apache/cassandra/db/Table.java | 1 - .../AbstractCompactionIterable.java | 1 - .../db/compaction/AbstractCompactionTask.java | 2 -- .../db/compaction/CompactionManager.java | 3 --- .../db/compaction/CompactionTask.java | 1 - .../compaction/LeveledCompactionStrategy.java | 1 - .../ParallelCompactionIterable.java | 2 -- .../cassandra/db/marshal/AbstractType.java | 1 - .../cassandra/db/marshal/BooleanType.java | 1 - .../cassandra/db/marshal/CompositeType.java | 2 -- .../db/marshal/CounterColumnType.java | 1 - .../apache/cassandra/db/marshal/DateType.java | 1 - .../cassandra/db/marshal/TimeUUIDType.java | 1 - .../apache/cassandra/db/marshal/UTF8Type.java | 1 - .../apache/cassandra/db/marshal/UUIDType.java | 1 - .../CompressedRandomAccessReader.java | 3 --- .../io/sstable/SSTableBoundedScanner.java | 3 --- .../io/sstable/SSTableIdentityIterator.java | 1 - .../cassandra/locator/LocalStrategy.java | 1 - .../locator/NetworkTopologyStrategy.java | 1 - .../locator/OldNetworkTopologyStrategy.java | 1 - .../cassandra/locator/SimpleStrategy.java | 1 - .../cassandra/service/AntiEntropyService.java | 1 - .../DatacenterSyncWriteResponseHandler.java | 6 ----- .../DatacenterWriteResponseHandler.java | 5 ---- .../service/WriteResponseHandler.java | 3 --- .../streaming/AbstractStreamSession.java | 1 - .../cassandra/streaming/StreamOutSession.java | 2 -- .../cassandra/thrift/ThriftClientState.java | 2 -- .../cassandra/thrift/ThriftValidation.java | 1 - .../apache/cassandra/tracing/TraceState.java | 1 - .../cassandra/transport/SimpleClient.java | 2 -- .../transport/messages/ExecuteMessage.java | 1 - .../transport/messages/PrepareMessage.java | 1 - .../transport/messages/QueryMessage.java | 1 - .../transport/messages/ResultMessage.java | 1 - .../org/apache/cassandra/utils/UUIDGen.java | 4 ---- .../cassandra/cql/jdbc/ClientUtilsTest.java | 1 - .../cassandra/db/ColumnFamilyStoreTest.java | 13 ++++------- .../db/SecondaryIndexColumnSizeTest.java | 2 -- .../db/marshal/CompositeTypeTest.java | 1 - .../cassandra/db/marshal/RoundTripTest.java | 3 --- .../db/marshal/TimeUUIDTypeTest.java | 1 - .../cassandra/dht/BootStrapperTest.java | 1 - .../cassandra/gms/SerializationsTest.java | 1 - .../cassandra/io/LazilyCompactedRowTest.java | 1 - 66 files changed, 15 insertions(+), 140 deletions(-) diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java index 76bc0614e4..c3dd23b002 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java @@ -5,7 +5,7 @@ */ package org.apache.cassandra.thrift; /* - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -13,34 +13,25 @@ package org.apache.cassandra.thrift; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ import org.apache.commons.lang.builder.HashCodeBuilder; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * invalid authorization request (user does not have access to keyspace) @@ -115,7 +106,7 @@ public class AuthorizationException extends Exception implements org.apache.thri public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.WHY, new org.apache.thrift.meta_data.FieldMetaData("why", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.WHY, new org.apache.thrift.meta_data.FieldMetaData("why", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AuthorizationException.class, metaDataMap); @@ -276,14 +267,14 @@ public class AuthorizationException extends Exception implements org.apache.thri while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // WHY if (field.type == org.apache.thrift.protocol.TType.STRING) { this.why = iprot.readString(); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index a57ce9b708..006dfa1e91 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -38,7 +38,6 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DefsTable; import org.apache.cassandra.db.SystemTable; -import org.apache.cassandra.db.Table; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.FSWriteError; diff --git a/src/java/org/apache/cassandra/cql3/AbstractMarker.java b/src/java/org/apache/cassandra/cql3/AbstractMarker.java index 39a2c044ee..d8353a1cea 100644 --- a/src/java/org/apache/cassandra/cql3/AbstractMarker.java +++ b/src/java/org/apache/cassandra/cql3/AbstractMarker.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.cql3; -import java.nio.ByteBuffer; - import org.apache.cassandra.db.marshal.CollectionType; import org.apache.cassandra.exceptions.InvalidRequestException; diff --git a/src/java/org/apache/cassandra/cql3/CFDefinition.java b/src/java/org/apache/cassandra/cql3/CFDefinition.java index 9a366a1fd0..6565a855c5 100644 --- a/src/java/org/apache/cassandra/cql3/CFDefinition.java +++ b/src/java/org/apache/cassandra/cql3/CFDefinition.java @@ -30,7 +30,6 @@ import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ColumnToCollectionType; import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.utils.ByteBufferUtil; /** diff --git a/src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java b/src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java index f7a67de41c..848b4e0100 100644 --- a/src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java +++ b/src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java @@ -18,9 +18,6 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; -import java.util.List; - -import org.apache.cassandra.exceptions.InvalidRequestException; /** * Build a potentially composite column name. diff --git a/src/java/org/apache/cassandra/cql3/Constants.java b/src/java/org/apache/cassandra/cql3/Constants.java index 9366e7d086..096c0a83f3 100644 --- a/src/java/org/apache/cassandra/cql3/Constants.java +++ b/src/java/org/apache/cassandra/cql3/Constants.java @@ -18,11 +18,8 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; -import java.util.Collections; import java.util.List; -import java.util.Set; -import com.google.common.base.Objects; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/cql3/Maps.java b/src/java/org/apache/cassandra/cql3/Maps.java index ed282bfa98..e6d7c7e8a9 100644 --- a/src/java/org/apache/cassandra/cql3/Maps.java +++ b/src/java/org/apache/cassandra/cql3/Maps.java @@ -19,7 +19,6 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/src/java/org/apache/cassandra/cql3/Term.java b/src/java/org/apache/cassandra/cql3/Term.java index d2d7975cfe..347a459bb7 100644 --- a/src/java/org/apache/cassandra/cql3/Term.java +++ b/src/java/org/apache/cassandra/cql3/Term.java @@ -18,13 +18,8 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; -import java.util.Collections; import java.util.List; -import java.util.Set; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.BytesType; -import org.apache.cassandra.db.marshal.MarshalException; import org.apache.cassandra.exceptions.InvalidRequestException; /** diff --git a/src/java/org/apache/cassandra/cql3/functions/AbstractFunction.java b/src/java/org/apache/cassandra/cql3/functions/AbstractFunction.java index dbdecf41ed..ec5ebeeb8e 100644 --- a/src/java/org/apache/cassandra/cql3/functions/AbstractFunction.java +++ b/src/java/org/apache/cassandra/cql3/functions/AbstractFunction.java @@ -17,12 +17,10 @@ */ package org.apache.cassandra.cql3.functions; -import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.exceptions.InvalidRequestException; public abstract class AbstractFunction implements Function { diff --git a/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java b/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java index 14a9b78600..074e3cef65 100644 --- a/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java +++ b/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java @@ -21,7 +21,6 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.Constants; import org.apache.cassandra.cql3.Lists; diff --git a/src/java/org/apache/cassandra/cql3/functions/Functions.java b/src/java/org/apache/cassandra/cql3/functions/Functions.java index a53b1ddbc1..97a0e914fe 100644 --- a/src/java/org/apache/cassandra/cql3/functions/Functions.java +++ b/src/java/org/apache/cassandra/cql3/functions/Functions.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.cql3.functions; -import java.util.HashMap; -import java.util.Map; import java.util.List; import com.google.common.collect.ArrayListMultimap; diff --git a/src/java/org/apache/cassandra/cql3/functions/TimeuuidFcts.java b/src/java/org/apache/cassandra/cql3/functions/TimeuuidFcts.java index 169babcc0b..fd60d51ff4 100644 --- a/src/java/org/apache/cassandra/cql3/functions/TimeuuidFcts.java +++ b/src/java/org/apache/cassandra/cql3/functions/TimeuuidFcts.java @@ -18,16 +18,12 @@ package org.apache.cassandra.cql3.functions; import java.nio.ByteBuffer; -import java.util.Collections; import java.util.Date; import java.util.List; -import org.apache.cassandra.cql3.ColumnSpecification; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.DateType; import org.apache.cassandra.db.marshal.TimeUUIDType; import org.apache.cassandra.db.marshal.LongType; -import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.UUIDGen; diff --git a/src/java/org/apache/cassandra/cql3/functions/TokenFct.java b/src/java/org/apache/cassandra/cql3/functions/TokenFct.java index f1d8605d13..21695cadbb 100644 --- a/src/java/org/apache/cassandra/cql3/functions/TokenFct.java +++ b/src/java/org/apache/cassandra/cql3/functions/TokenFct.java @@ -18,14 +18,12 @@ package org.apache.cassandra.cql3.functions; import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.List; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.Schema; import org.apache.cassandra.cql3.CFDefinition; import org.apache.cassandra.cql3.ColumnNameBuilder; -import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.exceptions.InvalidRequestException; diff --git a/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java b/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java index bb0e8cfc19..cf7d2acd53 100644 --- a/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java @@ -29,7 +29,6 @@ import org.apache.cassandra.db.RowMutation; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.thrift.ThriftValidation; -import org.apache.cassandra.utils.Pair; /** * A DELETE parsed from a CQL query statement. diff --git a/src/java/org/apache/cassandra/cql3/statements/ListUsersStatement.java b/src/java/org/apache/cassandra/cql3/statements/ListUsersStatement.java index ebabf20772..7a1dfec0b7 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ListUsersStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ListUsersStatement.java @@ -20,7 +20,6 @@ package org.apache.cassandra.cql3.statements; import org.apache.cassandra.auth.Auth; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.UnauthorizedException; diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index 3e149235af..093f2456ce 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -32,8 +32,6 @@ import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.*; -import org.apache.cassandra.db.index.SecondaryIndex; -import org.apache.cassandra.db.index.SecondaryIndexManager; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.dht.*; import org.apache.cassandra.exceptions.*; diff --git a/src/java/org/apache/cassandra/db/DefsTable.java b/src/java/org/apache/cassandra/db/DefsTable.java index e64f3c98dc..b96205d9d7 100644 --- a/src/java/org/apache/cassandra/db/DefsTable.java +++ b/src/java/org/apache/cassandra/db/DefsTable.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.*; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/Directories.java b/src/java/org/apache/cassandra/db/Directories.java index e80e05dac8..0890d29ac1 100644 --- a/src/java/org/apache/cassandra/db/Directories.java +++ b/src/java/org/apache/cassandra/db/Directories.java @@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSortedSet; import com.google.common.primitives.Longs; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -101,13 +100,13 @@ public class Directories if (!StorageService.instance.isClientMode()) { - for (File dir : sstableDirectories) + for (File dir : sstableDirectories) { - try + try { FileUtils.createDirectory(dir); } - catch (FSError e) + catch (FSError e) { // don't just let the default exception handler do this, we need the create loop to continue logger.error("Failed to create {} directory", dir); diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java index 27cd1c9113..294da695aa 100644 --- a/src/java/org/apache/cassandra/db/ReadCommand.java +++ b/src/java/org/apache/cassandra/db/ReadCommand.java @@ -33,7 +33,6 @@ import org.apache.cassandra.net.MessageOut; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.IReadCommand; import org.apache.cassandra.service.RowDataResolver; -import org.apache.cassandra.utils.IFilter; public abstract class ReadCommand implements IReadCommand diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java index 0422a21c13..2e36aebc4b 100644 --- a/src/java/org/apache/cassandra/db/SystemTable.java +++ b/src/java/org/apache/cassandra/db/SystemTable.java @@ -25,12 +25,8 @@ import java.nio.charset.CharacterCodingException; import java.util.*; import java.util.concurrent.ExecutionException; -import com.google.common.base.Function; import com.google.common.collect.HashMultimap; -import com.google.common.collect.Iterables; import com.google.common.collect.SetMultimap; -import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +43,6 @@ import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.locator.IEndpointSnitch; import org.apache.cassandra.service.StorageService; diff --git a/src/java/org/apache/cassandra/db/Table.java b/src/java/org/apache/cassandra/db/Table.java index 3a73f43a3f..c718586d7b 100644 --- a/src/java/org/apache/cassandra/db/Table.java +++ b/src/java/org/apache/cassandra/db/Table.java @@ -38,7 +38,6 @@ import org.apache.cassandra.db.filter.ColumnSlice; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.db.index.SecondaryIndexManager; -import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.locator.AbstractReplicationStrategy; import org.apache.cassandra.service.StorageService; diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java index 3ee992ae11..e9f063ff1b 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java @@ -18,7 +18,6 @@ package org.apache.cassandra.db.compaction; import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import org.apache.cassandra.utils.CloseableIterator; diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java index 70521ddc9b..b592655487 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java @@ -20,8 +20,6 @@ package org.apache.cassandra.db.compaction; import java.util.Collection; import java.util.Set; -import com.google.common.annotations.VisibleForTesting; - import org.apache.cassandra.db.Directories; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.db.ColumnFamilyStore; diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index f94c260381..1d273b6cdf 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -27,10 +27,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import javax.management.MBeanServer; import javax.management.ObjectName; -import com.google.common.base.Predicates; import com.google.common.base.Throwables; import com.google.common.collect.ConcurrentHashMultiset; -import com.google.common.collect.Iterators; import com.google.common.collect.Multiset; import com.google.common.primitives.Longs; import org.slf4j.Logger; @@ -54,7 +52,6 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.metrics.CompactionMetrics; -import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.service.AntiEntropyService; import org.apache.cassandra.service.CacheService; import org.apache.cassandra.service.StorageService; diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java index 75ea1cbf3c..a6b9f89d8d 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java @@ -21,7 +21,6 @@ import java.io.File; import java.io.IOException; import java.util.*; -import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java index 6a1bf4b924..9a73299171 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java @@ -34,7 +34,6 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.SSTable; import org.apache.cassandra.io.sstable.SSTableReader; -import org.apache.cassandra.io.sstable.SSTableScanner; import org.apache.cassandra.notifications.INotification; import org.apache.cassandra.notifications.INotificationConsumer; import org.apache.cassandra.notifications.SSTableAddedNotification; diff --git a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java index 24b1d00aaa..091b247c84 100644 --- a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java +++ b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.concurrent.*; import java.util.concurrent.locks.Condition; -import com.google.common.base.Functions; import com.google.common.collect.AbstractIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +34,6 @@ import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; import org.apache.cassandra.db.columniterator.ICountableColumnIterator; -import org.apache.cassandra.db.index.SecondaryIndexManager; import org.apache.cassandra.io.sstable.SSTableIdentityIterator; import org.apache.cassandra.utils.*; diff --git a/src/java/org/apache/cassandra/db/marshal/AbstractType.java b/src/java/org/apache/cassandra/db/marshal/AbstractType.java index 7b586d5663..cbba89c2fc 100644 --- a/src/java/org/apache/cassandra/db/marshal/AbstractType.java +++ b/src/java/org/apache/cassandra/db/marshal/AbstractType.java @@ -21,7 +21,6 @@ import java.nio.ByteBuffer; import java.util.Collection; import java.util.Comparator; import java.util.Map; -import java.util.Set; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.exceptions.SyntaxException; diff --git a/src/java/org/apache/cassandra/db/marshal/BooleanType.java b/src/java/org/apache/cassandra/db/marshal/BooleanType.java index 0bd1a5794a..c5f2cfba9a 100644 --- a/src/java/org/apache/cassandra/db/marshal/BooleanType.java +++ b/src/java/org/apache/cassandra/db/marshal/BooleanType.java @@ -20,7 +20,6 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import org.apache.cassandra.cql.jdbc.JdbcBoolean; -import org.apache.cassandra.cql3.Constants; import org.apache.cassandra.cql3.CQL3Type; public class BooleanType extends AbstractType diff --git a/src/java/org/apache/cassandra/db/marshal/CompositeType.java b/src/java/org/apache/cassandra/db/marshal/CompositeType.java index 2d7f4fcf1e..522be13f39 100644 --- a/src/java/org/apache/cassandra/db/marshal/CompositeType.java +++ b/src/java/org/apache/cassandra/db/marshal/CompositeType.java @@ -28,11 +28,9 @@ import java.util.Map; import com.google.common.collect.ImmutableList; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.cql3.ColumnNameBuilder; import org.apache.cassandra.cql3.Relation; -import org.apache.cassandra.cql3.Term; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java b/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java index 1421476c04..9ee772c69c 100644 --- a/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java +++ b/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; -import org.apache.cassandra.cql3.Constants; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.db.*; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/db/marshal/DateType.java b/src/java/org/apache/cassandra/db/marshal/DateType.java index ac27ba6662..875169d144 100644 --- a/src/java/org/apache/cassandra/db/marshal/DateType.java +++ b/src/java/org/apache/cassandra/db/marshal/DateType.java @@ -25,7 +25,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.apache.cassandra.cql.jdbc.JdbcDate; -import org.apache.cassandra.cql3.Constants; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.commons.lang.time.DateUtils; diff --git a/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java b/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java index 4eda451eb9..a28f6a5158 100644 --- a/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java +++ b/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.util.UUID; -import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.cassandra.cql.jdbc.JdbcTimeUUID; diff --git a/src/java/org/apache/cassandra/db/marshal/UTF8Type.java b/src/java/org/apache/cassandra/db/marshal/UTF8Type.java index f3ca98b399..56879b14da 100644 --- a/src/java/org/apache/cassandra/db/marshal/UTF8Type.java +++ b/src/java/org/apache/cassandra/db/marshal/UTF8Type.java @@ -20,7 +20,6 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import org.apache.cassandra.cql.jdbc.JdbcUTF8; -import org.apache.cassandra.cql3.Constants; import org.apache.cassandra.cql3.CQL3Type; public class UTF8Type extends AbstractType diff --git a/src/java/org/apache/cassandra/db/marshal/UUIDType.java b/src/java/org/apache/cassandra/db/marshal/UUIDType.java index 0221abd46a..a0193dd960 100644 --- a/src/java/org/apache/cassandra/db/marshal/UUIDType.java +++ b/src/java/org/apache/cassandra/db/marshal/UUIDType.java @@ -25,7 +25,6 @@ import java.util.UUID; import org.apache.cassandra.cql.jdbc.JdbcUUID; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.UUIDGen; import org.apache.commons.lang.time.DateUtils; diff --git a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java index bbd2466016..f2458518ec 100644 --- a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java +++ b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java @@ -22,9 +22,6 @@ import java.nio.ByteBuffer; import java.util.zip.CRC32; import java.util.zip.Checksum; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.primitives.Ints; - import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.io.util.CompressedSegmentedFile; diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableBoundedScanner.java b/src/java/org/apache/cassandra/io/sstable/SSTableBoundedScanner.java index a5719011a2..56be212fa3 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableBoundedScanner.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableBoundedScanner.java @@ -18,13 +18,10 @@ package org.apache.cassandra.io.sstable; import java.util.Arrays; -import java.util.Collections; import java.util.Iterator; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.RowPosition; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; import org.apache.cassandra.utils.Pair; /** diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java index 7583cd6387..cf6aeb3d14 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java @@ -19,7 +19,6 @@ package org.apache.cassandra.io.sstable; import java.io.*; -import org.apache.cassandra.utils.FilterFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/locator/LocalStrategy.java b/src/java/org/apache/cassandra/locator/LocalStrategy.java index 0e958200c5..39a391d0ef 100644 --- a/src/java/org/apache/cassandra/locator/LocalStrategy.java +++ b/src/java/org/apache/cassandra/locator/LocalStrategy.java @@ -24,7 +24,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.apache.cassandra.db.Table; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.dht.RingPosition; import org.apache.cassandra.dht.Token; diff --git a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java index c64c792b12..91478e8eab 100644 --- a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java +++ b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java @@ -24,7 +24,6 @@ import java.util.Map.Entry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.db.Table; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.dht.Token; import org.apache.cassandra.locator.TokenMetadata.Topology; diff --git a/src/java/org/apache/cassandra/locator/OldNetworkTopologyStrategy.java b/src/java/org/apache/cassandra/locator/OldNetworkTopologyStrategy.java index a46197e5d7..e184d24ca2 100644 --- a/src/java/org/apache/cassandra/locator/OldNetworkTopologyStrategy.java +++ b/src/java/org/apache/cassandra/locator/OldNetworkTopologyStrategy.java @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.cassandra.db.Table; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.dht.Token; diff --git a/src/java/org/apache/cassandra/locator/SimpleStrategy.java b/src/java/org/apache/cassandra/locator/SimpleStrategy.java index c310875e79..b19b1becd6 100644 --- a/src/java/org/apache/cassandra/locator/SimpleStrategy.java +++ b/src/java/org/apache/cassandra/locator/SimpleStrategy.java @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.cassandra.db.Table; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.dht.Token; diff --git a/src/java/org/apache/cassandra/service/AntiEntropyService.java b/src/java/org/apache/cassandra/service/AntiEntropyService.java index d532d07fbc..eafab67c6a 100644 --- a/src/java/org/apache/cassandra/service/AntiEntropyService.java +++ b/src/java/org/apache/cassandra/service/AntiEntropyService.java @@ -40,7 +40,6 @@ import org.apache.cassandra.db.*; import org.apache.cassandra.db.compaction.AbstractCompactedRow; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.dht.AbstractBounds; -import org.apache.cassandra.dht.RandomPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.gms.*; diff --git a/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java index ee1e5d6a85..4941d048cf 100644 --- a/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java +++ b/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java @@ -20,21 +20,15 @@ package org.apache.cassandra.service; import java.net.InetAddress; import java.util.Collection; import java.util.HashMap; -import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import com.google.common.collect.Iterables; - import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Table; -import org.apache.cassandra.exceptions.UnavailableException; -import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.locator.IEndpointSnitch; import org.apache.cassandra.locator.NetworkTopologyStrategy; import org.apache.cassandra.net.MessageIn; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.WriteType; -import org.apache.cassandra.utils.FBUtilities; /** * This class blocks for a quorum of responses _in all datacenters_ (CL.EACH_QUORUM). diff --git a/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java index 3fa674fba3..e63ebd1e90 100644 --- a/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java +++ b/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java @@ -20,17 +20,12 @@ package org.apache.cassandra.service; import java.net.InetAddress; import java.util.Collection; -import com.google.common.collect.Iterables; - import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Table; -import org.apache.cassandra.exceptions.UnavailableException; -import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.locator.IEndpointSnitch; import org.apache.cassandra.net.MessageIn; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.WriteType; -import org.apache.cassandra.utils.FBUtilities; /** * This class blocks for a quorum of responses _in the local datacenter only_ (CL.LOCAL_QUORUM). diff --git a/src/java/org/apache/cassandra/service/WriteResponseHandler.java b/src/java/org/apache/cassandra/service/WriteResponseHandler.java index 6c1440bd6a..34248e6329 100644 --- a/src/java/org/apache/cassandra/service/WriteResponseHandler.java +++ b/src/java/org/apache/cassandra/service/WriteResponseHandler.java @@ -23,13 +23,10 @@ import java.util.Collection; import java.util.Collections; import java.util.concurrent.atomic.AtomicInteger; -import com.google.common.collect.Iterables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.db.Table; -import org.apache.cassandra.exceptions.UnavailableException; -import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.net.MessageIn; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.WriteType; diff --git a/src/java/org/apache/cassandra/streaming/AbstractStreamSession.java b/src/java/org/apache/cassandra/streaming/AbstractStreamSession.java index dd7d922b0d..89fbf5f8bb 100644 --- a/src/java/org/apache/cassandra/streaming/AbstractStreamSession.java +++ b/src/java/org/apache/cassandra/streaming/AbstractStreamSession.java @@ -27,7 +27,6 @@ import org.slf4j.Logger; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.gms.*; -import org.apache.cassandra.utils.Pair; public abstract class AbstractStreamSession implements IEndpointStateChangeSubscriber, IFailureDetectionEventListener { diff --git a/src/java/org/apache/cassandra/streaming/StreamOutSession.java b/src/java/org/apache/cassandra/streaming/StreamOutSession.java index dbdbad99aa..edc07ca96b 100644 --- a/src/java/org/apache/cassandra/streaming/StreamOutSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamOutSession.java @@ -20,14 +20,12 @@ package org.apache.cassandra.streaming; import java.net.InetAddress; import java.util.*; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.UUIDGen; import org.cliffc.high_scale_lib.NonBlockingHashMap; diff --git a/src/java/org/apache/cassandra/thrift/ThriftClientState.java b/src/java/org/apache/cassandra/thrift/ThriftClientState.java index 632f94851e..795ac51577 100644 --- a/src/java/org/apache/cassandra/thrift/ThriftClientState.java +++ b/src/java/org/apache/cassandra/thrift/ThriftClientState.java @@ -23,8 +23,6 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql.CQLStatement; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.FBUtilities; /** * ClientState used by thrift that also provide a QueryState. diff --git a/src/java/org/apache/cassandra/thrift/ThriftValidation.java b/src/java/org/apache/cassandra/thrift/ThriftValidation.java index daf044b24b..5882e27f54 100644 --- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java +++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java @@ -32,7 +32,6 @@ import org.apache.cassandra.db.index.SecondaryIndexManager; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.MarshalException; import org.apache.cassandra.dht.IPartitioner; -import org.apache.cassandra.dht.RandomPartitioner; import org.apache.cassandra.dht.Token; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/tracing/TraceState.java b/src/java/org/apache/cassandra/tracing/TraceState.java index 8fb3119d38..703c4ee395 100644 --- a/src/java/org/apache/cassandra/tracing/TraceState.java +++ b/src/java/org/apache/cassandra/tracing/TraceState.java @@ -24,7 +24,6 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import com.google.common.base.Stopwatch; -import org.slf4j.Logger; import org.slf4j.helpers.MessageFormatter; import org.apache.cassandra.concurrent.Stage; diff --git a/src/java/org/apache/cassandra/transport/SimpleClient.java b/src/java/org/apache/cassandra/transport/SimpleClient.java index 797957058a..4caac615da 100644 --- a/src/java/org/apache/cassandra/transport/SimpleClient.java +++ b/src/java/org/apache/cassandra/transport/SimpleClient.java @@ -47,13 +47,11 @@ import org.jboss.netty.channel.ChannelFuture; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; -import org.jboss.netty.channel.ChannelStateEvent; import org.jboss.netty.channel.Channels; import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.SimpleChannelUpstreamHandler; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; -import org.jboss.netty.handler.logging.LoggingHandler; import org.jboss.netty.handler.ssl.SslHandler; import org.jboss.netty.logging.InternalLoggerFactory; import org.jboss.netty.logging.Slf4JLoggerFactory; diff --git a/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java b/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java index 3aca4c5e0a..2752d2b7ce 100644 --- a/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java @@ -32,7 +32,6 @@ import org.apache.cassandra.exceptions.PreparedQueryNotFoundException; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.transport.*; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.MD5Digest; import org.apache.cassandra.utils.UUIDGen; diff --git a/src/java/org/apache/cassandra/transport/messages/PrepareMessage.java b/src/java/org/apache/cassandra/transport/messages/PrepareMessage.java index 5c1d1b91dd..6705474969 100644 --- a/src/java/org/apache/cassandra/transport/messages/PrepareMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/PrepareMessage.java @@ -26,7 +26,6 @@ import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.transport.*; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.UUIDGen; public class PrepareMessage extends Message.Request diff --git a/src/java/org/apache/cassandra/transport/messages/QueryMessage.java b/src/java/org/apache/cassandra/transport/messages/QueryMessage.java index 7b8047068f..8d83e47940 100644 --- a/src/java/org/apache/cassandra/transport/messages/QueryMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/QueryMessage.java @@ -29,7 +29,6 @@ import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.transport.*; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.UUIDGen; /** diff --git a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java index 43caacec68..739738cefc 100644 --- a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java @@ -25,7 +25,6 @@ import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.ResultSet; import org.apache.cassandra.transport.*; -import org.apache.cassandra.db.marshal.TypeParser; import org.apache.cassandra.thrift.CqlPreparedResult; import org.apache.cassandra.thrift.CqlResult; import org.apache.cassandra.thrift.CqlResultType; diff --git a/src/java/org/apache/cassandra/utils/UUIDGen.java b/src/java/org/apache/cassandra/utils/UUIDGen.java index 38f7f0eead..b54a94552d 100644 --- a/src/java/org/apache/cassandra/utils/UUIDGen.java +++ b/src/java/org/apache/cassandra/utils/UUIDGen.java @@ -18,14 +18,10 @@ package org.apache.cassandra.utils; import java.net.InetAddress; -import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Collection; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Set; import java.util.Random; import java.util.UUID; diff --git a/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java b/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java index b584d1e4c5..33cdfea6b7 100644 --- a/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java +++ b/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java @@ -23,7 +23,6 @@ package org.apache.cassandra.cql.jdbc; import java.math.BigDecimal; import java.math.BigInteger; -import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.sql.Date; diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java index eab9772c67..fc18b88b03 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -28,7 +28,6 @@ import java.util.concurrent.Future; import com.google.common.base.Function; import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.junit.Test; @@ -49,9 +48,7 @@ import static org.apache.commons.lang.ArrayUtils.EMPTY_BYTE_ARRAY; import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.config.Schema; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.filter.*; @@ -419,7 +416,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader assert "k1".equals( key ); } - + @Test public void testDeleteOfInconsistentValuesInKeysIndex() throws Exception { @@ -431,7 +428,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader cfs.truncate().get(); ByteBuffer rowKey = ByteBufferUtil.bytes("k1"); - ByteBuffer colName = ByteBufferUtil.bytes("birthdate"); + ByteBuffer colName = ByteBufferUtil.bytes("birthdate"); ByteBuffer val1 = ByteBufferUtil.bytes(1L); ByteBuffer val2 = ByteBufferUtil.bytes(2L); @@ -456,7 +453,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader table.apply(rm, true, false); // Now searching the index for either the old or new value should return 0 rows - // because the new value was not indexed and the old value should be ignored + // because the new value was not indexed and the old value should be ignored // (and in fact purged from the index cf). // first check for the old value rows = table.getColumnFamilyStore(cfName).search(clause, range, 100, filter); @@ -495,7 +492,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader ByteBuffer rowKey = ByteBufferUtil.bytes("k1"); ByteBuffer clusterKey = ByteBufferUtil.bytes("ck1"); - ByteBuffer colName = ByteBufferUtil.bytes("col1"); + ByteBuffer colName = ByteBufferUtil.bytes("col1"); CompositeType baseComparator = (CompositeType)cfs.getComparator(); CompositeType.Builder builder = baseComparator.builder(); builder.add(clusterKey); @@ -530,7 +527,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader table.apply(rm, true, false); // Now searching the index for either the old or new value should return 0 rows - // because the new value was not indexed and the old value should be ignored + // because the new value was not indexed and the old value should be ignored // (and in fact purged from the index cf). // first check for the old value rows = table.getColumnFamilyStore(cfName).search(clause, range, 100, filter); diff --git a/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java b/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java index 8872d650a9..6cca2abda2 100644 --- a/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java +++ b/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java @@ -19,9 +19,7 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; -import java.util.List; import java.util.Set; -import java.util.SortedSet; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java index 2ed715ef16..c92740dd95 100644 --- a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java @@ -20,7 +20,6 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.UUID; diff --git a/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java b/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java index 282bfc3bf7..2bdc5ba64d 100644 --- a/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java @@ -24,15 +24,12 @@ package org.apache.cassandra.db.marshal; import com.google.common.base.Charsets; import org.apache.cassandra.cql.jdbc.*; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Hex; import org.apache.cassandra.utils.UUIDGen; import org.junit.Test; import java.math.BigInteger; import java.nio.ByteBuffer; -import java.util.Calendar; -import java.util.TimeZone; import java.util.UUID; public class RoundTripTest diff --git a/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java index e6c0393a7c..ca9d35bd7e 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java @@ -18,7 +18,6 @@ */ package org.apache.cassandra.db.marshal; -import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java index 2381545c43..ae7e36c539 100644 --- a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java +++ b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java @@ -28,7 +28,6 @@ import java.util.HashMap; import java.util.Set; import java.util.Map; import java.util.UUID; -import java.util.concurrent.CountDownLatch; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/test/unit/org/apache/cassandra/gms/SerializationsTest.java b/test/unit/org/apache/cassandra/gms/SerializationsTest.java index c27218bcaa..7e0008d416 100644 --- a/test/unit/org/apache/cassandra/gms/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/gms/SerializationsTest.java @@ -33,7 +33,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.UUID; public class SerializationsTest extends AbstractSerializationsTester { diff --git a/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java b/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java index 1a289e8047..83556867e9 100644 --- a/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java +++ b/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java @@ -44,7 +44,6 @@ import org.apache.cassandra.io.util.MappedFileDataInput; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CloseableIterator; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.UUIDGen; import static junit.framework.Assert.assertEquals;