From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 6 Apr 2022 14:36:45 +0000 (+0200)
Subject: Drop a few FIXMEs into mdsal-binding-dom-adapter
X-Git-Tag: v9.0.2~22
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8f525adf866cbc7d334d928c5b21c3d6fa3d61fe;hp=0200653e5890d9854f015bc9ae5da5c4e8704d46;p=mdsal.git

Drop a few FIXMEs into mdsal-binding-dom-adapter

We should have final classes and similar things.

Change-Id: Ie60973456464367db6396906fd079b76f5cfc3dd
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 88c662866c..a6f1fa8d5f 100644
--- 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
@@ -24,6 +24,7 @@ import org.opendaylight.yangtools.yang.binding.EventInstantAware;
 import org.opendaylight.yangtools.yang.binding.Notification;
 
 @VisibleForTesting
+// FIXME: 10.0.0: make this class final
 public class BindingDOMNotificationPublishServiceAdapter extends AbstractBindingAdapter<DOMNotificationPublishService>
         implements NotificationPublishService {
 
@@ -34,6 +35,7 @@ public class BindingDOMNotificationPublishServiceAdapter extends AbstractBinding
         super(adapterContext, domPublishService);
     }
 
+    @Deprecated(forRemoval = true, since = "9.0.2")
     public DOMNotificationPublishService getDomPublishService() {
         return getDelegate();
     }
@@ -45,20 +47,13 @@ public class BindingDOMNotificationPublishServiceAdapter extends AbstractBinding
 
     @Override
     public ListenableFuture<? extends Object> offerNotification(final Notification<?> notification) {
-        ListenableFuture<?> offerResult = getDelegate().offerNotification(toDomNotification(notification));
-        return DOMNotificationPublishService.REJECTED.equals(offerResult)
-                ? NotificationPublishService.REJECTED
-                : offerResult;
+        return toBindingResult(getDelegate().offerNotification(toDomNotification(notification)));
     }
 
     @Override
     public ListenableFuture<? extends Object> offerNotification(final Notification<?> notification, final int timeout,
             final TimeUnit unit) throws InterruptedException {
-        ListenableFuture<?> offerResult = getDelegate().offerNotification(toDomNotification(notification), timeout,
-            unit);
-        return DOMNotificationPublishService.REJECTED.equals(offerResult)
-                ? NotificationPublishService.REJECTED
-                : offerResult;
+        return toBindingResult(getDelegate().offerNotification(toDomNotification(notification), timeout, unit));
     }
 
     private @NonNull DOMNotification toDomNotification(final Notification<?> notification) {
@@ -67,6 +62,13 @@ public class BindingDOMNotificationPublishServiceAdapter extends AbstractBinding
         return LazySerializedDOMNotification.create(currentSerializer(), notification, instant);
     }
 
+    private static @NonNull ListenableFuture<? extends Object> toBindingResult(
+            final @NonNull ListenableFuture<? extends Object> domResult) {
+        return DOMNotificationPublishService.REJECTED.equals(domResult) ? NotificationPublishService.REJECTED
+            : domResult;
+    }
+
+    // FIXME: 10.0.0: hide this class and make it final
     protected static class Builder extends BindingDOMAdapterBuilder<NotificationPublishService> {
         Builder(final AdapterContext adapterContext) {
             super(adapterContext);
diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationServiceAdapter.java
index 63a4f78c0c..fc4653965b 100644
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationServiceAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationServiceAdapter.java
@@ -26,6 +26,7 @@ import org.opendaylight.yangtools.yang.binding.Notification;
 import org.opendaylight.yangtools.yang.binding.NotificationListener;
 
 @VisibleForTesting
+// FIXME: 10.0.0: make this class final
 public class BindingDOMNotificationServiceAdapter implements NotificationService {
     public static final Factory<NotificationService> BUILDER_FACTORY = Builder::new;