Clean up BindingDOMNotificationPublishServiceAdapter

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / main / java / org / opendaylight / mdsal / binding / dom / adapter / BindingDOMNotificationPublishServiceAdapter.java

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 a6f1fa8d5f86a2db38ccbb17d8ac4148bce3e8da..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
@@ -11,7 +11,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
-import java.time.Instant;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import org.eclipse.jdt.annotation.NonNull;
@@ -20,14 +19,11 @@ import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Facto
 import org.opendaylight.mdsal.dom.api.DOMNotification;
 import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
 import org.opendaylight.mdsal.dom.api.DOMService;
-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 {
-
+public final class BindingDOMNotificationPublishServiceAdapter
+        extends AbstractBindingAdapter<DOMNotificationPublishService> implements NotificationPublishService {
     static final Factory<NotificationPublishService> BUILDER_FACTORY = Builder::new;
 
     public BindingDOMNotificationPublishServiceAdapter(final AdapterContext adapterContext,
@@ -35,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));
@@ -57,9 +48,7 @@ public class BindingDOMNotificationPublishServiceAdapter extends AbstractBinding
     }
 
     private @NonNull DOMNotification toDomNotification(final Notification<?> notification) {
-        final Instant instant = notification instanceof EventInstantAware
-                ? ((EventInstantAware) notification).eventInstant() : Instant.now();
-        return LazySerializedDOMNotification.create(currentSerializer(), notification, instant);
+        return new LazySerializedNotification(currentSerializer(), notification);
     }
 
     private static @NonNull ListenableFuture<? extends Object> toBindingResult(
@@ -68,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);
         }