X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fstreams%2Flisteners%2FNotificator.java;h=17565a6b8c082d314f5b4e90715be18ca3536a8c;hp=75e22ed88e63fd4043db211eb3d64d27cda82fb7;hb=eb887b1c2c8cd2768f8b4c2ed2b5054f97798466;hpb=1ee71ae58a03de1c1f8fd8c789e7921508ba9f59

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/Notificator.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/Notificator.java
index 75e22ed88e..17565a6b8c 100644
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/Notificator.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/Notificator.java
@@ -12,20 +12,19 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
-
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 /**
- * {@link Notificator} is responsible to create, remove and find {@link ListenerAdapter} listener.
+ * {@link Notificator} is responsible to create, remove and find
+ * {@link ListenerAdapter} listener.
  */
 public class Notificator {
 
     private static Map<String, ListenerAdapter> listenersByStreamName = new ConcurrentHashMap<>();
-	private static Map<InstanceIdentifier, ListenerAdapter> listenersByInstanceIdentifier = new ConcurrentHashMap<>();
-	private static final Lock lock = new ReentrantLock();
+    private static final Lock lock = new ReentrantLock();
 
-	private Notificator() {
-	}
+    private Notificator() {
+    }
 
     /**
      * Returns list of all stream names
@@ -34,153 +33,118 @@ public class Notificator {
         return listenersByStreamName.keySet();
     }
 
+    /**
+     * Gets {@link ListenerAdapter} specified by stream name.
+     *
+     * @param streamName
+     *            The name of the stream.
+     * @return {@link ListenerAdapter} specified by stream name.
+     */
+    public static ListenerAdapter getListenerFor(String streamName) {
+        return listenersByStreamName.get(streamName);
+    }
 
-	/**
-	 * Gets {@link ListenerAdapter} specified by stream name.
-	 *
-	 * @param streamName
-	 *            The name of the stream.
-	 * @return {@link ListenerAdapter} specified by stream name.
-	 */
-	public static ListenerAdapter getListenerFor(String streamName) {
-		return listenersByStreamName.get(streamName);
-	}
-
-	/**
-	 * Gets {@link ListenerAdapter} listener specified by
-	 * {@link InstanceIdentifier} path.
-	 *
-	 * @param path
-	 *            Path to data in data repository.
-	 * @return ListenerAdapter
-	 */
-	public static ListenerAdapter getListenerFor(InstanceIdentifier path) {
-		return listenersByInstanceIdentifier.get(path);
-	}
-
-	/**
-	 * Checks if the listener specified by {@link InstanceIdentifier} path
-	 * exist.
-	 *
-	 * @param path
-	 *            Path to data in data repository.
-	 * @return True if the listener exist, false otherwise.
-	 */
-	public static boolean existListenerFor(InstanceIdentifier path) {
-		return listenersByInstanceIdentifier.containsKey(path);
-	}
-
-	/**
-	 * Creates new {@link ListenerAdapter} listener from
-	 * {@link InstanceIdentifier} path and stream name.
-	 *
-	 * @param path
-	 *            Path to data in data repository.
-	 * @param streamName
-	 *            The name of the stream.
-	 * @return New {@link ListenerAdapter} listener from
-	 *         {@link InstanceIdentifier} path and stream name.
-	 */
-	public static ListenerAdapter createListener(InstanceIdentifier path,
-			String streamName) {
-		ListenerAdapter listener = new ListenerAdapter(path, streamName);
-		try {
-			lock.lock();
-			listenersByInstanceIdentifier.put(path, listener);
-			listenersByStreamName.put(streamName, listener);
-		} finally {
-			lock.unlock();
-		}
-		return listener;
-	}
+    /**
+     * Checks if the listener specified by {@link YangInstanceIdentifier} path exist.
+     *
+     * @param streamName
+     * @return True if the listener exist, false otherwise.
+     */
+    public static boolean existListenerFor(String streamName) {
+        return listenersByStreamName.containsKey(streamName);
+    }
 
-	/**
-	 * Looks for listener determined by {@link InstanceIdentifier} path and
-	 * removes it.
-	 *
-	 * @param path
-	 *            InstanceIdentifier
-	 */
-	public static void removeListener(InstanceIdentifier path) {
-		ListenerAdapter listener = listenersByInstanceIdentifier.get(path);
-		deleteListener(listener);
-	}
+    /**
+     * Creates new {@link ListenerAdapter} listener from {@link YangInstanceIdentifier} path and stream name.
+     *
+     * @param path
+     *            Path to data in data repository.
+     * @param streamName
+     *            The name of the stream.
+     * @return New {@link ListenerAdapter} listener from {@link YangInstanceIdentifier} path and stream name.
+     */
+    public static ListenerAdapter createListener(YangInstanceIdentifier path, String streamName) {
+        ListenerAdapter listener = new ListenerAdapter(path, streamName);
+        try {
+            lock.lock();
+            listenersByStreamName.put(streamName, listener);
+        } finally {
+            lock.unlock();
+        }
+        return listener;
+    }
 
-	/**
-	 * Creates String representation of stream name from URI. Removes slash from
-	 * URI in start and end position.
-	 *
-	 * @param uri
-	 *            URI for creation stream name.
-	 * @return String representation of stream name.
-	 */
-	public static String createStreamNameFromUri(String uri) {
-		if (uri == null) {
-			return null;
-		}
-		String result = uri;
-		if (result.startsWith("/")) {
-			result = result.substring(1);
-		}
-		if (result.endsWith("/")) {
-			result = result.substring(0, result.length());
-		}
-		return result;
-	}
+    /**
+     * Looks for listener determined by {@link YangInstanceIdentifier} path and removes it.
+     * Creates String representation of stream name from URI. Removes slash from URI in start and end position.
+     *
+     * @param uri
+     *            URI for creation stream name.
+     * @return String representation of stream name.
+     */
+    public static String createStreamNameFromUri(String uri) {
+        if (uri == null) {
+            return null;
+        }
+        String result = uri;
+        if (result.startsWith("/")) {
+            result = result.substring(1);
+        }
+        if (result.endsWith("/")) {
+            result = result.substring(0, result.length()-1);
+        }
+        return result;
+    }
 
-	/**
-	 * Removes all listeners.
-	 */
-	public static void removeAllListeners() {
-		for (ListenerAdapter listener : listenersByInstanceIdentifier.values()) {
-			try {
-				listener.close();
-			} catch (Exception e) {
-			}
-		}
-		try {
-			lock.lock();
-			listenersByStreamName = new ConcurrentHashMap<>();
-			listenersByInstanceIdentifier = new ConcurrentHashMap<>();
-		} finally {
-			lock.unlock();
-		}
-	}
+    /**
+     * Removes all listeners.
+     */
+    public static void removeAllListeners() {
+        for (ListenerAdapter listener : listenersByStreamName.values()) {
+            try {
+                listener.close();
+            } catch (Exception e) {
+            }
+        }
+        try {
+            lock.lock();
+            listenersByStreamName = new ConcurrentHashMap<>();
+        } finally {
+            lock.unlock();
+        }
+    }
 
-	/**
-	 * Checks if listener has at least one subscriber. In case it doesn't have any, delete
-	 * listener.
-	 *
-	 * @param listener
-	 *            ListenerAdapter
-	 */
-	public static void removeListenerIfNoSubscriberExists(
-			ListenerAdapter listener) {
-		if (!listener.hasSubscribers()) {
-			deleteListener(listener);
-		}
-	}
+    /**
+     * Checks if listener has at least one subscriber. In case it doesn't have any, delete listener.
+     *
+     * @param listener
+     *            ListenerAdapter
+     */
+    public static void removeListenerIfNoSubscriberExists(ListenerAdapter listener) {
+        if (!listener.hasSubscribers()) {
+            deleteListener(listener);
+        }
+    }
 
-	/**
-	 * Delete {@link ListenerAdapter} listener specified in parameter.
-	 *
-	 * @param listener
-	 *            ListenerAdapter
-	 */
-	private static void deleteListener(ListenerAdapter listener) {
-		if (listener != null) {
-			try {
-				listener.close();
-			} catch (Exception e) {
-			}
-			try {
-				lock.lock();
-				listenersByInstanceIdentifier.remove(listener.getPath());
-				listenersByStreamName.remove(listener.getStreamName());
-			} finally {
-				lock.unlock();
-			}
-		}
-	}
+    /**
+     * Delete {@link ListenerAdapter} listener specified in parameter.
+     *
+     * @param listener
+     *            ListenerAdapter
+     */
+    private static void deleteListener(ListenerAdapter listener) {
+        if (listener != null) {
+            try {
+                listener.close();
+            } catch (Exception e) {
+            }
+            try {
+                lock.lock();
+                listenersByStreamName.remove(listener.getStreamName());
+            } finally {
+                lock.unlock();
+            }
+        }
+    }
 
 }