Rename NetconfNotification to NotificationMessage

We want to keep the 'Message' tie to 'NetconfMessage' explicit, let's
rename the class.

JIRA: NETCONF-1000
Change-Id: I2dd345f42f4ed5bea4cddc2f151d120e78dfab6a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/CreateSubscription.java b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/CreateSubscription.java
index aa68cca291502ad1ba98faa7341f0e2ca99bf040..c1f2f1556a9a9c43497647af6e2d9feefe7761f0 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/CreateSubscription.java
+++ b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/CreateSubscription.java
@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Optional;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.NetconfSession;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.mapping.api.SessionAwareNetconfOperation;
@@ -109,7 +109,7 @@ public class CreateSubscription extends AbstractSingletonNetconfOperation
 
     @Override
     public void setSession(final NetconfSession session) {
-        this.netconfSession = session;
+        netconfSession = session;
     }
 
     @Override
@@ -131,7 +131,7 @@ public class CreateSubscription extends AbstractSingletonNetconfOperation
         }
 
         @Override
-        public void onNotification(final StreamNameType stream, final NetconfNotification notification) {
+        public void onNotification(final StreamNameType stream, final NotificationMessage notification) {
             if (filter == null) {
                 currentSession.sendMessage(notification);
                 return;
@@ -142,7 +142,7 @@ public class CreateSubscription extends AbstractSingletonNetconfOperation
                         SubtreeFilter.applySubtreeNotificationFilter(filter, notification.getDocument());
                 if (filtered.isPresent()) {
                     final Date eventTime = notification.getEventTime();
-                    currentSession.sendMessage(new NetconfNotification(filtered.orElseThrow(), eventTime));
+                    currentSession.sendMessage(new NotificationMessage(filtered.orElseThrow(), eventTime));
                 }
             } catch (DocumentedException e) {
                 LOG.warn("Failed to process notification {}", notification, e);

diff --git a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java
index f9bbc18c277a7c524349632ac3abf8ebc7d233bd..6d3d61fb737ed65e601b91cd3b76358dd368602f 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java
+++ b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManager.java
@@ -27,7 +27,7 @@ import javax.inject.Singleton;
 import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecFactory;
 import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeGenerator;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.notifications.BaseNotificationPublisherRegistration;
 import org.opendaylight.netconf.notifications.NetconfNotificationCollector;
 import org.opendaylight.netconf.notifications.NetconfNotificationListener;
@@ -129,7 +129,7 @@ public final class NetconfNotificationManager implements NetconfNotificationColl
     }
 
     @Override
-    public synchronized void onNotification(final StreamNameType stream, final NetconfNotification notification) {
+    public synchronized void onNotification(final StreamNameType stream, final NotificationMessage notification) {
         LOG.debug("Notification of type {} detected", stream);
         if (LOG.isTraceEnabled()) {
             LOG.debug("Notification of type {} detected: {}", stream, notification);
@@ -282,7 +282,7 @@ public final class NetconfNotificationManager implements NetconfNotificationColl
         }
 
         @Override
-        public void onNotification(final StreamNameType stream, final NetconfNotification notification) {
+        public void onNotification(final StreamNameType stream, final NotificationMessage notification) {
             checkState(baseListener != null, "Already closed");
             checkArgument(stream.equals(registeredStream));
             baseListener.onNotification(stream, notification);
@@ -308,7 +308,7 @@ public final class NetconfNotificationManager implements NetconfNotificationColl
             baseRegistration.close();
         }
 
-        private NetconfNotification serializeNotification(final Notification<?> notification, final Absolute path) {
+        private NotificationMessage serializeNotification(final Notification<?> notification, final Absolute path) {
             return transformUtil.transform(notification, path);
         }
 

diff --git a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtil.java b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtil.java
index 79ff1c0568a8489f5ba2a16e41cdc1b537146222..3ec802835bec0640d1dedfd371de944768c0ba55 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtil.java
+++ b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtil.java
@@ -19,7 +19,7 @@ import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecFactory;
 import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeGenerator;
 import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.util.NetconfUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.Netconf;
@@ -53,16 +53,16 @@ public final class NotificationsTransformUtil {
     /**
      * Transform base notification for capabilities into NetconfNotification.
      */
-    public NetconfNotification transform(final Notification<?> notification, final Absolute path) {
+    public NotificationMessage transform(final Notification<?> notification, final Absolute path) {
         return transform(notification, Optional.empty(), path);
     }
 
-    public NetconfNotification transform(final Notification<?> notification, final Date eventTime,
+    public NotificationMessage transform(final Notification<?> notification, final Date eventTime,
             final Absolute path) {
         return transform(notification, Optional.ofNullable(eventTime), path);
     }
 
-    private NetconfNotification transform(final Notification<?> notification, final Optional<Date> eventTime,
+    private NotificationMessage transform(final Notification<?> notification, final Optional<Date> eventTime,
             final Absolute path) {
         final ContainerNode containerNode = serializer.toNormalizedNodeNotification(notification);
         final DOMResult result = new DOMResult(XmlUtil.newDocument());
@@ -72,7 +72,7 @@ public final class NotificationsTransformUtil {
             throw new IllegalStateException("Unable to serialize " + notification, e);
         }
         final Document node = (Document) result.getNode();
-        return eventTime.isPresent() ? new NetconfNotification(node, eventTime.orElseThrow())
-            : new NetconfNotification(node);
+        return eventTime.isPresent() ? new NotificationMessage(node, eventTime.orElseThrow())
+            : new NotificationMessage(node);
     }
 }

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManagerTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManagerTest.java
index f6a64c1f2468489217bba635f009a895c4c8e07c..34665252ef975f9c2150207f587d18f3ff4f300b 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManagerTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/NetconfNotificationManagerTest.java
@@ -8,7 +8,7 @@
 package org.opendaylight.netconf.mdsal.notification.impl;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
@@ -17,20 +17,17 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import com.google.common.collect.Lists;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.format.DateTimeParseException;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.Iterator;
-import org.junit.Assert;
+import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.binding.dom.codec.impl.di.DefaultBindingDOMCodecFactory;
 import org.opendaylight.mdsal.binding.generator.impl.DefaultBindingRuntimeGenerator;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.notifications.BaseNotificationPublisherRegistration;
 import org.opendaylight.netconf.notifications.NetconfNotificationCollector;
@@ -51,7 +48,7 @@ public class NetconfNotificationManagerTest {
     @Test
     public void testEventTime() throws Exception {
         //Testing values with SimpleDateFormat
-        final ArrayList<String> checkWith = Lists.newArrayList(
+        final var iterator = List.of(
                 "2001-07-04T12:08:56.235-07:00",
                 "2015-10-23T09:42:27.671+00:00",
                 "1970-01-01T17:17:22.229+00:00",
@@ -69,11 +66,10 @@ public class NetconfNotificationManagerTest {
                 "1937-01-01T23:59:59.870+00:20",
                 "1990-12-31T23:59:59.000+00:00",
                 "2015-10-23T23:59:59.200+00:00",
-                "1985-04-12T23:59:59.520+00:00");
-        final Iterator<String> iterator = checkWith.iterator();
+                "1985-04-12T23:59:59.520+00:00").iterator();
 
         // Testing correct values
-        for (final String time : Lists.newArrayList(
+        for (final String time : List.of(
                 "2001-07-04T12:08:56.235-07:00",
                 "2015-10-23T09:42:27.67175+00:00",
                 "1970-01-01T17:17:22.229568+00:00",
@@ -93,46 +89,34 @@ public class NetconfNotificationManagerTest {
                 "2015-10-23T23:59:60.20001Z",
                 "1985-04-12T23:59:60.52Z"
         )) {
-            try {
-                final Date apply = NetconfNotification.RFC3339_DATE_PARSER.apply(time);
-                final Date parse =
-                        new SimpleDateFormat(RFC3339_DATE_FORMAT_WITH_MILLIS_BLUEPRINT).parse(iterator.next());
-                assertEquals(parse.getTime(), apply.getTime());
-                // Testing that we're consistent from formatting to parsing.
-                final String dateString = NetconfNotification.RFC3339_DATE_FORMATTER.apply(apply);
-                final Date date1 = NetconfNotification.RFC3339_DATE_PARSER.apply(dateString);
-                final String dateString1 = NetconfNotification.RFC3339_DATE_FORMATTER.apply(date1);
-                Assert.assertEquals(apply, date1);
-                Assert.assertEquals(dateString, dateString1);
-            } catch (final DateTimeParseException e) {
-                fail("Failed to parse time value = " + time + " " + e);
-                throw e;
-            }
+            final Date apply = NotificationMessage.RFC3339_DATE_PARSER.apply(time);
+            final Date parse = new SimpleDateFormat(RFC3339_DATE_FORMAT_WITH_MILLIS_BLUEPRINT).parse(iterator.next());
+            assertEquals(parse.getTime(), apply.getTime());
+            // Testing that we're consistent from formatting to parsing.
+            final String dateString = NotificationMessage.RFC3339_DATE_FORMATTER.apply(apply);
+            final Date date1 = NotificationMessage.RFC3339_DATE_PARSER.apply(dateString);
+            final String dateString1 = NotificationMessage.RFC3339_DATE_FORMATTER.apply(date1);
+            assertEquals(apply, date1);
+            assertEquals(dateString, dateString1);
         }
 
         // Testing that we're consistent from formatting to parsing.
         final Date date0 = Date.from(Instant.ofEpochMilli(0));
-        final String dateString0 = NetconfNotification.RFC3339_DATE_FORMATTER.apply(date0);
-        final Date date1 = NetconfNotification.RFC3339_DATE_PARSER.apply(dateString0);
-        final String dateString1 = NetconfNotification.RFC3339_DATE_FORMATTER.apply(date1);
-        Assert.assertEquals(date0, date1);
-        Assert.assertEquals(dateString0, dateString1);
+        final String dateString0 = NotificationMessage.RFC3339_DATE_FORMATTER.apply(date0);
+        final Date date1 = NotificationMessage.RFC3339_DATE_PARSER.apply(dateString0);
+        final String dateString1 = NotificationMessage.RFC3339_DATE_FORMATTER.apply(date1);
+        assertEquals(date0, date1);
+        assertEquals(dateString0, dateString1);
 
         // Testing wrong values
-        for (final String time : Lists.newArrayList(
+        for (final String time : List.of(
                 "0",
                 "205-10-23T09:42:27.67175+00:00",
                 "1970-01-01T17:60:22.229568+00:00",
                 "1937-01-01T32:00:27.87+00:20",
                 "2060-13-31T15:59:90-08:00",
-                "1990-12-31T23:58:60Z"
-        )) {
-            try {
-                NetconfNotification.RFC3339_DATE_PARSER.apply(time);
-            } catch (final DateTimeParseException e) {
-                continue;
-            }
-            fail("Should have thrown an exception; value= " + time);
+                "1990-12-31T23:58:60Z")) {
+            assertThrows(DateTimeParseException.class, () -> NotificationMessage.RFC3339_DATE_PARSER.apply(time));
         }
     }
 
@@ -145,13 +129,13 @@ public class NetconfNotificationManagerTest {
         final NetconfCapabilityChangeBuilder capabilityChangedBuilder = new NetconfCapabilityChangeBuilder();
 
         final NetconfNotificationListener listener = mock(NetconfNotificationListener.class);
-        doNothing().when(listener).onNotification(any(StreamNameType.class), any(NetconfNotification.class));
+        doNothing().when(listener).onNotification(any(StreamNameType.class), any(NotificationMessage.class));
         final NotificationListenerRegistration notificationListenerRegistration = netconfNotificationManager
                 .registerNotificationListener(NetconfNotificationManager.BASE_NETCONF_STREAM.getName(), listener);
         final NetconfCapabilityChange notification = capabilityChangedBuilder.build();
         baseNotificationPublisherRegistration.onCapabilityChanged(notification);
 
-        verify(listener).onNotification(any(StreamNameType.class), any(NetconfNotification.class));
+        verify(listener).onNotification(any(StreamNameType.class), any(NotificationMessage.class));
 
         notificationListenerRegistration.close();
 
@@ -173,9 +157,9 @@ public class NetconfNotificationManagerTest {
         final NetconfNotificationListener listener = mock(NetconfNotificationListener.class);
         netconfNotificationManager.registerNotificationListener(testStream.getName(), listener);
 
-        doNothing().when(listener).onNotification(eq(testStreamName), any(NetconfNotification.class));
+        doNothing().when(listener).onNotification(eq(testStreamName), any(NotificationMessage.class));
 
-        final NetconfNotification notification = new NetconfNotification(
+        final NotificationMessage notification = new NotificationMessage(
             XmlUtil.readXmlToDocument("<notification/>"));
         netconfNotificationManager.onNotification(testStream.getName(), notification);
 
@@ -212,14 +196,9 @@ public class NetconfNotificationManagerTest {
 
         verify(streamListener).onStreamUnregistered(NetconfNotificationManager.BASE_NETCONF_STREAM.getName());
 
-        try {
-            baseNotificationPublisherRegistration.onCapabilityChanged(new NetconfCapabilityChangeBuilder().build());
-        } catch (final IllegalStateException e) {
-            // Exception should be thrown after manager is closed
-            return;
-        }
-
-        fail("Publishing into a closed manager should fail");
+        final var change = new NetconfCapabilityChangeBuilder().build();
+        assertThrows(IllegalStateException.class,
+            () -> baseNotificationPublisherRegistration.onCapabilityChanged(change));
     }
 
     @Test

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtilTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtilTest.java
index 68cbafd4c59498e434f07abecb4b80ff6c8c494e..94f57766580efced1c1631ccba46e0228a9f17bc 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtilTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/NotificationsTransformUtilTest.java
@@ -20,7 +20,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.dom.codec.impl.di.DefaultBindingDOMCodecFactory;
 import org.opendaylight.mdsal.binding.generator.impl.DefaultBindingRuntimeGenerator;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfCapabilityChange;
@@ -43,7 +43,7 @@ public class NotificationsTransformUtilTest {
             "<notification xmlns=\"urn:ietf:params:netconf:capability:notification:1.0\">"
                     + INNER_NOTIFICATION
                     + "<eventTime>"
-                    + NetconfNotification.RFC3339_DATE_FORMATTER.apply(DATE)
+                    + NotificationMessage.RFC3339_DATE_FORMATTER.apply(DATE)
                     + "</eventTime>"
                     + "</notification>";
 
@@ -63,7 +63,7 @@ public class NotificationsTransformUtilTest {
         netconfCapabilityChangeBuilder.setDeletedCapability(Set.of(new Uri("uri4"), new Uri("uri3")));
 
         final NetconfCapabilityChange capabilityChange = netconfCapabilityChangeBuilder.build();
-        final NetconfNotification transform = UTIL.transform(capabilityChange, DATE,
+        final NotificationMessage transform = UTIL.transform(capabilityChange, DATE,
             Absolute.of(NetconfCapabilityChange.QNAME));
 
         final String serialized = XmlUtil.toString(transform.getDocument());
@@ -81,11 +81,10 @@ public class NotificationsTransformUtilTest {
 
     @Test
     public void testTransformFromDOM() throws Exception {
-        final NetconfNotification netconfNotification =
-                new NetconfNotification(XmlUtil.readXmlToDocument(INNER_NOTIFICATION), DATE);
+        final NotificationMessage netconfNotification =
+                new NotificationMessage(XmlUtil.readXmlToDocument(INNER_NOTIFICATION), DATE);
 
         XMLUnit.setIgnoreWhitespace(true);
         compareXml(EXPECTED_NOTIFICATION, netconfNotification.toString());
     }
-
 }

diff --git a/netconf/netconf-notifications-api/src/main/java/org/opendaylight/netconf/notifications/NetconfNotificationListener.java b/netconf/netconf-notifications-api/src/main/java/org/opendaylight/netconf/notifications/NetconfNotificationListener.java
index ea6833406de51955f528dab60a032563c11c637a..ff1030ec79121b20788a10e26927ccdb8bd970de 100644 (file)
--- a/netconf/netconf-notifications-api/src/main/java/org/opendaylight/netconf/notifications/NetconfNotificationListener.java
+++ b/netconf/netconf-notifications-api/src/main/java/org/opendaylight/netconf/notifications/NetconfNotificationListener.java
@@ -5,20 +5,17 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netconf.notifications;
 
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType;
 
 /**
  * Generic listener for netconf notifications.
  */
 public interface NetconfNotificationListener {
-
     /**
      * Callback used to notify the listener about any new notification.
      */
-    void onNotification(StreamNameType stream, NetconfNotification notification);
-
+    void onNotification(StreamNameType stream, NotificationMessage notification);
 }

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java b/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java
index cb029f83a66c4436b46a0ed5bf4859f553456bdb..5c788fd2b4c8a2200c7f23e846de8a8e54f8e4d9 100644 (file)
--- a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java
+++ b/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java
@@ -17,7 +17,6 @@ import java.io.IOException;
 import java.net.URI;
 import java.time.Instant;
 import java.time.format.DateTimeParseException;
-import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayDeque;
 import java.util.Collection;
 import java.util.Deque;
@@ -37,7 +36,7 @@ import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.EffectiveOperation;
 import org.opendaylight.netconf.api.NetconfDocumentedException;
 import org.opendaylight.netconf.api.NetconfMessage;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.client.NetconfMessageUtil;
@@ -454,17 +453,16 @@ public final class NetconfMessageTransformUtil {
         }
 
         try {
-            return new SimpleEntry<>(
-                    NetconfNotification.RFC3339_DATE_PARSER.apply(eventTimeElement.getTextContent()).toInstant(),
+            return Map.entry(
+                    NotificationMessage.RFC3339_DATE_PARSER.apply(eventTimeElement.getTextContent()).toInstant(),
                     notificationElement);
         } catch (final DocumentedException e) {
             throw new IllegalArgumentException("Notification payload does not contain " + EVENT_TIME + " " + message,
                     e);
         } catch (final DateTimeParseException e) {
             LOG.warn("Unable to parse event time from {}. Setting time to {}", eventTimeElement,
-                    NetconfNotification.UNKNOWN_EVENT_TIME, e);
-            return new SimpleEntry<>(NetconfNotification.UNKNOWN_EVENT_TIME.toInstant(),
-                    notificationElement);
+                NotificationMessage.UNKNOWN_EVENT_TIME, e);
+            return Map.entry(NotificationMessage.UNKNOWN_EVENT_TIME.toInstant(), notificationElement);
         }
     }
 

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfNestedNotificationTest.java b/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfNestedNotificationTest.java
index da5c8e4d12dcc5e951c1184e005c0aaf266c4953..89ed25bb2f9da7cfd609b1c8f293754b14409731 100644 (file)
--- a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfNestedNotificationTest.java
+++ b/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfNestedNotificationTest.java
@@ -19,7 +19,7 @@ import org.junit.Test;
 import org.opendaylight.mdsal.dom.api.DOMEvent;
 import org.opendaylight.mdsal.dom.api.DOMNotification;
 import org.opendaylight.netconf.api.NetconfMessage;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.sal.connect.netconf.schema.mapping.NetconfMessageTransformer;
 import org.opendaylight.yangtools.rfc8528.data.util.EmptyMountPointContext;
@@ -52,7 +52,7 @@ public class NetconfNestedNotificationTest extends AbstractBaseSchemasTest {
         assertNotNull(root);
         assertEquals(1, root.body().size());
         assertEquals("interface-enabled", root.getIdentifier().getNodeType().getLocalName());
-        assertEquals(NetconfNotification.RFC3339_DATE_PARSER.apply("2008-07-08T00:01:00Z").toInstant(),
+        assertEquals(NotificationMessage.RFC3339_DATE_PARSER.apply("2008-07-08T00:01:00Z").toInstant(),
                 ((DOMEvent) domNotification).getEventInstant());
         assertEquals(Absolute.of(INTERFACES_QNAME, INTERFACE_QNAME, INTERFACE_ENABLED_NOTIFICATION_QNAME),
                 domNotification.getType());

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToNotificationTest.java b/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToNotificationTest.java
index aeba19d82897d320e6a71cbeb82ddcb2368c08cd..ebb2a93b659f98ac247a1ff09a93801bd7f49a27 100644 (file)
--- a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToNotificationTest.java
+++ b/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToNotificationTest.java
@@ -19,7 +19,7 @@ import org.junit.Test;
 import org.opendaylight.mdsal.dom.api.DOMEvent;
 import org.opendaylight.mdsal.dom.api.DOMNotification;
 import org.opendaylight.netconf.api.NetconfMessage;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.sal.connect.netconf.schema.mapping.NetconfMessageTransformer;
 import org.opendaylight.yangtools.rfc8528.data.util.EmptyMountPointContext;
@@ -80,7 +80,7 @@ public class NetconfToNotificationTest extends AbstractBaseSchemasTest {
         assertNotNull(root);
         assertEquals(6, root.body().size());
         assertEquals("user-visited-page", root.getIdentifier().getNodeType().getLocalName());
-        assertEquals(NetconfNotification.RFC3339_DATE_PARSER.apply("2015-10-23T09:42:27.67175+00:00").toInstant(),
+        assertEquals(NotificationMessage.RFC3339_DATE_PARSER.apply("2015-10-23T09:42:27.67175+00:00").toInstant(),
                 ((DOMEvent) domNotification).getEventInstant());
     }
 }

diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfNotification.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NotificationMessage.java
similarity index 97%
rename from protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfNotification.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NotificationMessage.java
index 9d07bcf016653a045a10ab9adc47b456806d7812..f06db1a26ae5676f98de02d139fff39b227e554d 100644 (file)
--- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfNotification.java
+++ b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NotificationMessage.java
@@ -32,8 +32,8 @@ import org.w3c.dom.Element;
 /**
  * Special kind of netconf message that contains a timestamp.
  */
-public final class NetconfNotification extends NetconfMessage {
-    private static final Logger LOG = LoggerFactory.getLogger(NetconfNotification.class);
+public final class NotificationMessage extends NetconfMessage {
+    private static final Logger LOG = LoggerFactory.getLogger(NotificationMessage.class);
     private static final String NOTIFICATION_TAG = "notification";
     private static final String EVENT_TIME_TAG = "eventTime";
 
@@ -171,7 +171,7 @@ public final class NetconfNotification extends NetconfMessage {
     /**
      * Create new notification and capture the timestamp in the constructor.
      */
-    public NetconfNotification(final Document notificationContent) {
+    public NotificationMessage(final Document notificationContent) {
         this(notificationContent, new Date());
     }
 
@@ -179,7 +179,7 @@ public final class NetconfNotification extends NetconfMessage {
      * Create new notification with provided timestamp.
      */
     @SuppressFBWarnings("EI_EXPOSE_REP2") // stores a reference to an externally mutable Date object
-    public NetconfNotification(final Document notificationContent, final Date eventTime) {
+    public NotificationMessage(final Document notificationContent, final Date eventTime) {
         super(wrapNotification(notificationContent, eventTime));
         this.eventTime = eventTime;
     }

diff --git a/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfNotificationTest.java b/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NotificationMessageTest.java
similarity index 90%
rename from protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfNotificationTest.java
rename to protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NotificationMessageTest.java
index 5c06513274de85c1343f8280ec36fbab129d62db..cf4f4248e25e1745f119c8e80f3f1d95f8494c42 100644 (file)
--- a/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfNotificationTest.java
+++ b/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NotificationMessageTest.java
@@ -18,8 +18,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-public class NetconfNotificationTest {
-
+public class NotificationMessageTest {
     @Test
     public void testWrapNotification() throws Exception {
         final Document document = UntrustedXML.newDocumentBuilder().newDocument();
@@ -30,7 +29,7 @@ public class NetconfNotificationTest {
         final Date eventTime = new Date();
         eventTime.setTime(10000000);
 
-        final NetconfNotification netconfNotification = new NetconfNotification(document, eventTime);
+        final NotificationMessage netconfNotification = new NotificationMessage(document, eventTime);
         final Document resultDoc = netconfNotification.getDocument();
         final NodeList nodeList = resultDoc.getElementsByTagNameNS(
             "urn:ietf:params:netconf:capability:notification:1.0", "notification");
@@ -49,10 +48,9 @@ public class NetconfNotificationTest {
 
         final Element eventTimeElement = (Element) childNodes.item(0);
 
-        assertEquals(eventTime.getTime(), NetconfNotification.RFC3339_DATE_PARSER
+        assertEquals(eventTime.getTime(), NotificationMessage.RFC3339_DATE_PARSER
                 .apply(eventTimeElement.getTextContent()).getTime());
 
         assertEquals(eventTime, netconfNotification.getEventTime());
-
     }
 }

diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java
index c1d9d58b719cc902efe621a38c620a46c567b614..547d452fb76685adb7baa3db6756843d3579cfa8 100644 (file)
--- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java
@@ -24,7 +24,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.regex.Pattern;
 import org.opendaylight.netconf.api.NetconfMessage;
 import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.api.monitoring.NetconfManagementSession;
 import org.opendaylight.netconf.nettyutil.AbstractNetconfSession;
 import org.opendaylight.netconf.nettyutil.handler.NetconfMessageToXMLEncoder;
@@ -93,7 +93,7 @@ public final class NetconfServerSession extends AbstractNetconfSession<NetconfSe
     @Override
     public ChannelFuture sendMessage(final NetconfMessage netconfMessage) {
         final ChannelFuture channelFuture = super.sendMessage(netconfMessage);
-        if (netconfMessage instanceof NetconfNotification notification) {
+        if (netconfMessage instanceof NotificationMessage notification) {
             outNotification++;
             sessionListener.onNotification(this, notification);
         }

diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionListener.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionListener.java
index 9af9c86d10521d3560064a477b404b33a6e9eed3..96609b26dbb8c1801f03b7db012f60eaae59116d 100644 (file)
--- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionListener.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionListener.java
@@ -13,7 +13,7 @@ import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.NetconfMessage;
 import org.opendaylight.netconf.api.NetconfSessionListener;
 import org.opendaylight.netconf.api.NetconfTerminationReason;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
 import org.opendaylight.netconf.api.monitoring.SessionEvent;
 import org.opendaylight.netconf.api.monitoring.SessionListener;
@@ -114,7 +114,7 @@ public class NetconfServerSessionListener implements NetconfSessionListener<Netc
         throw new IllegalStateException("Unable to process incoming message", failure);
     }
 
-    public void onNotification(final NetconfServerSession session, final NetconfNotification notification) {
+    public void onNotification(final NetconfServerSession session, final NotificationMessage notification) {
         monitoringSessionListener.onSessionEvent(SessionEvent.notification(session));
     }
 

diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java
index 94de71080b01e5811b0527718ed07e0b57a3ecbb..e6b62f6d7c6d1d496a75bbccd656749b6dd14f85 100644 (file)
--- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java
@@ -28,7 +28,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.netconf.api.NetconfMessage;
 import org.opendaylight.netconf.api.NetconfTerminationReason;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
 import org.opendaylight.netconf.api.monitoring.SessionEvent;
 import org.opendaylight.netconf.api.monitoring.SessionListener;
@@ -144,7 +144,7 @@ public class NetconfServerSessionListenerTest {
 
     @Test
     public void testOnNotification() throws Exception {
-        listener.onNotification(session, new NetconfNotification(XmlUtil.readXmlToDocument("<notification/>")));
+        listener.onNotification(session, new NotificationMessage(XmlUtil.readXmlToDocument("<notification/>")));
         verify(monitoringListener).onSessionEvent(argThat(sessionEventIs(SessionEvent.Type.NOTIFICATION)));
     }
 

diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionTest.java
index 68ece2a522d505085d5348440f7881c2feb50763..e6772bb38cc4d1692bb400e18174a6f780403a6e 100644 (file)
--- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionTest.java
@@ -25,7 +25,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.netconf.api.NetconfMessage;
 import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader;
-import org.opendaylight.netconf.api.messages.NetconfNotification;
+import org.opendaylight.netconf.api.messages.NotificationMessage;
 import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.nettyutil.AbstractChannelInitializer;
 import org.opendaylight.netconf.nettyutil.handler.NetconfEXICodec;
@@ -93,7 +93,7 @@ public class NetconfServerSessionTest {
     public void testSendNotification() throws Exception {
         doNothing().when(listener).onNotification(any(), any());
         final Document msgDoc = XmlUtil.readXmlToDocument("<notification></notification>");
-        final NetconfNotification notif = new NetconfNotification(msgDoc);
+        final NotificationMessage notif = new NotificationMessage(msgDoc);
         session.sendMessage(notif);
         channel.runPendingTasks();
         final Object o = channel.readOutbound();