Revert "RESTCONF notification fixes"
This reverts commit 05c2c76eec9bbe553c3b4eeb9dcbb2175a25e3c2.
Change-Id: Ia92aa928ac9b6672cb229795ed4ea47f51bbafc2
diff --git a/protocols/restconf/client/api/src/main/java/org/onosproject/protocol/restconf/RestConfSBController.java b/protocols/restconf/client/api/src/main/java/org/onosproject/protocol/restconf/RestConfSBController.java
index 4cf9fe0..772aaea 100644
--- a/protocols/restconf/client/api/src/main/java/org/onosproject/protocol/restconf/RestConfSBController.java
+++ b/protocols/restconf/client/api/src/main/java/org/onosproject/protocol/restconf/RestConfSBController.java
@@ -31,48 +31,29 @@
* callBackListener upon receiving notifications to notify the requester
* about notifications.
*
- * @param device device to make the request to
- * @param request url of the request
- * @param mediaType format to retrieve the content in
+ *
+ * @param device device to make the request to
+ * @param request url of the request
+ * @param mediaType format to retrieve the content in
* @param callBackListener method to call when notifications arrives
*/
void enableNotifications(DeviceId device, String request, String mediaType,
- RestconfNotificationEventListener callBackListener);
-
- //TODO: To be removed once the caller to this API is updated.
- @Deprecated void enableNotifications(DeviceId device, String request, String mediaType,
- RestConfNotificationEventListener callBackListener);
+ RestConfNotificationEventListener callBackListener);
/**
- * Registers a listener for notification events that occur to restconf
+ * Register a listener for notification events that occur to restconf
* devices.
*
- * @param deviceId identifier of the device to which the listener is attached
+ * @param deviceId the deviceId
* @param listener the listener to notify
*/
void addNotificationListener(DeviceId deviceId,
- RestconfNotificationEventListener listener);
+ RestConfNotificationEventListener listener);
/**
- * Unregisters the listener for the device.
+ * Unregister the listener for the device.
*
- * @param deviceId identifier of the device for which the listener
- * is to be removed
- * @param listener listener to be removed
+ * @param deviceId the deviceId
*/
- void removeNotificationListener(DeviceId deviceId,
- RestconfNotificationEventListener listener);
-
- //TODO: temporarily keep this API for backward compatibility.
- @Deprecated void removeNotificationListener(DeviceId deviceId);
-
- /**
- * Returns true if a listener has been installed to listen to RESTCONF
- * notifications sent from a particular device.
- *
- * @param deviceId identifier of the device from which the notifications
- * are generated
- * @return true if listener is installed; false otherwise
- */
- boolean isNotificationEnabled(DeviceId deviceId);
+ void removeNotificationListener(DeviceId deviceId);
}