@Override annotation should be used where necessary

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();

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);

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();

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;
     }

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);
 

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"

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

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);
 
     /**

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);
         }

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();
 
     /**

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;

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}) {

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);
     }

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;

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;
     }

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;

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()) {

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;

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++) {

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();

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);
             }

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));
         }

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();

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()) {

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());
     }

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);
     }

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;