From dc6e4fe55fea6cdbd56da48d4a7d6ee8c297f6cd Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Tue, 29 Dec 2009 17:14:20 +0000
Subject: [PATCH] move generic classes w/ no cassandra dependencies into
 cassandra.io.util.  patch by jbellis

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@894447 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/cassandra/config/DatabaseDescriptor.java    | 2 +-
 src/java/org/apache/cassandra/db/Column.java               | 2 +-
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java    | 1 +
 src/java/org/apache/cassandra/db/ColumnIndexer.java        | 3 +--
 src/java/org/apache/cassandra/db/CommitLog.java            | 6 +++---
 src/java/org/apache/cassandra/db/CompactionManager.java    | 2 +-
 src/java/org/apache/cassandra/db/Memtable.java             | 2 +-
 src/java/org/apache/cassandra/db/RangeCommand.java         | 2 +-
 src/java/org/apache/cassandra/db/RangeReply.java           | 2 +-
 src/java/org/apache/cassandra/db/RangeSliceCommand.java    | 2 +-
 src/java/org/apache/cassandra/db/RangeSliceReply.java      | 7 +------
 src/java/org/apache/cassandra/db/ReadVerbHandler.java      | 2 +-
 src/java/org/apache/cassandra/db/RecoveryManager.java      | 2 +-
 src/java/org/apache/cassandra/db/RowMutation.java          | 2 +-
 src/java/org/apache/cassandra/db/SuperColumn.java          | 2 +-
 src/java/org/apache/cassandra/db/Table.java                | 4 ++--
 .../apache/cassandra/db/filter/SSTableNamesIterator.java   | 1 +
 .../apache/cassandra/db/filter/SSTableSliceIterator.java   | 1 +
 src/java/org/apache/cassandra/io/CompactionIterator.java   | 1 +
 src/java/org/apache/cassandra/io/IteratingRow.java         | 1 +
 src/java/org/apache/cassandra/io/SSTable.java              | 2 +-
 src/java/org/apache/cassandra/io/SSTableReader.java        | 1 +
 src/java/org/apache/cassandra/io/SSTableScanner.java       | 3 ++-
 src/java/org/apache/cassandra/io/SSTableWriter.java        | 2 ++
 .../cassandra/io/{ => util}/BufferedRandomAccessFile.java  | 2 +-
 .../apache/cassandra/io/{ => util}/DataOutputBuffer.java   | 2 +-
 .../org/apache/cassandra/{utils => io/util}/FileUtils.java | 2 +-
 src/java/org/apache/cassandra/net/io/FastSerializer.java   | 2 +-
 src/java/org/apache/cassandra/service/StorageService.java  | 2 +-
 src/java/org/apache/cassandra/service/StreamManager.java   | 2 +-
 src/java/org/apache/cassandra/tools/SSTableImport.java     | 2 +-
 src/java/org/apache/cassandra/tools/ThreadListBuilder.java | 4 ++--
 test/unit/org/apache/cassandra/db/ColumnFamilyTest.java    | 2 +-
 test/unit/org/apache/cassandra/db/ReadMessageTest.java     | 3 ---
 test/unit/org/apache/cassandra/db/TableTest.java           | 2 +-
 test/unit/org/apache/cassandra/gms/GossipDigestTest.java   | 2 +-
 test/unit/org/apache/cassandra/io/SSTableTest.java         | 4 +---
 test/unit/org/apache/cassandra/io/SSTableUtils.java        | 2 +-
 .../apache/cassandra/service/AntiEntropyServiceTest.java   | 2 +-
 .../unit/org/apache/cassandra/tools/SSTableExportTest.java | 1 -
 test/unit/org/apache/cassandra/utils/FilterTest.java       | 2 +-
 41 files changed, 45 insertions(+), 48 deletions(-)
 rename src/java/org/apache/cassandra/io/{ => util}/BufferedRandomAccessFile.java (99%)
 rename src/java/org/apache/cassandra/io/{ => util}/DataOutputBuffer.java (98%)
 rename src/java/org/apache/cassandra/{utils => io/util}/FileUtils.java (99%)

diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 43703881b7..5f12bfc7d1 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -25,7 +25,7 @@ import org.apache.cassandra.db.marshal.UTF8Type;
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.locator.IEndPointSnitch;
 import org.apache.cassandra.locator.AbstractReplicationStrategy;
