commit 7804c99703f043795331881f024acf7c4cb68218
author Madan Jampani <madan@onlab.us> Mon Jul 20 13:20:19 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Jul 21 18:26:24 2015 +0000
tree c1312ae2f3210538fada9e85b7e2cec751467961
parent 0e7a1bdaefff666ecd33077b00d1f611cc716629

Refactored code to consolidate functionality in Database* classes.
Renamed few methods and variables to align with local convention and also to match the description of functionality.

Change-Id: Ib17e73079534c76f76bcb01f14b6496e62275dbd

core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseState.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseState.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseState.java
index 0af7f42..e0582c9 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseState.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseState.java
@@ -45,67 +45,40 @@
   void init(StateContext<DatabaseState<K, V>> context);
 
   @Query
-  Set<String> tableNames();
+  Set<String> maps();
 
   @Query
   Map<String, Long> counters();
 
   @Query
-  int size(String tableName);
+  int size(String mapName);
 
   @Query
-  boolean isEmpty(String tableName);
+  boolean mapIsEmpty(String mapName);
 
   @Query
-  boolean containsKey(String tableName, K key);
+  boolean mapContainsKey(String mapName, K key);
 
   @Query
-  boolean containsValue(String tableName, V value);
+  boolean mapContainsValue(String mapName, V value);
 
   @Query
-  Versioned<V> get(String tableName, K key);
+  Versioned<V> mapGet(String mapName, K key);
 
   @Command
-  Result<Versioned<V>> put(String tableName, K key, V value);
+  Result<UpdateResult<K, V>> mapUpdate(String mapName, K key, Match<V> valueMatch, Match<Long> versionMatch, V value);
 
   @Command
-  Result<UpdateResult<Versioned<V>>> putAndGet(String tableName, K key, V value);
-
-  @Command
-  Result<UpdateResult<Versioned<V>>> putIfAbsentAndGet(String tableName, K key, V value);
-
-  @Command
-  Result<Versioned<V>> remove(String tableName, K key);
-
-  @Command
-  Result<Void> clear(String tableName);
+  Result<Void> mapClear(String mapName);
 
   @Query
-  Set<K> keySet(String tableName);
+  Set<K> mapKeySet(String mapName);
 
   @Query
-  Collection<Versioned<V>> values(String tableName);
+  Collection<Versioned<V>> mapValues(String mapName);
 
   @Query
-  Set<Entry<K, Versioned<V>>> entrySet(String tableName);
-
-  @Command
-  Result<Versioned<V>> putIfAbsent(String tableName, K key, V value);
-
-  @Command
-  Result<Boolean> remove(String tableName, K key, V value);
-
-  @Command
-  Result<Boolean> remove(String tableName, K key, long version);
-
-  @Command
-  Result<Boolean> replace(String tableName, K key, V oldValue, V newValue);
-
-  @Command
-  Result<Boolean> replace(String tableName, K key, long oldVersion, V newValue);
-
-  @Command
-  Result<UpdateResult<Versioned<V>>> replaceAndGet(String tableName, K key, long oldVersion, V newValue);
+  Set<Entry<K, Versioned<V>>> mapEntrySet(String mapName);
 
   @Command
   Long counterAddAndGet(String counterName, long delta);