Bump upstream SNAPSHOTS

[controller.git] / opendaylight / md-sal / cds-access-api / src / test / java / org / opendaylight / controller / cluster / access / concepts / AbstractEnvelopeTest.java

diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java
index 43746cef1547b245ddb3e743af760d4a0e57815f..f0f5d3d26c56a7c557bd74e21dd294b620feaada 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java
+++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java
@@ -12,7 +12,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public abstract class AbstractEnvelopeTest<E extends Envelope> {
+public abstract class AbstractEnvelopeTest<E extends Envelope<?>> {
     private static final FrontendIdentifier FRONTEND =
             new FrontendIdentifier(MemberName.forName("test"), FrontendIdentifierTest.ONE_FRONTEND_TYPE);
     private static final ClientIdentifier CLIENT = new ClientIdentifier(FRONTEND, 0);
@@ -27,7 +27,7 @@ public abstract class AbstractEnvelopeTest<E extends Envelope> {
     }
 
     @Test
-    public void testProxySerializationDeserialization() throws Exception {
+    public void testProxySerializationDeserialization() {
         final byte[] serializedBytes = SerializationUtils.serialize(envelope);
         final Object deserialize = SerializationUtils.deserialize(serializedBytes);
         checkDeserialized((E) deserialize);
@@ -36,8 +36,8 @@ public abstract class AbstractEnvelopeTest<E extends Envelope> {
     private void checkDeserialized(final E deserializedEnvelope) {
         Assert.assertEquals(envelope.getSessionId(), deserializedEnvelope.getSessionId());
         Assert.assertEquals(envelope.getTxSequence(), deserializedEnvelope.getTxSequence());
-        final Message expectedMessage = envelope.getMessage();
-        final Message actualMessage = deserializedEnvelope.getMessage();
+        final Message<?, ?> expectedMessage = envelope.getMessage();
+        final Message<?, ?> actualMessage = deserializedEnvelope.getMessage();
         Assert.assertEquals(expectedMessage.getSequence(), actualMessage.getSequence());
         Assert.assertEquals(expectedMessage.getTarget(), actualMessage.getTarget());
         Assert.assertEquals(expectedMessage.getVersion(), actualMessage.getVersion());
@@ -47,5 +47,6 @@ public abstract class AbstractEnvelopeTest<E extends Envelope> {
 
     protected abstract E createEnvelope();
 
+    @SuppressWarnings("checkstyle:hiddenField")
     protected abstract void doAdditionalAssertions(E envelope, E resolvedObject);
 }