-import org.apache.cassandra.utils.FileUtils;
+import org.apache.cassandra.io.util.FileUtils;
 import org.apache.cassandra.utils.XMLUtils;
 import org.apache.log4j.Logger;
 import org.w3c.dom.Node;
diff --git a/src/java/org/apache/cassandra/db/Column.java b/src/java/org/apache/cassandra/db/Column.java
index a6a7ca471b..bb5280e75a 100644
--- a/src/java/org/apache/cassandra/db/Column.java
+++ b/src/java/org/apache/cassandra/db/Column.java
@@ -27,7 +27,7 @@ import org.apache.log4j.Logger;
 import org.apache.commons.lang.ArrayUtils;
 
 import org.apache.cassandra.db.marshal.AbstractType;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 
 
 /**
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 30fdbf7ff4..d1d02574af 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -36,6 +36,7 @@ import org.apache.log4j.Logger;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.io.*;
+import org.apache.cassandra.io.util.FileUtils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/java/org/apache/cassandra/db/ColumnIndexer.java b/src/java/org/apache/cassandra/db/ColumnIndexer.java
index 748b780474..e5a81883a6 100644
--- a/src/java/org/apache/cassandra/db/ColumnIndexer.java
+++ b/src/java/org/apache/cassandra/db/ColumnIndexer.java
@@ -18,7 +18,6 @@
 
 package org.apache.cassandra.db;
 
-import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.DataOutput;
 import java.util.ArrayList;
@@ -27,7 +26,7 @@ import java.util.List;
 import java.util.Iterator;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.io.IndexHelper;
 import org.apache.cassandra.utils.BloomFilter;
 import org.apache.cassandra.db.marshal.AbstractType;
diff --git a/src/java/org/apache/cassandra/db/CommitLog.java b/src/java/org/apache/cassandra/db/CommitLog.java
index f60a77be43..7e6b32fc84 100644
--- a/src/java/org/apache/cassandra/db/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/CommitLog.java
@@ -19,10 +19,10 @@
 package org.apache.cassandra.db;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.io.BufferedRandomAccessFile;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.BufferedRandomAccessFile;
+import org.apache.cassandra.io.util.DataOutputBuffer;
+import org.apache.cassandra.io.util.FileUtils;
 import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.FileUtils;
 import org.apache.cassandra.concurrent.StageManager;
 
 import org.apache.commons.lang.StringUtils;
diff --git a/src/java/org/apache/cassandra/db/CompactionManager.java b/src/java/org/apache/cassandra/db/CompactionManager.java
index 8fc1817799..b08b4c8324 100644
--- a/src/java/org/apache/cassandra/db/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/CompactionManager.java
@@ -34,7 +34,7 @@ import org.apache.cassandra.io.*;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.service.AntiEntropyService;
-import org.apache.cassandra.utils.FileUtils;
+import org.apache.cassandra.io.util.FileUtils;
 import org.apache.cassandra.utils.FBUtilities;
 import org.cliffc.high_scale_lib.NonBlockingHashMap;
 
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index 0953c73808..1e6c54e411 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.ArrayUtils;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.dht.IPartitioner;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.io.SSTableReader;
 import org.apache.cassandra.io.SSTableWriter;
 import org.apache.cassandra.service.StorageService;
diff --git a/src/java/org/apache/cassandra/db/RangeCommand.java b/src/java/org/apache/cassandra/db/RangeCommand.java
index f459df98f3..829052b829 100644
--- a/src/java/org/apache/cassandra/db/RangeCommand.java
+++ b/src/java/org/apache/cassandra/db/RangeCommand.java
@@ -25,7 +25,7 @@ import java.io.DataInputStream;
 import java.util.Arrays;
 
 import org.apache.cassandra.io.ICompactSerializer;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.net.Message;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.FBUtilities;
diff --git a/src/java/org/apache/cassandra/db/RangeReply.java b/src/java/org/apache/cassandra/db/RangeReply.java
index ef2b2f02f0..69a2fcf856 100644
--- a/src/java/org/apache/cassandra/db/RangeReply.java
+++ b/src/java/org/apache/cassandra/db/RangeReply.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 
 import org.apache.commons.lang.StringUtils;
 
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.net.Message;
 import org.apache.cassandra.utils.FBUtilities;
 
diff --git a/src/java/org/apache/cassandra/db/RangeSliceCommand.java b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
index df0275f1dd..74d04802e7 100644
--- a/src/java/org/apache/cassandra/db/RangeSliceCommand.java
+++ b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
@@ -37,7 +37,7 @@
 package org.apache.cassandra.db;
 
 import org.apache.cassandra.concurrent.StageManager;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.io.ICompactSerializer;
 import org.apache.cassandra.net.Message;
 import org.apache.cassandra.service.ColumnParent;
diff --git a/src/java/org/apache/cassandra/db/RangeSliceReply.java b/src/java/org/apache/cassandra/db/RangeSliceReply.java
index a3f27c2a88..4848cd5f5d 100644
--- a/src/java/org/apache/cassandra/db/RangeSliceReply.java
+++ b/src/java/org/apache/cassandra/db/RangeSliceReply.java
@@ -18,19 +18,14 @@
 
 package org.apache.cassandra.db;
 
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.marshal.AbstractType;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.net.Message;
-import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.commons.lang.StringUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
 import java.util.*;
 
 public class RangeSliceReply
diff --git a/src/java/org/apache/cassandra/db/ReadVerbHandler.java b/src/java/org/apache/cassandra/db/ReadVerbHandler.java
index 8cf9939c2f..8b305a4aa8 100644
--- a/src/java/org/apache/cassandra/db/ReadVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/ReadVerbHandler.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.util.List;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import java.net.InetAddress;
 import org.apache.cassandra.net.IVerbHandler;
 import org.apache.cassandra.net.Message;
diff --git a/src/java/org/apache/cassandra/db/RecoveryManager.java b/src/java/org/apache/cassandra/db/RecoveryManager.java
index 4688e4883d..bf7a690fbd 100644
--- a/src/java/org/apache/cassandra/db/RecoveryManager.java
+++ b/src/java/org/apache/cassandra/db/RecoveryManager.java
@@ -22,7 +22,7 @@ import java.util.*;
 import java.io.*;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.utils.FileUtils;
+import org.apache.cassandra.io.util.FileUtils;
 import org.apache.log4j.Logger;
 import org.apache.commons.lang.StringUtils;
 
diff --git a/src/java/org/apache/cassandra/db/RowMutation.java b/src/java/org/apache/cassandra/db/RowMutation.java
index 9b8d65c992..44f786cea3 100644
--- a/src/java/org/apache/cassandra/db/RowMutation.java
+++ b/src/java/org/apache/cassandra/db/RowMutation.java
@@ -34,7 +34,7 @@ import java.nio.ByteBuffer;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.io.ICompactSerializer;
 import org.apache.cassandra.net.Message;
 import org.apache.cassandra.service.*;
diff --git a/src/java/org/apache/cassandra/db/SuperColumn.java b/src/java/org/apache/cassandra/db/SuperColumn.java
index 0531d19084..03e9292e5c 100644
--- a/src/java/org/apache/cassandra/db/SuperColumn.java
+++ b/src/java/org/apache/cassandra/db/SuperColumn.java
@@ -27,7 +27,7 @@ import java.security.MessageDigest;
 import org.apache.log4j.Logger;
 
 import org.apache.cassandra.io.ICompactSerializer2;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.db.marshal.AbstractType;
 
 
diff --git a/src/java/org/apache/cassandra/db/Table.java b/src/java/org/apache/cassandra/db/Table.java
index 2a3fb313b5..456ffe49d7 100644
--- a/src/java/org/apache/cassandra/db/Table.java
+++ b/src/java/org/apache/cassandra/db/Table.java
@@ -25,12 +25,12 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.Future;
-import java.util.concurrent.ExecutionException;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.io.SSTableReader;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.FileUtils;
+
 import java.net.InetAddress;
 import org.apache.cassandra.utils.*;
 import org.apache.cassandra.db.filter.*;
diff --git a/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java b/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
index 57a68a1d5a..dba8b5227b 100644
--- a/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
+++ b/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
@@ -29,6 +29,7 @@ import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.io.*;
+import org.apache.cassandra.io.util.BufferedRandomAccessFile;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.utils.BloomFilter;
 
diff --git a/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java b/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
index 01cd4006ff..6d8ef19da8 100644
--- a/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
+++ b/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
@@ -29,6 +29,7 @@ import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.io.*;
+import org.apache.cassandra.io.util.BufferedRandomAccessFile;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import com.google.common.collect.AbstractIterator;
 
diff --git a/src/java/org/apache/cassandra/io/CompactionIterator.java b/src/java/org/apache/cassandra/io/CompactionIterator.java
index fc0508958c..d875528bfc 100644
--- a/src/java/org/apache/cassandra/io/CompactionIterator.java
+++ b/src/java/org/apache/cassandra/io/CompactionIterator.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 
 public class CompactionIterator extends ReducingIterator<IteratingRow, CompactionIterator.CompactedRow> implements Closeable
 {
diff --git a/src/java/org/apache/cassandra/io/IteratingRow.java b/src/java/org/apache/cassandra/io/IteratingRow.java
index 7962c79b82..4482f41ee6 100644
--- a/src/java/org/apache/cassandra/io/IteratingRow.java
+++ b/src/java/org/apache/cassandra/io/IteratingRow.java
@@ -28,6 +28,7 @@ import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.io.util.BufferedRandomAccessFile;
 import com.google.common.collect.AbstractIterator;
 
 public class IteratingRow extends AbstractIterator<IColumn> implements Comparable<IteratingRow>
diff --git a/src/java/org/apache/cassandra/io/SSTable.java b/src/java/org/apache/cassandra/io/SSTable.java
index e5b0690a4f..b9008a0ffa 100644
--- a/src/java/org/apache/cassandra/io/SSTable.java
+++ b/src/java/org/apache/cassandra/io/SSTable.java
@@ -31,7 +31,7 @@ import org.apache.commons.lang.StringUtils;
 
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.utils.BloomFilter;
-import org.apache.cassandra.utils.FileUtils;
+import org.apache.cassandra.io.util.FileUtils;
 import org.apache.cassandra.db.DecoratedKey;
 
 /**
diff --git a/src/java/org/apache/cassandra/io/SSTableReader.java b/src/java/org/apache/cassandra/io/SSTableReader.java
index dba17a15a0..aa32d383ce 100644
--- a/src/java/org/apache/cassandra/io/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/SSTableReader.java
@@ -35,6 +35,7 @@ import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.io.util.BufferedRandomAccessFile;
 
 import org.cliffc.high_scale_lib.NonBlockingHashMap;
 import com.google.common.base.Predicate;
diff --git a/src/java/org/apache/cassandra/io/SSTableScanner.java b/src/java/org/apache/cassandra/io/SSTableScanner.java
index 8a99337c78..b5b8042ecb 100644
--- a/src/java/org/apache/cassandra/io/SSTableScanner.java
+++ b/src/java/org/apache/cassandra/io/SSTableScanner.java
@@ -25,8 +25,9 @@ import java.util.Iterator;
 import java.util.Arrays;
 
 import org.apache.cassandra.db.DecoratedKey;
+import org.apache.cassandra.io.util.BufferedRandomAccessFile;
+
 import org.apache.log4j.Logger;
-import com.google.common.collect.AbstractIterator;
 
 
 public class SSTableScanner implements Iterator<IteratingRow>, Closeable
diff --git a/src/java/org/apache/cassandra/io/SSTableWriter.java b/src/java/org/apache/cassandra/io/SSTableWriter.java
index 581904b577..a5bfba4903 100644
--- a/src/java/org/apache/cassandra/io/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/SSTableWriter.java
@@ -32,6 +32,8 @@ import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.BloomFilter;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.io.util.BufferedRandomAccessFile;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import com.reardencommerce.kernel.collections.shared.evictable.ConcurrentLinkedHashMap;
 
 public class SSTableWriter extends SSTable
diff --git a/src/java/org/apache/cassandra/io/BufferedRandomAccessFile.java b/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java
similarity index 99%
rename from src/java/org/apache/cassandra/io/BufferedRandomAccessFile.java
rename to src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java
index 1059b48f96..67d2ee52a8 100644
--- a/src/java/org/apache/cassandra/io/BufferedRandomAccessFile.java
+++ b/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.cassandra.io;
+package org.apache.cassandra.io.util;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/java/org/apache/cassandra/io/DataOutputBuffer.java b/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
similarity index 98%
rename from src/java/org/apache/cassandra/io/DataOutputBuffer.java
rename to src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
index f5c8f87471..2bd0d9a73f 100644
--- a/src/java/org/apache/cassandra/io/DataOutputBuffer.java
+++ b/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.cassandra.io;
+package org.apache.cassandra.io.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
diff --git a/src/java/org/apache/cassandra/utils/FileUtils.java b/src/java/org/apache/cassandra/io/util/FileUtils.java
similarity index 99%
rename from src/java/org/apache/cassandra/utils/FileUtils.java
rename to src/java/org/apache/cassandra/io/util/FileUtils.java
index 341b8a4ed0..68359f78e6 100644
--- a/src/java/org/apache/cassandra/utils/FileUtils.java
+++ b/src/java/org/apache/cassandra/io/util/FileUtils.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.cassandra.utils;
+package org.apache.cassandra.io.util;
 
 import java.io.*;
 import java.text.DecimalFormat;
diff --git a/src/java/org/apache/cassandra/net/io/FastSerializer.java b/src/java/org/apache/cassandra/net/io/FastSerializer.java
index 33588c55b8..b370d21358 100644
--- a/src/java/org/apache/cassandra/net/io/FastSerializer.java
+++ b/src/java/org/apache/cassandra/net/io/FastSerializer.java
@@ -22,7 +22,7 @@ import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.net.Message;
 
 public class FastSerializer implements ISerializer
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 8f4b5428b3..2c4ede08a2 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -37,11 +37,11 @@ import org.apache.cassandra.gms.*;
 import org.apache.cassandra.locator.*;
 import org.apache.cassandra.net.*;
 import org.apache.cassandra.service.AntiEntropyService.TreeRequestVerbHandler;
-import org.apache.cassandra.utils.FileUtils;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.io.SSTableReader;
 import org.apache.cassandra.io.Streaming;
 import org.apache.cassandra.io.StreamRequestVerbHandler;
+import org.apache.cassandra.io.util.FileUtils;
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.Level;
diff --git a/src/java/org/apache/cassandra/service/StreamManager.java b/src/java/org/apache/cassandra/service/StreamManager.java
index 16a393187c..ff4f44044d 100644
--- a/src/java/org/apache/cassandra/service/StreamManager.java
+++ b/src/java/org/apache/cassandra/service/StreamManager.java
@@ -29,8 +29,8 @@ import java.net.InetAddress;
 
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.net.io.StreamContextManager;
-import org.apache.cassandra.utils.FileUtils;
 import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.io.util.FileUtils;
 
 import org.apache.log4j.Logger;
 
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java b/src/java/org/apache/cassandra/tools/SSTableImport.java
index b5bd53ab9d..9d2970ba24 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -27,7 +27,7 @@ import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.db.SuperColumn;
 import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.dht.IPartitioner;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.io.SSTableWriter;
 import static org.apache.cassandra.utils.FBUtilities.hexToBytes;
 import org.apache.commons.cli.*;
diff --git a/src/java/org/apache/cassandra/tools/ThreadListBuilder.java b/src/java/org/apache/cassandra/tools/ThreadListBuilder.java
index 940c133201..32a593f8b5 100644
--- a/src/java/org/apache/cassandra/tools/ThreadListBuilder.java
+++ b/src/java/org/apache/cassandra/tools/ThreadListBuilder.java
@@ -26,7 +26,7 @@ import java.io.RandomAccessFile;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.utils.BloomFilter;
 
 
@@ -45,7 +45,7 @@ public class ThreadListBuilder
         
         File directory = new File(args[0]);
         File[] files = directory.listFiles();
-        List<DataOutputBuffer> buffers = new ArrayList<DataOutputBuffer>();    
+        List<DataOutputBuffer> buffers = new ArrayList<DataOutputBuffer>();
         BloomFilter bf = new BloomFilter(count_, 8);        
         int keyCount = 0;
         
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
index e5e5b1514d..5859f44e96 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
@@ -26,7 +26,7 @@ import java.util.TreeMap;
 
 import org.junit.Test;
 
-import org.apache.cassandra.io.DataOutputBuffer;
+import DataOutputBuffer;
 import org.apache.cassandra.db.filter.QueryPath;
 import static org.apache.cassandra.Util.column;
 
diff --git a/test/unit/org/apache/cassandra/db/ReadMessageTest.java b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
index 35eaec4b29..0021091857 100644
--- a/test/unit/org/apache/cassandra/db/ReadMessageTest.java
+++ b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
@@ -27,12 +27,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.junit.Assert;
 import org.junit.Test;
 
-import org.apache.cassandra.io.DataOutputBuffer;
 import org.apache.cassandra.db.filter.QueryPath;
-import org.apache.cassandra.db.marshal.AsciiType;
 
 public class ReadMessageTest
 {
diff --git a/test/unit/org/apache/cassandra/db/TableTest.java b/test/unit/org/apache/cassandra/db/TableTest.java
index 5d3db60848..b2cb4f1ca0 100644
--- a/test/unit/org/apache/cassandra/db/TableTest.java
+++ b/test/unit/org/apache/cassandra/db/TableTest.java
@@ -37,7 +37,7 @@ import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.db.filter.SliceQueryFilter;
 import org.apache.cassandra.db.marshal.LongType;
 import org.apache.cassandra.io.SSTableReader;
-import org.apache.cassandra.io.BufferedRandomAccessFile;
+import org.apache.cassandra.io.util.BufferedRandomAccessFile;
 import org.apache.cassandra.io.IndexHelper;
 
 public class TableTest extends CleanupHelper
diff --git a/test/unit/org/apache/cassandra/gms/GossipDigestTest.java b/test/unit/org/apache/cassandra/gms/GossipDigestTest.java
index 1b7f08a408..f4bc1bdf12 100644
--- a/test/unit/org/apache/cassandra/gms/GossipDigestTest.java
+++ b/test/unit/org/apache/cassandra/gms/GossipDigestTest.java
@@ -27,7 +27,7 @@ import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import java.net.InetAddress;
 import org.junit.Test;
 
diff --git a/test/unit/org/apache/cassandra/io/SSTableTest.java b/test/unit/org/apache/cassandra/io/SSTableTest.java
index 5bb36f696c..240df72404 100644
--- a/test/unit/org/apache/cassandra/io/SSTableTest.java
+++ b/test/unit/org/apache/cassandra/io/SSTableTest.java
@@ -18,16 +18,14 @@
 */
 package org.apache.cassandra.io;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 import org.apache.cassandra.CleanupHelper;
