Fixed AtomicCounter database command names

Change-Id: I90a698b7692834042e318ad21a7ba862b076315f

@@ -98,10 +98,7 @@ public interface DatabaseState<K, V> {
   Result<Boolean> replace(String tableName, K key, long oldVersion, V newValue);
   Result<Boolean> replace(String tableName, K key, long oldVersion, V newValue);
 
 
   @Command
   @Command
-  Long counterIncrementAndGet(String counterName);
-
-  @Command
-  Long counterGetAndIncrement(String counterName);
+  Long counterAddAndGet(String counterName, long delta);
 
 
   @Command
   @Command
   Long counterGetAndAdd(String counterName, long delta);
   Long counterGetAndAdd(String counterName, long delta);

@@ -225,13 +225,8 @@ public class DefaultDatabaseState implements DatabaseState<String, byte[]> {
     }
     }
 
 
     @Override
     @Override
-    public Long counterIncrementAndGet(String counterName) {
-        return getCounter(counterName).incrementAndGet();
-    }
-
-    @Override
-    public Long counterGetAndIncrement(String counterName) {
-        return getCounter(counterName).getAndIncrement();
+    public Long counterAddAndGet(String counterName, long delta) {
+        return getCounter(counterName).addAndGet(delta);
     }
     }
 
 
     @Override
     @Override