Modified GossipIntentStore to use EventuallyConsistentMaps.

All IntentStore operations are now implemented.

ONOS-858

Change-Id: I5081805b61c7e25e28707b90093cae12b5a4374b

@@ -151,7 +151,7 @@ public interface EventuallyConsistentMap<K, V> {
      *
      *
      * @param listener listener to register for events
      * @param listener listener to register for events
      */
      */
-    public void addListener(EventuallyConsistentMapListener listener);
+    public void addListener(EventuallyConsistentMapListener<K, V> listener);
 
 
     /**
     /**
      * Removes the specified listener from the map such that it will no longer
      * Removes the specified listener from the map such that it will no longer
@@ -159,7 +159,7 @@ public interface EventuallyConsistentMap<K, V> {
      *
      *
      * @param listener listener to deregister for events
      * @param listener listener to deregister for events
      */
      */
-    public void removeListener(EventuallyConsistentMapListener listener);
+    public void removeListener(EventuallyConsistentMapListener<K, V> listener);
 
 
     /**
     /**
      * Shuts down the map and breaks communication between different instances.
      * Shuts down the map and breaks communication between different instances.

@@ -78,7 +78,7 @@ public class EventuallyConsistentMapImpl<K, V>
     private final ScheduledExecutorService backgroundExecutor;
     private final ScheduledExecutorService backgroundExecutor;
 
 
     private volatile boolean destroyed = false;
     private volatile boolean destroyed = false;
-    private static final String ERROR_DESTROYED = " is already destroyed";
+    private static final String ERROR_DESTROYED = " map is already destroyed";
 
 
     // TODO: Make these anti-entropy params configurable
     // TODO: Make these anti-entropy params configurable
     private long initialDelaySec = 5;
     private long initialDelaySec = 5;
@@ -154,6 +154,7 @@ public class EventuallyConsistentMapImpl<K, V>
                 serializerPool = builder
                 serializerPool = builder
                         .register(WallClockTimestamp.class)
                         .register(WallClockTimestamp.class)
                         .register(PutEntry.class)
                         .register(PutEntry.class)
+                        .register(RemoveEntry.class)
                         .register(ArrayList.class)
                         .register(ArrayList.class)
                         .register(InternalPutEvent.class)
                         .register(InternalPutEvent.class)
                         .register(InternalRemoveEvent.class)
                         .register(InternalRemoveEvent.class)
@@ -166,25 +167,25 @@ public class EventuallyConsistentMapImpl<K, V>
 
 
     @Override
     @Override
     public int size() {
     public int size() {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
         return items.size();
         return items.size();
     }
     }
 
 
     @Override
     @Override
     public boolean isEmpty() {
     public boolean isEmpty() {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
         return items.isEmpty();
         return items.isEmpty();
     }
     }
 
 
     @Override
     @Override
     public boolean containsKey(K key) {
     public boolean containsKey(K key) {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
         return items.containsKey(key);
         return items.containsKey(key);
     }
     }
 
 
     @Override
     @Override
     public boolean containsValue(V value) {
     public boolean containsValue(V value) {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
 
 
         return items.values().stream()
         return items.values().stream()
                 .anyMatch(timestamped -> timestamped.value().equals(value));
                 .anyMatch(timestamped -> timestamped.value().equals(value));
@@ -192,7 +193,7 @@ public class EventuallyConsistentMapImpl<K, V>
 
 
     @Override
     @Override
     public V get(K key) {
     public V get(K key) {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
 
 
         Timestamped<V> value = items.get(key);
         Timestamped<V> value = items.get(key);
         if (value != null) {
         if (value != null) {
@@ -203,7 +204,7 @@ public class EventuallyConsistentMapImpl<K, V>
 
 
     @Override
     @Override
     public void put(K key, V value) {
     public void put(K key, V value) {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
 
 
         Timestamp timestamp = clockService.getTimestamp(key);
         Timestamp timestamp = clockService.getTimestamp(key);
         if (putInternal(key, value, timestamp)) {
         if (putInternal(key, value, timestamp)) {
@@ -235,7 +236,7 @@ public class EventuallyConsistentMapImpl<K, V>
 
 
     @Override
     @Override
     public void remove(K key) {
     public void remove(K key) {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
 
 
         Timestamp timestamp = clockService.getTimestamp(key);
         Timestamp timestamp = clockService.getTimestamp(key);
         if (removeInternal(key, timestamp)) {
         if (removeInternal(key, timestamp)) {
@@ -261,7 +262,7 @@ public class EventuallyConsistentMapImpl<K, V>
 
 
     @Override
     @Override
     public void putAll(Map<? extends K, ? extends V> m) {
     public void putAll(Map<? extends K, ? extends V> m) {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
 
 
         List<PutEntry<K, V>> updates = new ArrayList<>(m.size());
         List<PutEntry<K, V>> updates = new ArrayList<>(m.size());
 
 
@@ -287,7 +288,7 @@ public class EventuallyConsistentMapImpl<K, V>
 
 
     @Override
     @Override
     public void clear() {
     public void clear() {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
 
 
         List<RemoveEntry<K>> removed = new ArrayList<>(items.size());
         List<RemoveEntry<K>> removed = new ArrayList<>(items.size());
 
 
@@ -311,14 +312,14 @@ public class EventuallyConsistentMapImpl<K, V>
 
 
     @Override
     @Override
     public Set<K> keySet() {
     public Set<K> keySet() {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
 
 
         return items.keySet();
         return items.keySet();
     }
     }
 
 
     @Override
     @Override
     public Collection<V> values() {
     public Collection<V> values() {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
 
 
         return items.values().stream()
         return items.values().stream()
                 .map(Timestamped::value)
                 .map(Timestamped::value)
@@ -327,7 +328,7 @@ public class EventuallyConsistentMapImpl<K, V>
 
 
     @Override
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
     public Set<Map.Entry<K, V>> entrySet() {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
 
 
         return items.entrySet().stream()
         return items.entrySet().stream()
                 .map(e -> new Entry(e.getKey(), e.getValue().value()))
                 .map(e -> new Entry(e.getKey(), e.getValue().value()))
@@ -335,15 +336,15 @@ public class EventuallyConsistentMapImpl<K, V>
     }
     }
 
 
     @Override
     @Override
-    public void addListener(EventuallyConsistentMapListener listener) {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+    public void addListener(EventuallyConsistentMapListener<K, V> listener) {
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
 
 
         listeners.add(checkNotNull(listener));
         listeners.add(checkNotNull(listener));
     }
     }
 
 
     @Override
     @Override
-    public void removeListener(EventuallyConsistentMapListener listener) {
-        checkState(destroyed, mapName + ERROR_DESTROYED);
+    public void removeListener(EventuallyConsistentMapListener<K, V> listener) {
+        checkState(!destroyed, mapName + ERROR_DESTROYED);
 
 
         listeners.remove(checkNotNull(listener));
         listeners.remove(checkNotNull(listener));
     }
     }

@@ -19,12 +19,12 @@ package org.onosproject.store.impl;
  * Listener interested in receiving modification events for an
  * Listener interested in receiving modification events for an
  * EventuallyConsistentMap.
  * EventuallyConsistentMap.
  */
  */
-public interface EventuallyConsistentMapListener {
+public interface EventuallyConsistentMapListener<K, V> {
 
 
     /**
     /**
      * Reacts to the specified event.
      * Reacts to the specified event.
      *
      *
      * @param event the event
      * @param event the event
      */
      */
-    public void event(EventuallyConsistentMapEvent event);
+    public void event(EventuallyConsistentMapEvent<K, V> event);
 }
 }