+import org.apache.cassandra.io.util.BufferedRandomAccessFile;
 import org.apache.cassandra.db.DecoratedKey;
-import org.apache.cassandra.dht.OrderPreservingPartitioner;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
diff --git a/test/unit/org/apache/cassandra/io/SSTableUtils.java b/test/unit/org/apache/cassandra/io/SSTableUtils.java
index d764e53bf0..24cf9afe8c 100644
--- a/test/unit/org/apache/cassandra/io/SSTableUtils.java
+++ b/test/unit/org/apache/cassandra/io/SSTableUtils.java
@@ -30,8 +30,8 @@ import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.Column;
 import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.Table;
-import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 
 /**
  * TODO: These methods imitate Memtable.writeSortedKeys to some degree, but
diff --git a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java
index 138aa2747d..dd067670ea 100644
--- a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java
+++ b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java
@@ -30,7 +30,7 @@ import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
 import org.apache.cassandra.io.CompactionIterator.CompactedRow;
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.locator.TokenMetadata;
 import static org.apache.cassandra.service.AntiEntropyService.*;
 import org.apache.cassandra.utils.FBUtilities;
diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
index c4f1115c14..bc5aa9e36c 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
@@ -28,7 +28,6 @@ import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.filter.NamesQueryFilter;
 import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.dht.IPartitioner;
-import org.apache.cassandra.io.DataOutputBuffer;
 import org.apache.cassandra.io.SSTableAccessor;
 import org.apache.cassandra.io.SSTableReader;
 import org.apache.cassandra.io.SSTableWriter;
diff --git a/test/unit/org/apache/cassandra/utils/FilterTest.java b/test/unit/org/apache/cassandra/utils/FilterTest.java
index 6644e17360..16a13a807a 100644
--- a/test/unit/org/apache/cassandra/utils/FilterTest.java
+++ b/test/unit/org/apache/cassandra/utils/FilterTest.java
@@ -27,7 +27,7 @@ import java.util.Set;
 
 import org.junit.Test;
 
-import org.apache.cassandra.io.DataOutputBuffer;
+import org.apache.cassandra.io.util.DataOutputBuffer;
 
 public class FilterTest
 {