Clean up BindingDOMNotificationPublishServiceAdapter

Remove deprecated method and address the two FIXMEs which are long
overdue.

Change-Id: I27354cd2d530268473236ba823afec162bfd2cc3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationPublishServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationPublishServiceAdapter.java
index 9354986195183085f31a7bd3688e162fd4bd0864..7472fb87aaddb98741d9b6ce24d3b62698e81134 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationPublishServiceAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationPublishServiceAdapter.java
@@ -22,10 +22,8 @@ import org.opendaylight.mdsal.dom.api.DOMService;
 import org.opendaylight.yangtools.yang.binding.Notification;
 
 @VisibleForTesting
-// FIXME: 10.0.0: make this class final
-public class BindingDOMNotificationPublishServiceAdapter extends AbstractBindingAdapter<DOMNotificationPublishService>
-        implements NotificationPublishService {
-
+public final class BindingDOMNotificationPublishServiceAdapter
+        extends AbstractBindingAdapter<DOMNotificationPublishService> implements NotificationPublishService {
     static final Factory<NotificationPublishService> BUILDER_FACTORY = Builder::new;
 
     public BindingDOMNotificationPublishServiceAdapter(final AdapterContext adapterContext,
@@ -33,11 +31,6 @@ public class BindingDOMNotificationPublishServiceAdapter extends AbstractBinding
         super(adapterContext, domPublishService);
     }
 
-    @Deprecated(forRemoval = true, since = "9.0.2")
-    public DOMNotificationPublishService getDomPublishService() {
-        return getDelegate();
-    }
-
     @Override
     public void putNotification(final Notification<?> notification) throws InterruptedException {
         getDelegate().putNotification(toDomNotification(notification));
@@ -64,8 +57,7 @@ public class BindingDOMNotificationPublishServiceAdapter extends AbstractBinding
             : domResult;
     }
 
-    // FIXME: 10.0.0: hide this class and make it final
-    protected static class Builder extends BindingDOMAdapterBuilder<NotificationPublishService> {
+    private static final class Builder extends BindingDOMAdapterBuilder<NotificationPublishService> {
         Builder(final AdapterContext adapterContext) {
             super(adapterContext);
         }