commit 3fe5effb40a1578b6b5d54bf11b1938a27b5125a
author Mahesh Poojary Huawei <mahesh.poojary@huawei.com> Sun Nov 29 15:13:18 2015 +0530
committer Mahesh Poojary Huawei <mahesh.poojary@huawei.com> Wed Dec 02 07:03:09 2015 +0000
tree 13687d99c2787b4593a35a468f84421181942208
parent 6623df7629d1d5b006d62c4447e11de39de94717

[ONOS-3117] add listener to PortPairManager

Change-Id: I261527308da725996dbae34bddb855c0cacc6367

apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/PortPairService.java

diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/PortPairService.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/PortPairService.java
index f99cc2c..e98a6a2 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/PortPairService.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/PortPairService.java
@@ -77,4 +77,18 @@
      * @return true if the give port pair is deleted successfully.
      */
     boolean removePortPair(PortPairId portPairId);
+
+    /**
+     * Adds the specified listener to Port-Pair manager.
+     *
+     * @param listener Port-Pair listener
+     */
+    void addListener(PortPairListener listener);
+
+    /**
+     * Removes the specified listener to Port-Pair manager.
+     *
+     * @param listener Port-Pair listener
+     */
+    void removeListener(PortPairListener listener);
 }

apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/impl/PortPairManager.java

diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/impl/PortPairManager.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/impl/PortPairManager.java
index 93c8782..ad6fd4b 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/impl/PortPairManager.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/impl/PortPairManager.java
@@ -19,6 +19,7 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 import java.util.Collections;
+import java.util.Set;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
@@ -34,9 +35,12 @@
 import org.onosproject.store.service.WallClockTimestamp;
 import org.onosproject.vtnrsc.PortPair;
 import org.onosproject.vtnrsc.PortPairId;
+import org.onosproject.vtnrsc.portpair.PortPairListener;
 import org.onosproject.vtnrsc.portpair.PortPairService;
 import org.slf4j.Logger;
 
+import com.google.common.collect.Sets;
+
 /**
  * Provides implementation of the portPairService.
  */
@@ -44,11 +48,12 @@
 @Service
 public class PortPairManager implements PortPairService {
 
-    private final Logger log = getLogger(getClass());
-
     private static final String PORT_PAIR_ID_NULL = "PortPair ID cannot be null";
     private static final String PORT_PAIR_NULL = "PortPair cannot be null";
+    private static final String LISTENER_NOT_NULL = "Listener cannot be null";
 
+    private final Logger log = getLogger(getClass());
+    private final Set<PortPairListener> listeners = Sets.newCopyOnWriteArraySet();
     private EventuallyConsistentMap<PortPairId, PortPair> portPairStore;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -73,6 +78,7 @@
     @Deactivate
     public void deactivate() {
         portPairStore.destroy();
+        listeners.clear();
         log.info("Stopped");
     }
 
@@ -143,4 +149,16 @@
         }
         return true;
     }
+
+    @Override
+    public void addListener(PortPairListener listener) {
+        checkNotNull(listener, LISTENER_NOT_NULL);
+        listeners.add(listener);
+    }
+
+    @Override
+    public void removeListener(PortPairListener listener) {
+        checkNotNull(listener, LISTENER_NOT_NULL);
+        listeners.remove(listener);
+    }
 }