Fix raw Notification warnings

binding.Notification now takes a generic argument, fix a round of raw
references.

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

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java
index 08bba8de6377b8938e404b2506595193d47df29c..52a67707cad82fc8bfe572a6bc17ecea5d2b48ee 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java
@@ -541,12 +541,12 @@ public final class BindingCodecContext extends AbstractBindingNormalizedNodeSeri
     }
 
     @Override
-    public Notification fromNormalizedNodeNotification(final Absolute path, final ContainerNode data) {
+    public Notification<?> fromNormalizedNodeNotification(final Absolute path, final ContainerNode data) {
         return getNotificationContext(path).deserialize(data);
     }
 
     @Override
-    public Notification fromNormalizedNodeNotification(final Absolute path, final ContainerNode data,
+    public Notification<?> fromNormalizedNodeNotification(final Absolute path, final ContainerNode data,
             final Instant eventInstant) {
         return eventInstant == null ? fromNormalizedNodeNotification(path, data)
                 : getNotificationContext(path).deserialize(data, eventInstant);

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
index 6a44af8c417e57dea4aaf0800b89aa7dc76f2453..7ce768a38e47ac5d4dc017d74ddbf4065abc334c 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
@@ -106,9 +106,9 @@ final class NotificationCodecContext<D extends DataObject & Notification>
     }
 
     @SuppressWarnings("checkstyle:illegalCatch")
-    Notification deserialize(final @NonNull ContainerNode data, final @NonNull Instant eventInstant) {
+    Notification<?> deserialize(final @NonNull ContainerNode data, final @NonNull Instant eventInstant) {
         try {
-            return (Notification) eventProxy.invokeExact(this, data, eventInstant);
+            return (Notification<?>) eventProxy.invokeExact(this, data, eventInstant);
         } catch (final Throwable e) {
             Throwables.throwIfUnchecked(e);
             throw new IllegalStateException(e);

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java
index e309f6949a4ae0dce42855e2f53f965465b7587d..8a99eab38f6488f22003b9506c1de126a4bc3b03 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java
@@ -125,7 +125,7 @@ final class SchemaRootCodecContext<D extends DataObject> extends DataContainerCo
                 checkArgument(stmt instanceof NotificationDefinition, "Statement %s is not a notification", stmt);
 
                 @SuppressWarnings("unchecked")
-                final Class<? extends Notification> clz = (Class<? extends Notification>)
+                final Class<? extends Notification<?>> clz = (Class<? extends Notification<?>>)
                     factory().getRuntimeContext().getClassForSchema((NotificationDefinition) stmt);
                 return getNotification(clz);
             }
@@ -172,7 +172,7 @@ final class SchemaRootCodecContext<D extends DataObject> extends DataContainerCo
         return getOrRethrow(actionsByClass, action);
     }
 
-    NotificationCodecContext<?> getNotification(final Class<? extends Notification> notification) {
+    NotificationCodecContext<?> getNotification(final Class<? extends Notification<?>> notification) {
         return (NotificationCodecContext<?>) streamChild((Class<? extends DataObject>)notification);
     }
 

diff --git a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationProcessingTest.java b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationProcessingTest.java
index 1d20d8d72683cb33e14b801df39c8c9cb64d21ae..a9debb048f2a887ea6772d1bfa07c85a7c884536 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationProcessingTest.java
+++ b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationProcessingTest.java
@@ -58,7 +58,7 @@ public class NotificationProcessingTest extends AbstractBindingCodecTest {
 
     @Test
     public void testNormalizedToNotification() {
-        final Notification bindingDeserialized = codecContext.fromNormalizedNodeNotification(Absolute.of(
+        final Notification<?> bindingDeserialized = codecContext.fromNormalizedNodeNotification(Absolute.of(
             TwoLevelListChanged.QNAME), createTestDomData());
         assertTrue(bindingDeserialized instanceof TwoLevelListChanged);
         assertEquals(createTestBindingData(), bindingDeserialized);
@@ -67,7 +67,7 @@ public class NotificationProcessingTest extends AbstractBindingCodecTest {
     @Test
     public void testNormalizedToNotificationWithInstant() {
         final Instant instant = Instant.now();
-        final Notification bindingDeserialized = codecContext.fromNormalizedNodeNotification(Absolute.of(
+        final Notification<?> bindingDeserialized = codecContext.fromNormalizedNodeNotification(Absolute.of(
             TwoLevelListChanged.QNAME), createTestDomData(), instant);
         assertTrue(bindingDeserialized instanceof TwoLevelListChanged);
         assertEquals(createTestBindingData(), bindingDeserialized);
@@ -77,7 +77,7 @@ public class NotificationProcessingTest extends AbstractBindingCodecTest {
 
     @Test
     public void testNormalizedToNotificationWithNull() {
-        final Notification bindingDeserialized = codecContext.fromNormalizedNodeNotification(Absolute.of(
+        final Notification<?> bindingDeserialized = codecContext.fromNormalizedNodeNotification(Absolute.of(
             TwoLevelListChanged.QNAME), createTestDomData(), null);
         assertTrue(bindingDeserialized instanceof TwoLevelListChanged);
         assertEquals(createTestBindingData(), bindingDeserialized);