diff --git a/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyFixedLengthKCVSTest.java b/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyFixedLengthKCVSTest.java
index c227bddf48..5f63233ae5 100644
--- a/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyFixedLengthKCVSTest.java
+++ b/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyFixedLengthKCVSTest.java
@@ -13,11 +13,13 @@
 
 public class BerkeleyFixedLengthKCVSTest extends KeyColumnValueStoreTest {
 
+    @Override
     public KeyColumnValueStoreManager openStorageManager() throws BackendException {
         BerkeleyJEStoreManager sm = new BerkeleyJEStoreManager(BerkeleyStorageSetup.getBerkeleyJEConfiguration());
         return new OrderedKeyValueStoreManagerAdapter(sm, ImmutableMap.of(storeName, 8));
     }
 
+    @Override
     @Test
     public void testGetKeysWithKeyRange() throws Exception {
         super.testGetKeysWithKeyRange();
diff --git a/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyLogTest.java b/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyLogTest.java
index 273d843f31..620389223d 100644
--- a/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyLogTest.java
+++ b/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyLogTest.java
@@ -9,6 +9,7 @@
 
 public class BerkeleyLogTest extends KCVSLogTest {
 
+    @Override
     public KeyColumnValueStoreManager openStorageManager() throws BackendException {
         BerkeleyJEStoreManager sm = new BerkeleyJEStoreManager(BerkeleyStorageSetup.getBerkeleyJEConfiguration());
         return new OrderedKeyValueStoreManagerAdapter(sm);
diff --git a/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyVariableLengthKCVSTest.java b/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyVariableLengthKCVSTest.java
index 570ceabacb..730d7f4ed6 100644
--- a/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyVariableLengthKCVSTest.java
+++ b/titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyVariableLengthKCVSTest.java
@@ -12,11 +12,13 @@
 
 public class BerkeleyVariableLengthKCVSTest extends KeyColumnValueStoreTest {
 
+    @Override
     public KeyColumnValueStoreManager openStorageManager() throws BackendException {
         BerkeleyJEStoreManager sm = new BerkeleyJEStoreManager(BerkeleyStorageSetup.getBerkeleyJEConfiguration());
         return new OrderedKeyValueStoreManagerAdapter(sm);
     }
 
+    @Override
     @Test
     public void testGetKeysWithKeyRange() throws Exception {
         super.testGetKeysWithKeyRange();
diff --git a/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/AbstractCassandraStoreManager.java b/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/AbstractCassandraStoreManager.java
index 7d3869bedb..f0cd436a97 100644
--- a/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/AbstractCassandraStoreManager.java
+++ b/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/AbstractCassandraStoreManager.java
@@ -290,6 +290,7 @@ public StoreFeatures getFeatures() {
      */
     public abstract Map<String, String> getCompressionOptions(String cf) throws BackendException;
 
+    @Override
     public String getName() {
         return getClass().getSimpleName() + keySpaceName;
     }
diff --git a/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/embedded/CassandraEmbeddedStoreManager.java b/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/embedded/CassandraEmbeddedStoreManager.java
index cecc92fb45..a2c5b4b2bb 100644
--- a/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/embedded/CassandraEmbeddedStoreManager.java
+++ b/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/embedded/CassandraEmbeddedStoreManager.java
@@ -131,6 +131,7 @@ public synchronized KeyColumnValueStore openDatabase(String name, StoreMetaData.
      * {@link StorageService#getLocalPrimaryRanges(String)} returns a raw
      * (unparameterized) type.
      */
+    @Override
     public List<KeyRange> getLocalKeyPartition() throws BackendException {
         ensureKeyspaceExists(keySpaceName);
 
diff --git a/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/thrift/CassandraThriftStoreManager.java b/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/thrift/CassandraThriftStoreManager.java
index d90486097d..4adfa2c24d 100644
--- a/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/thrift/CassandraThriftStoreManager.java
+++ b/titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/thrift/CassandraThriftStoreManager.java
@@ -369,6 +369,7 @@ public List<KeyRange> getLocalKeyPartition() throws BackendException {
      *
      * @throws com.thinkaurelius.titan.diskstorage.BackendException if any checked Thrift or UnknownHostException is thrown in the body of this method
      */
+    @Override
     public void clearStorage() throws BackendException {
         openStores.clear();
         final String lp = "ClearStorage: "; // "log prefix"
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/core/TitanGraphTransaction.java b/titan-core/src/main/java/com/thinkaurelius/titan/core/TitanGraphTransaction.java
index 13efa2f084..bd154894b8 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/core/TitanGraphTransaction.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/core/TitanGraphTransaction.java
@@ -40,6 +40,7 @@ public interface TitanGraphTransaction extends Graph, SchemaManager {
      * @param vertexLabel the name of the vertex label to use
      * @return a new vertex in the graph created in the context of this transaction
      */
+    @Override
     public TitanVertex addVertex(String vertexLabel);
 
     @Override
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/core/TitanRelation.java b/titan-core/src/main/java/com/thinkaurelius/titan/core/TitanRelation.java
index 9e08354861..2b6a37e27b 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/core/TitanRelation.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/core/TitanRelation.java
@@ -33,6 +33,7 @@ public interface TitanRelation extends TitanElement {
      * @param key string identifying a key
      * @return value or list of values associated with key
      */
+    @Override
     public <V> V value(String key);
 
     /**
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/core/attribute/Text.java b/titan-core/src/main/java/com/thinkaurelius/titan/core/attribute/Text.java
index 4b247d84e6..71c896cc22 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/core/attribute/Text.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/core/attribute/Text.java
@@ -140,6 +140,7 @@ public boolean test(Object value, Object condition) {
             return evaluateRaw(value.toString(),(String)condition);
         }
 
+        @Override
         public boolean evaluateRaw(String value, String regex) {
             return value.matches(regex);
         }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/core/schema/TitanGraphIndex.java b/titan-core/src/main/java/com/thinkaurelius/titan/core/schema/TitanGraphIndex.java
index c11f6df9c6..b9cc47caac 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/core/schema/TitanGraphIndex.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/core/schema/TitanGraphIndex.java
@@ -19,6 +19,7 @@ public interface TitanGraphIndex extends TitanIndex {
      * Returns the name of the index
      * @return
      */
+    @Override
     public String name();
 
     /**
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/Backend.java b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/Backend.java
index 0d33670531..a89ca4f8d0 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/Backend.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/Backend.java
@@ -538,6 +538,7 @@ public BackendTransaction beginTransaction(TransactionConfiguration configuratio
                 maxReadTime, indexTx, threadPool);
     }
 
+    @Override
     public synchronized void close() throws BackendException {
         if (!hasAttemptedClose) {
             hasAttemptedClose = true;
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/configuration/MixedConfiguration.java b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/configuration/MixedConfiguration.java
index 787929dc31..2816d4e4b2 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/configuration/MixedConfiguration.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/configuration/MixedConfiguration.java
@@ -53,6 +53,7 @@ public Set<String> getContainedNamespaces(ConfigNamespace umbrella, String... um
         return result;
     }
 
+    @Override
     public Map<String,Object> getSubset(ConfigNamespace umbrella, String... umbrellaElements) {
         Map<String,Object> result = Maps.newHashMap();
         for (ReadConfiguration config : new ReadConfiguration[]{global,local}) {
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/configuration/backend/KCVSConfiguration.java b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/configuration/backend/KCVSConfiguration.java
index 7ea983f217..a67a3c3c77 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/configuration/backend/KCVSConfiguration.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/configuration/backend/KCVSConfiguration.java
@@ -102,6 +102,7 @@ public String toString() {
         return staticBuffer2Object(result, datatype);
     }
 
+    @Override
     public<O> void set(String key, O value, O expectedValue) {
         set(key,value,expectedValue,true);
     }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/locking/consistentkey/ExpectedValueCheckingStore.java b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/locking/consistentkey/ExpectedValueCheckingStore.java
index f0c9c77169..b04252421b 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/locking/consistentkey/ExpectedValueCheckingStore.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/locking/consistentkey/ExpectedValueCheckingStore.java
@@ -105,6 +105,7 @@ KeyColumnValueStore getBackingStore() {
         return store;
     }
 
+    @Override
     protected StoreTransaction unwrapTx(StoreTransaction t) {
         assert null != t;
         assert t instanceof ExpectedValueCheckingTransaction;
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/log/util/AbstractMessage.java b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/log/util/AbstractMessage.java
index efd3356465..290cad771f 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/log/util/AbstractMessage.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/log/util/AbstractMessage.java
@@ -37,6 +37,7 @@ public String getSenderId() {
         return senderId;
     }
 
+    @Override
     public Instant getTimestamp() {
         return timestamp;
     }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/MetricInstrumentedIterator.java b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/MetricInstrumentedIterator.java
index 8e72f5a210..09bbc1e692 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/MetricInstrumentedIterator.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/MetricInstrumentedIterator.java
@@ -58,6 +58,7 @@ private MetricInstrumentedIterator(KeyIterator i, String p) {
     public boolean hasNext() {
         return MetricInstrumentedStore.runWithMetrics(p, null, M_HAS_NEXT,
             new UncheckedCallable<Boolean>() {
+                @Override
                 public Boolean call() {
                     return Boolean.valueOf(iterator.hasNext());
                 }
@@ -69,6 +70,7 @@ public Boolean call() {
     public StaticBuffer next() {
         return MetricInstrumentedStore.runWithMetrics(p, null, M_NEXT,
             new UncheckedCallable<StaticBuffer>() {
+                @Override
                 public StaticBuffer call() {
                     return iterator.next();
                 }
@@ -80,6 +82,7 @@ public StaticBuffer call() {
     public void close() throws IOException {
         MetricInstrumentedStore.runWithMetrics(p, null, M_CLOSE,
             new IOCallable<Void>() {
+                @Override
                 public Void call() throws IOException {
                     iterator.close();
                     return null;
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/MetricInstrumentedStore.java b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/MetricInstrumentedStore.java
index 42994a32ac..62a545f0d9 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/MetricInstrumentedStore.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/MetricInstrumentedStore.java
@@ -88,6 +88,7 @@ public MetricInstrumentedStore(KeyColumnValueStore backend, String metricsStoreN
     public EntryList getSlice(final KeySliceQuery query, final StoreTransaction txh) throws BackendException {
         return runWithMetrics(txh, metricsStoreName, M_GET_SLICE,
             new StorageCallable<EntryList>() {
+                @Override
                 public EntryList call() throws BackendException {
                     EntryList result = backend.getSlice(query, txh);
                     recordSliceMetrics(txh, result);
@@ -103,6 +104,7 @@ public Map<StaticBuffer,EntryList> getSlice(final List<StaticBuffer> keys,
                                       final StoreTransaction txh) throws BackendException {
         return runWithMetrics(txh, metricsStoreName, M_GET_SLICE,
             new StorageCallable<Map<StaticBuffer,EntryList>>() {
+                @Override
                 public Map<StaticBuffer,EntryList> call() throws BackendException {
                     Map<StaticBuffer,EntryList> results = backend.getSlice(keys, query, txh);
 
@@ -122,6 +124,7 @@ public void mutate(final StaticBuffer key,
                        final StoreTransaction txh) throws BackendException {
         runWithMetrics(txh, metricsStoreName, M_MUTATE,
                 new StorageCallable<Void>() {
+                    @Override
                     public Void call() throws BackendException {
                         backend.mutate(key, additions, deletions, txh);
                         return null;
@@ -137,6 +140,7 @@ public void acquireLock(final StaticBuffer key,
                             final StoreTransaction txh) throws BackendException {
         runWithMetrics(txh, metricsStoreName, M_ACQUIRE_LOCK,
             new StorageCallable<Void>() {
+                @Override
                 public Void call() throws BackendException {
                     backend.acquireLock(key, column, expectedValue, txh);
                     return null;
@@ -149,6 +153,7 @@ public Void call() throws BackendException {
     public KeyIterator getKeys(final KeyRangeQuery query, final StoreTransaction txh) throws BackendException {
         return runWithMetrics(txh, metricsStoreName, M_GET_KEYS,
             new StorageCallable<KeyIterator>() {
+                @Override
                 public KeyIterator call() throws BackendException {
                     KeyIterator ki = backend.getKeys(query, txh);
                     if (txh.getConfiguration().hasGroupName()) {
@@ -165,6 +170,7 @@ public KeyIterator call() throws BackendException {
     public KeyIterator getKeys(final SliceQuery query, final StoreTransaction txh) throws BackendException {
         return runWithMetrics(txh, metricsStoreName, M_GET_KEYS,
             new StorageCallable<KeyIterator>() {
+                @Override
                 public KeyIterator call() throws BackendException {
                     KeyIterator ki = backend.getKeys(query, txh);
                     if (txh.getConfiguration().hasGroupName()) {
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/ReadArrayBuffer.java b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/ReadArrayBuffer.java
index 589e139b0a..5c6356fa08 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/ReadArrayBuffer.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/ReadArrayBuffer.java
@@ -104,42 +104,49 @@ public double getDouble() {
 
     //------
 
+    @Override
     public byte[] getBytes(int length) {
         byte[] result = super.getBytes(position,length);
         position += length*BYTE_LEN;
         return result;
     }
 
+    @Override
     public short[] getShorts(int length) {
         short[] result = super.getShorts(position,length);
         position += length*SHORT_LEN;
         return result;
     }
 
+    @Override
     public int[] getInts(int length) {
         int[] result = super.getInts(position,length);
         position += length*INT_LEN;
         return result;
     }
 
+    @Override
     public long[] getLongs(int length) {
         long[] result = super.getLongs(position,length);
         position += length*LONG_LEN;
         return result;
     }
 
+    @Override
     public char[] getChars(int length) {
         char[] result = super.getChars(position,length);
         position += length*CHAR_LEN;
         return result;
     }
 
+    @Override
     public float[] getFloats(int length) {
         float[] result = super.getFloats(position,length);
         position += length*FLOAT_LEN;
         return result;
     }
 
+    @Override
     public double[] getDoubles(int length) {
         double[] result = super.getDoubles(position,length);
         position += length*DOUBLE_LEN;
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/StaticArrayBuffer.java b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/StaticArrayBuffer.java
index 7cea81b080..cd88559428 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/StaticArrayBuffer.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/StaticArrayBuffer.java
@@ -242,6 +242,7 @@ public byte[] getBytes(int position, int length) {
         return result;
     }
 
+    @Override
     public short[] getShorts(int position, int length) {
         short[] result = new short[length];
         for (int i = 0; i < length; i++) {
@@ -251,6 +252,7 @@ public short[] getShorts(int position, int length) {
         return result;
     }
 
+    @Override
     public int[] getInts(int position, int length) {
         int[] result = new int[length];
         for (int i = 0; i < length; i++) {
@@ -260,6 +262,7 @@ public int[] getInts(int position, int length) {
         return result;
     }
 
+    @Override
     public long[] getLongs(int position, int length) {
         long[] result = new long[length];
         for (int i = 0; i < length; i++) {
@@ -269,6 +272,7 @@ public long[] getLongs(int position, int length) {
         return result;
     }
 
+    @Override
     public char[] getChars(int position, int length) {
         char[] result = new char[length];
         for (int i = 0; i < length; i++) {
@@ -278,6 +282,7 @@ public char[] getChars(int position, int length) {
         return result;
     }
 
+    @Override
     public float[] getFloats(int position, int length) {
         float[] result = new float[length];
         for (int i = 0; i < length; i++) {
@@ -287,6 +292,7 @@ public float[] getFloats(int position, int length) {
         return result;
     }
 
+    @Override
     public double[] getDoubles(int position, int length) {
         double[] result = new double[length];
         for (int i = 0; i < length; i++) {
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/StaticArrayEntryList.java b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/StaticArrayEntryList.java
index 8198429e9a..75c5a75d53 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/StaticArrayEntryList.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/StaticArrayEntryList.java
@@ -161,6 +161,7 @@ public void setCache(RelationCache cache) {
             caches[currentIndex]=cache;
         }
 
+        @Override
         public boolean hasMetaData() {
             verifyAccess();
             return !metadata.isEmpty();
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/UncaughtExceptionLogger.java b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/UncaughtExceptionLogger.java
index 92f2b9ac6d..68ef4d3d7e 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/UncaughtExceptionLogger.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/util/UncaughtExceptionLogger.java
@@ -17,26 +17,31 @@ public class UncaughtExceptionLogger implements UncaughtExceptionHandler {
      */
     public static enum UELevel implements UELogLevel {
         TRACE {
+            @Override
             public void dispatch(String message, Throwable t) {
                 log.trace(message, t);
             }
         },
         DEBUG {
+            @Override
             public void dispatch(String message, Throwable t) {
                 log.debug(message, t);
             }
         },
         INFO {
+            @Override
             public void dispatch(String message, Throwable t) {
                 log.info(message, t);
             }
         },
         WARN {
+            @Override
             public void dispatch(String message, Throwable t) {
                 log.warn(message, t);
             }
         },
         ERROR {
+            @Override
             public void dispatch(String message, Throwable t) {
                 log.error(message, t);
             }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/IndexSerializer.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/IndexSerializer.java
index 9ca2245950..ff79330892 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/IndexSerializer.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/IndexSerializer.java
@@ -401,6 +401,7 @@ public static RecordEntry[] indexMatch(TitanRelation relation, CompositeIndexTyp
 
     public static class IndexRecords extends ArrayList<RecordEntry[]> {
 
+        @Override
         public boolean add(RecordEntry[] record) {
             return super.add(Arrays.copyOf(record,record.length));
         }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/RelationQueryCache.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/RelationQueryCache.java
index 85fa059bd1..2de56bb473 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/RelationQueryCache.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/RelationQueryCache.java
@@ -56,6 +56,7 @@ public CacheEntry call() throws Exception {
         return ce.get(dir);
     }
 
+    @Override
     public void close() {
         cache.invalidateAll();
         cache.cleanUp();
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/idassigner/VertexIDAssigner.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/idassigner/VertexIDAssigner.java
index 9455f42c8f..25df256550 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/idassigner/VertexIDAssigner.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/idassigner/VertexIDAssigner.java
@@ -123,6 +123,7 @@ public IDManager getIDManager() {
         return idManager;
     }
 
+    @Override
     public synchronized void close() {
         schemaIdPool.close();
         for (PartitionIDPool pool : idPools.values()) {
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/internal/AbstractElement.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/internal/AbstractElement.java
index 918811c58b..284746e41d 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/internal/AbstractElement.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/internal/AbstractElement.java
@@ -98,6 +98,7 @@ public long longId() {
         return id;
     }
 
+    @Override
     public boolean hasId() {
         return !isTemporaryId(longId());
     }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/log/StandardTransactionLogProcessor.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/log/StandardTransactionLogProcessor.java
index af639cd895..04fc7f8dc2 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/log/StandardTransactionLogProcessor.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/log/StandardTransactionLogProcessor.java
@@ -125,6 +125,7 @@ public long[] getStatistics() {
         return new long[]{successTxCounter.get(),failureTxCounter.get()};
     }
 
+    @Override
     public synchronized void shutdown() throws TitanException {
         cleaner.close(CLEAN_SLEEP_TIME);
     }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/olap/QueryContainer.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/olap/QueryContainer.java
index 1c40cafe6a..857729a3a4 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/olap/QueryContainer.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/olap/QueryContainer.java
@@ -219,6 +219,7 @@ public QueryBuilder keys(String... keys) {
             return this;
         }
 
+        @Override
         public QueryBuilder type(RelationType type) {
             super.type(type);
             return this;
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/olap/computer/PartitionVertexAggregate.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/olap/computer/PartitionVertexAggregate.java
index 29cfc48e2f..8d079f3635 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/olap/computer/PartitionVertexAggregate.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/olap/computer/PartitionVertexAggregate.java
@@ -26,10 +26,12 @@ public EntryList getLoadedProperties() {
         return (EntryList)properties;
     }
 
+    @Override
     public<V> void setProperty(String key, V value, Map<String,Integer> keyMap) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public<V> V getProperty(String key, Map<String,Integer> keyMap) {
         throw new UnsupportedOperationException();
     }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/TitanPredicate.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/TitanPredicate.java
index 6659f37650..b06c933002 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/TitanPredicate.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/TitanPredicate.java
@@ -50,6 +50,7 @@ public interface TitanPredicate extends BiPredicate<Object, Object> {
      * Returns the negation of this predicate if it exists, otherwise an exception is thrown. Check {@link #hasNegation()} first.
      * @return
      */
+    @Override
     public TitanPredicate negate();
 
     /**
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/condition/MultiCondition.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/condition/MultiCondition.java
index c66d47fcf5..95eef37519 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/condition/MultiCondition.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/condition/MultiCondition.java
@@ -39,15 +39,18 @@ public abstract class MultiCondition<E extends TitanElement> extends ArrayList<C
         super.addAll(cond);
     }
 
+    @Override
     public boolean add(Condition<E> condition) {
         assert condition != null;
         return super.add(condition);
     }
 
+    @Override
     public int size() {
         return super.size();
     }
 
+    @Override
     public Condition<E> get(int position) {
         return super.get(position);
     }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/graph/JointIndexQuery.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/graph/JointIndexQuery.java
index 3978860756..794fcc5f1d 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/graph/JointIndexQuery.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/query/graph/JointIndexQuery.java
@@ -103,6 +103,7 @@ private Subquery(IndexType index, BackendQuery query) {
             this.query = query;
         }
 
+        @Override
         public void observeWith(QueryProfiler prof) {
             this.profiler = prof.addNested(QueryProfiler.AND_QUERY);
             profiler.setAnnotation(QueryProfiler.QUERY_ANNOTATION,query);
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/TitanBlueprintsGraph.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/TitanBlueprintsGraph.java
index ce871b7efc..cacc19f49f 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/TitanBlueprintsGraph.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/TitanBlueprintsGraph.java
@@ -44,6 +44,7 @@ public abstract class TitanBlueprintsGraph implements TitanGraph {
 
     private ThreadLocal<TitanBlueprintsTransaction> txs = new ThreadLocal<TitanBlueprintsTransaction>() {
 
+        @Override
         protected TitanBlueprintsTransaction initialValue() {
             return null;
         }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/transaction/StandardTitanTx.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/transaction/StandardTitanTx.java
index 7f6f96fd54..2094eeaa55 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/transaction/StandardTitanTx.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/transaction/StandardTitanTx.java
@@ -425,6 +425,7 @@ private InternalVertex getExistingVertex(long vertexid) {
         return vertexCache.get(vertexid, existingVertexRetriever);
     }
 
+    @Override
     public InternalVertex getInternalVertex(long vertexid) {
         //return vertex but potentially check for existence
         return vertexCache.get(vertexid, internalVertexRetriever);
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/transaction/StandardTransactionBuilder.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/transaction/StandardTransactionBuilder.java
index a426b34102..3952633b98 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/transaction/StandardTransactionBuilder.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/transaction/StandardTransactionBuilder.java
@@ -280,6 +280,7 @@ public final boolean hasVerifyUniqueness() {
         return verifyUniqueness;
     }
 
+    @Override
     public boolean hasPropertyPrefetching() {
         return propertyPrefetching;
     }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/CompositeIndexType.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/CompositeIndexType.java
index c92a697c11..a4041158ea 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/CompositeIndexType.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/CompositeIndexType.java
@@ -11,6 +11,7 @@ public interface CompositeIndexType extends IndexType {
 
     public long getID();
 
+    @Override
     public IndexField[] getFieldKeys();
 
     public SchemaStatus getStatus();
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/MixedIndexType.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/MixedIndexType.java
index 2d58b7fd2d..802b6cbc7b 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/MixedIndexType.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/MixedIndexType.java
@@ -7,8 +7,10 @@
  */
 public interface MixedIndexType extends IndexType {
 
+    @Override
     public ParameterIndexField[] getFieldKeys();
 
+    @Override
     public ParameterIndexField getField(PropertyKey key);
 
     public String getStoreName();
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/StandardRelationTypeMaker.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/StandardRelationTypeMaker.java
index 4945a6b04a..a78ad8b196 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/StandardRelationTypeMaker.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/StandardRelationTypeMaker.java
@@ -51,6 +51,7 @@ public StandardRelationTypeMaker(final StandardTitanTx tx, String name,
     }
 
 
+    @Override
     public String getName() {
         return this.name;
     }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/StandardVertexLabelMaker.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/StandardVertexLabelMaker.java
index 91efeef520..26eab72aaf 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/StandardVertexLabelMaker.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/StandardVertexLabelMaker.java
@@ -36,6 +36,7 @@ public StandardVertexLabelMaker name(String name) {
     }
 
 
+    @Override
     public String getName() {
         return name;
     }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/indextype/CompositeIndexTypeWrapper.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/indextype/CompositeIndexTypeWrapper.java
index 5010fe7aa5..cc40c48451 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/indextype/CompositeIndexTypeWrapper.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/indextype/CompositeIndexTypeWrapper.java
@@ -76,6 +76,7 @@ public Cardinality getCardinality() {
 
     private ConsistencyModifier consistency = null;
 
+    @Override
     public ConsistencyModifier getConsistencyModifier() {
         if (consistency==null) {
             consistency = TypeUtil.getConsistencyModifier(base);
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/system/EmptyRelationType.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/system/EmptyRelationType.java
index 9c6b6fb058..65c701f0a9 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/system/EmptyRelationType.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/system/EmptyRelationType.java
@@ -53,6 +53,7 @@ public Iterable<IndexType> getKeyIndexes() {
         return Collections.EMPTY_LIST;
     }
 
+    @Override
     public Integer getTTL() {
         return 0;
     }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/vertices/RelationTypeVertex.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/vertices/RelationTypeVertex.java
index 410ac87fea..cac830564f 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/vertices/RelationTypeVertex.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/vertices/RelationTypeVertex.java
@@ -53,6 +53,7 @@ public Multiplicity multiplicity() {
 
     private ConsistencyModifier consistency = null;
 
+    @Override
     public ConsistencyModifier getConsistencyModifier() {
         if (consistency==null) {
             consistency = TypeUtil.getConsistencyModifier(this);
@@ -70,6 +71,7 @@ public Integer getTTL() {
         return ttl;
     }
 
+    @Override
     public InternalRelationType getBaseType() {
         Entry entry = Iterables.getOnlyElement(getRelated(TypeDefinitionCategory.RELATIONTYPE_INDEX,Direction.IN),null);
         if (entry==null) return null;
@@ -77,6 +79,7 @@ public InternalRelationType getBaseType() {
         return (InternalRelationType)entry.getSchemaType();
     }
 
+    @Override
     public Iterable<InternalRelationType> getRelationIndexes() {
         return Iterables.concat(ImmutableList.of(this),Iterables.transform(getRelated(TypeDefinitionCategory.RELATIONTYPE_INDEX,Direction.OUT),new Function<Entry, InternalRelationType>() {
             @Nullable
@@ -90,6 +93,7 @@ public InternalRelationType apply(@Nullable Entry entry) {
 
     private List<IndexType> indexes = null;
 
+    @Override
     public Iterable<IndexType> getKeyIndexes() {
         List<IndexType> result = indexes;
         if (result==null) {
@@ -105,6 +109,7 @@ public Iterable<IndexType> getKeyIndexes() {
         return result;
     }
 
+    @Override
     public void resetCache() {
         super.resetCache();
         indexes=null;
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/vertices/TitanSchemaVertex.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/vertices/TitanSchemaVertex.java
index a0292db5a2..29a4032766 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/vertices/TitanSchemaVertex.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/types/vertices/TitanSchemaVertex.java
@@ -124,6 +124,7 @@ public Iterable<Entry> getRelated(TypeDefinitionCategory def, Direction dir) {
      * Resets the internal caches used to speed up lookups on this index type.
      * This is needed when the type gets modified in the {@link com.thinkaurelius.titan.graphdb.database.management.ManagementSystem}.
      */
+    @Override
     public void resetCache() {
         name = null;
         definition=null;
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/vertices/AbstractVertex.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/vertices/AbstractVertex.java
index 01981956b4..89d648a4fb 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/vertices/AbstractVertex.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/vertices/AbstractVertex.java
@@ -131,6 +131,7 @@ public <O> O valueOrNull(PropertyKey key) {
 	 * ---------------------------------------------------------------
 	 */
 
+    @Override
     public<V> TitanVertexProperty<V> property(final String key, final V value, final Object... keyValues) {
         TitanVertexProperty<V> p = tx().addProperty(it(), tx().getOrCreatePropertyKey(key), value);
         ElementHelper.attachProperties(p,keyValues);
@@ -152,14 +153,17 @@ public TitanEdge addEdge(String label, Vertex vertex, Object... keyValues) {
         return edge;
     }
 
+    @Override
     public Iterator<Edge> edges(Direction direction, String... labels) {
         return (Iterator)query().direction(direction).labels(labels).edges().iterator();
     }
 
+    @Override
     public <V> Iterator<VertexProperty<V>> properties(String... keys) {
         return (Iterator)query().direction(Direction.OUT).keys(keys).properties().iterator();
     }
 
+    @Override
     public Iterator<Vertex> vertices(final Direction direction, final String... edgeLabels) {
         return (Iterator)query().direction(direction).labels(edgeLabels).vertices().iterator();
 
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/vertices/PreloadedVertex.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/vertices/PreloadedVertex.java
index cfa6df2cd1..0771759b98 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/vertices/PreloadedVertex.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/vertices/PreloadedVertex.java
@@ -101,6 +101,7 @@ public <V> TitanVertexProperty<V> property(VertexProperty.Cardinality cardinalit
         return p;
     }
 
+    @Override
     public <V> TitanVertexProperty<V> property(final String key, final V value, final Object... keyValues) {
         return property(VertexProperty.Cardinality.single, key, value, keyValues);
     }
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/util/datastructures/IntHashSet.java b/titan-core/src/main/java/com/thinkaurelius/titan/util/datastructures/IntHashSet.java
index 2a09137c26..671fcb2cb8 100644
--- a/titan-core/src/main/java/com/thinkaurelius/titan/util/datastructures/IntHashSet.java
+++ b/titan-core/src/main/java/com/thinkaurelius/titan/util/datastructures/IntHashSet.java
@@ -23,10 +23,12 @@ public IntHashSet(int size) {
         super(size);
     }
 
+    @Override
     public boolean add(int value) {
         return super.put(value, defaultValue)==0;
     }
 
+    @Override
     public boolean addAll(int[] values) {
         boolean addedAll = true;
         for (int i = 0; i < values.length; i++) {
@@ -35,10 +37,12 @@ public boolean addAll(int[] values) {
         return addedAll;
     }
 
+    @Override
     public boolean contains(int value) {
         return super.containsKey(value);
     }
 
+    @Override
     public int[] getAll() {
         KeysContainer keys = keys();
         int[] all = new int[keys.size()];
diff --git a/titan-es/src/main/java/com/thinkaurelius/titan/diskstorage/es/ElasticSearchIndex.java b/titan-es/src/main/java/com/thinkaurelius/titan/diskstorage/es/ElasticSearchIndex.java
index 0a8d525b33..b3e3f2b69d 100644
--- a/titan-es/src/main/java/com/thinkaurelius/titan/diskstorage/es/ElasticSearchIndex.java
+++ b/titan-es/src/main/java/com/thinkaurelius/titan/diskstorage/es/ElasticSearchIndex.java
@@ -694,6 +694,7 @@ private static String convertToJsType(Object value) throws PermanentBackendExcep
     }
 
 
+    @Override
     public void restore(Map<String,Map<String, List<IndexEntry>>> documents, KeyInformation.IndexRetriever informations, BaseTransaction tx) throws BackendException {
         BulkRequestBuilder bulk = client.prepareBulk();
         int requests = 0;
diff --git a/titan-hadoop-parent/titan-hadoop-core/src/main/java/com/thinkaurelius/titan/hadoop/formats/util/TitanVertexDeserializer.java b/titan-hadoop-parent/titan-hadoop-core/src/main/java/com/thinkaurelius/titan/hadoop/formats/util/TitanVertexDeserializer.java
index 3d09f457ec..fb00f6abf0 100644
--- a/titan-hadoop-parent/titan-hadoop-core/src/main/java/com/thinkaurelius/titan/hadoop/formats/util/TitanVertexDeserializer.java
+++ b/titan-hadoop-parent/titan-hadoop-core/src/main/java/com/thinkaurelius/titan/hadoop/formats/util/TitanVertexDeserializer.java
@@ -224,6 +224,7 @@ private VertexProperty.Cardinality getPropertyKeyCardinality(String name) {
         }
     }
 
+    @Override
     public void close() {
         setup.close();
     }
diff --git a/titan-hadoop-parent/titan-hadoop-core/src/main/java/com/thinkaurelius/titan/hadoop/scan/CassandraHadoopScanRunner.java b/titan-hadoop-parent/titan-hadoop-core/src/main/java/com/thinkaurelius/titan/hadoop/scan/CassandraHadoopScanRunner.java
index 4126638116..3ee264e11f 100644
--- a/titan-hadoop-parent/titan-hadoop-core/src/main/java/com/thinkaurelius/titan/hadoop/scan/CassandraHadoopScanRunner.java
+++ b/titan-hadoop-parent/titan-hadoop-core/src/main/java/com/thinkaurelius/titan/hadoop/scan/CassandraHadoopScanRunner.java
@@ -29,6 +29,7 @@ public CassandraHadoopScanRunner(VertexScanJob vertexScanJob) {
         super(vertexScanJob);
     }
 
+    @Override
     protected CassandraHadoopScanRunner self() {
         return this;
     }
diff --git a/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/HBaseStorageSetup.java b/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/HBaseStorageSetup.java
index 162c5fa2fb..b7c64515c7 100644
--- a/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/HBaseStorageSetup.java
+++ b/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/HBaseStorageSetup.java
@@ -194,6 +194,7 @@ private synchronized static void deleteData() {
      */
     private static void registerKillerHook(final HBaseStatus stat) {
         Runtime.getRuntime().addShutdownHook(new Thread() {
+            @Override
             public void run() {
                 shutdownHBase(stat);
             }
diff --git a/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseIDAuthorityTest.java b/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseIDAuthorityTest.java
index 027213a100..b1a7df47c2 100644
--- a/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseIDAuthorityTest.java
+++ b/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseIDAuthorityTest.java
@@ -32,6 +32,7 @@ public static void stopHBase() {
             HBaseStorageSetup.killIfRunning();
     }
 
+    @Override
     public KeyColumnValueStoreManager openStorageManager() throws BackendException {
         return new HBaseStoreManager(HBaseStorageSetup.getHBaseConfiguration());
     }
diff --git a/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseLockStoreTest.java b/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseLockStoreTest.java
index dc20ef4fe5..9b66988ce7 100644
--- a/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseLockStoreTest.java
+++ b/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseLockStoreTest.java
@@ -24,6 +24,7 @@ public static void stopHBase() {
             HBaseStorageSetup.killIfRunning();
     }
 
+    @Override
     public KeyColumnValueStoreManager openStorageManager(int idx) throws BackendException {
         return new HBaseStoreManager(HBaseStorageSetup.getHBaseConfiguration());
     }
diff --git a/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseMultiWriteStoreTest.java b/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseMultiWriteStoreTest.java
index 832e39ec0b..5283a036eb 100644
--- a/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseMultiWriteStoreTest.java
+++ b/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseMultiWriteStoreTest.java
@@ -25,6 +25,7 @@ public static void stopHBase() {
             HBaseStorageSetup.killIfRunning();
     }
 
+    @Override
     public KeyColumnValueStoreManager openStorageManager() throws BackendException {
         return new HBaseStoreManager(HBaseStorageSetup.getHBaseConfiguration());
     }
diff --git a/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseStoreTest.java b/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseStoreTest.java
index 53b0ef7457..613e2258c9 100644
--- a/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseStoreTest.java
+++ b/titan-hbase-parent/titan-hbase-core/src/test/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseStoreTest.java
@@ -29,11 +29,13 @@ public static void stopHBase() {
             HBaseStorageSetup.killIfRunning();
     }
 
+    @Override
     public KeyColumnValueStoreManager openStorageManager() throws BackendException {
         WriteConfiguration config = HBaseStorageSetup.getHBaseGraphConfiguration();
         return new HBaseStoreManager(new BasicConfiguration(GraphDatabaseConfiguration.ROOT_NS,config, BasicConfiguration.Restriction.NONE));
     }
 
+    @Override
     @Test
     public void testGetKeysWithKeyRange() throws Exception {
         super.testGetKeysWithKeyRange();
diff --git a/titan-solr/src/test/java/com/thinkaurelius/titan/diskstorage/solr/SolrTitanIndexTest.java b/titan-solr/src/test/java/com/thinkaurelius/titan/diskstorage/solr/SolrTitanIndexTest.java
index e2d92c4ccb..624bc8f08a 100644
--- a/titan-solr/src/test/java/com/thinkaurelius/titan/diskstorage/solr/SolrTitanIndexTest.java
+++ b/titan-solr/src/test/java/com/thinkaurelius/titan/diskstorage/solr/SolrTitanIndexTest.java
@@ -35,6 +35,7 @@ protected boolean supportsCollections() {
         return false;
     }
 
+    @Override
     @Test
     public void testRawQueries() {
         clopen(option(SolrIndex.DYNAMIC_FIELDS,TitanIndexTest.INDEX),false);
diff --git a/titan-test/src/main/java/com/thinkaurelius/titan/DaemonRunner.java b/titan-test/src/main/java/com/thinkaurelius/titan/DaemonRunner.java
index 7f07f368a4..ce213c28c9 100644
--- a/titan-test/src/main/java/com/thinkaurelius/titan/DaemonRunner.java
+++ b/titan-test/src/main/java/com/thinkaurelius/titan/DaemonRunner.java
@@ -77,6 +77,7 @@ private synchronized void registerKillerHook(final S stat) {
             return;
         }
         killerHook = new Thread() {
+            @Override
             public void run() {
                 killAndUnregisterHook(stat);
             }
diff --git a/titan-test/src/main/java/com/thinkaurelius/titan/TestBed.java b/titan-test/src/main/java/com/thinkaurelius/titan/TestBed.java
index a102f246f4..c7c9acd974 100644
--- a/titan-test/src/main/java/com/thinkaurelius/titan/TestBed.java
+++ b/titan-test/src/main/java/com/thinkaurelius/titan/TestBed.java
@@ -140,6 +140,7 @@ public void observe(Object o1, Object o2, Observer other) {
             other.observe(combined);
         }
 
+        @Override
         public boolean observes() {
             return observed;
         }
diff --git a/titan-test/src/main/java/com/thinkaurelius/titan/diskstorage/SimpleScanJob.java b/titan-test/src/main/java/com/thinkaurelius/titan/diskstorage/SimpleScanJob.java
index a58b2379b2..76fae9e1c0 100644
--- a/titan-test/src/main/java/com/thinkaurelius/titan/diskstorage/SimpleScanJob.java
+++ b/titan-test/src/main/java/com/thinkaurelius/titan/diskstorage/SimpleScanJob.java
@@ -100,6 +100,7 @@ public void workerIterationStart(Configuration config, Configuration graphConfig
         }
     }
 
+    @Override
     public void workerIterationEnd(ScanMetrics metrics) {
         metrics.incrementCustom(TEARDOWN_COUNT);
     }
diff --git a/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java b/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java
index 7bfd98c5d7..a67457c8d9 100644
--- a/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java
+++ b/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java
@@ -2479,6 +2479,7 @@ private int executeParallelTransactions(final TransactionJob job, int number) {
         final AtomicInteger txSuccess = new AtomicInteger(0);
         for (int i = 0; i < number; i++) {
             new Thread() {
+                @Override
                 public void run() {
                     awaitAllThreadsReady();
                     TitanTransaction tx = graph.newTransaction();
diff --git a/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanPartitionGraphTest.java b/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanPartitionGraphTest.java
index 733d91778f..6d57ea1ac9 100644
--- a/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanPartitionGraphTest.java
+++ b/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanPartitionGraphTest.java
@@ -69,6 +69,7 @@ public WriteConfiguration getConfiguration() {
 
     private IDManager idManager;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
diff --git a/titan-test/src/main/java/com/thinkaurelius/titan/olap/OLAPTest.java b/titan-test/src/main/java/com/thinkaurelius/titan/olap/OLAPTest.java
index c65f4025d1..69f7766cee 100644
--- a/titan-test/src/main/java/com/thinkaurelius/titan/olap/OLAPTest.java
+++ b/titan-test/src/main/java/com/thinkaurelius/titan/olap/OLAPTest.java
@@ -41,6 +41,7 @@ public abstract class OLAPTest extends TitanGraphBaseTest {
     private static final Logger log =
             LoggerFactory.getLogger(OLAPTest.class);
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
diff --git a/titan-test/src/main/java/com/thinkaurelius/titan/testutil/CsvConsumer.java b/titan-test/src/main/java/com/thinkaurelius/titan/testutil/CsvConsumer.java
index a8bd14add3..ddd818e809 100644
--- a/titan-test/src/main/java/com/thinkaurelius/titan/testutil/CsvConsumer.java
+++ b/titan-test/src/main/java/com/thinkaurelius/titan/testutil/CsvConsumer.java
@@ -126,6 +126,7 @@ public CsvConsumer(String fileName) throws IOException {
         printHeader();
     }
 
+    @Override
     public synchronized void accept(Result r) throws IOException {
         Joiner j = Joiner.on(separator);
         List<String> fields = new ArrayList<String>(Column.values().length);
diff --git a/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryGraphTest.java b/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryGraphTest.java
index c8dbfaca97..51e63787df 100644
--- a/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryGraphTest.java
+++ b/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryGraphTest.java
@@ -15,6 +15,7 @@
 
 public class InMemoryGraphTest extends TitanGraphTest {
 
+    @Override
     public WriteConfiguration getConfiguration() {
         ModifiableConfiguration config = GraphDatabaseConfiguration.buildGraphConfiguration();
         config.set(GraphDatabaseConfiguration.STORAGE_BACKEND,"inmemory");
@@ -40,18 +41,23 @@ public void clopen(Object... settings) {
         newTx();
     }
 
+    @Override
     @Test
     public void testLocalGraphConfiguration() {}
 
+    @Override
     @Test
     public void testMaskableGraphConfig() {}
 
+    @Override
     @Test
     public void testGlobalGraphConfig() {}
 
+    @Override
     @Test
     public void testGlobalOfflineGraphConfig() {}
 
+    @Override
     @Test
     public void testFixedGraphConfig() {}
 
diff --git a/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryOLAPTest.java b/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryOLAPTest.java
index 5712baa5a8..4adf68b562 100644
--- a/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryOLAPTest.java
+++ b/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryOLAPTest.java
@@ -12,6 +12,7 @@
 
 public class InMemoryOLAPTest extends OLAPTest {
 
+    @Override
     public WriteConfiguration getConfiguration() {
         ModifiableConfiguration config = GraphDatabaseConfiguration.buildGraphConfiguration();
         config.set(GraphDatabaseConfiguration.STORAGE_BACKEND,"inmemory");
diff --git a/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryTitanIoTest.java b/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryTitanIoTest.java
index 8d5d7caeff..718dcc9e14 100644
--- a/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryTitanIoTest.java
+++ b/titan-test/src/test/java/com/thinkaurelius/titan/graphdb/inmemory/InMemoryTitanIoTest.java
@@ -13,6 +13,7 @@
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public class InMemoryTitanIoTest extends TitanIoTest {
+    @Override
     public WriteConfiguration getConfiguration() {
         ModifiableConfiguration config = GraphDatabaseConfiguration.buildGraphConfiguration();
         config.set(GraphDatabaseConfiguration.STORAGE_BACKEND,"inmemory");