Fix generic warnings

RequesstContext is generic, hence eclipse gives warnings.

Change-Id: I5e831565e0861d8444025072a82fd1f4828c03e9
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/MultiMsgCollector.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/MultiMsgCollector.java
index a7b82acaf38c5c0260cbf7971827bee200969518..330ef902bde54c9952de2491df9566a9b3aae3bc 100644 (file)
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/MultiMsgCollector.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/MultiMsgCollector.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.openflowplugin.api.openflow.device.handlers;
 
+import java.util.List;
 import javax.annotation.Nonnull;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply;
@@ -38,7 +39,7 @@ public interface MultiMsgCollector {
      *
      * @param requestContext
      */
-    void registerMultipartRequestContext(RequestContext requestContext);
+    void registerMultipartRequestContext(RequestContext<List<MultipartReply>> requestContext);
 
     /**
      * Method adds a reply multipart message to the collection and if the message has marker
@@ -51,5 +52,5 @@ public interface MultiMsgCollector {
 
     void setDeviceReplyProcessor(DeviceReplyProcessor deviceReplyProcessor);
 
-    void invalidateRequestContext(RequestContext requestContext);
+    void invalidateRequestContext(RequestContext<List<MultipartReply>> requestContext);
 }

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/listener/MultiMsgCollectorImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/listener/MultiMsgCollectorImpl.java
index 037d4e778cc2b0b22c60efd4db001e2955ff1a56..1acca2d0506ded99412fef1ff5ee54b8cdac9b9e 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/listener/MultiMsgCollectorImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/listener/MultiMsgCollectorImpl.java
@@ -24,7 +24,6 @@ import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceReplyP
 import org.opendaylight.openflowplugin.api.openflow.device.handlers.MultiMsgCollector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -83,7 +82,7 @@ public class MultiMsgCollectorImpl implements MultiMsgCollector {
     }
 
     @Override
-    public void registerMultipartRequestContext(final RequestContext requestContext) {
+    public void registerMultipartRequestContext(final RequestContext<List<MultipartReply>> requestContext) {
         cache.put(requestContext.getXid().getValue(), new MultiCollectorObject(requestContext));
     }
 
@@ -120,7 +119,7 @@ public class MultiMsgCollectorImpl implements MultiMsgCollector {
     }
 
     @Override
-    public void invalidateRequestContext(final RequestContext requestContext) {
+    public void invalidateRequestContext(final RequestContext<List<MultipartReply>> requestContext) {
         MultiCollectorObject  multiCollectorObject = cache.getIfPresent(requestContext);
         if (null != multiCollectorObject){
             multiCollectorObject.invalidateFutureByTimeout(requestContext.getXid().getValue());
@@ -128,13 +127,12 @@ public class MultiMsgCollectorImpl implements MultiMsgCollector {
     }
 
     private class MultiCollectorObject {
-        private final List<MultipartReply> replyCollection;
+        private final List<MultipartReply> replyCollection = new ArrayList<>();
+        private final RequestContext<List<MultipartReply>> requestContext;
         private MultipartType msgType;
-        private final RequestContext requestContext;
 
-        MultiCollectorObject(final RequestContext requestContext) {
-            replyCollection = new ArrayList<>();
-            this.requestContext = requestContext;
+        MultiCollectorObject(final RequestContext<List<MultipartReply>> requestContext) {
+            this.requestContext = Preconditions.checkNotNull(requestContext);
         }
 
         void add(final MultipartReply reply) throws DeviceDataException {
@@ -161,8 +159,8 @@ public class MultiMsgCollectorImpl implements MultiMsgCollector {
         void invalidateFutureByTimeout(final long key) {
             final String msg = "MultiMsgCollector can not wait for last multipart any more";
             DeviceDataException deviceDataException = new DeviceDataException(msg);
-            final RpcResult<List<OfHeader>> rpcResult = RpcResultBuilder
-                    .<List<OfHeader>>failed()
+            final RpcResult<List<MultipartReply>> rpcResult = RpcResultBuilder
+                    .<List<MultipartReply>>failed()
                     .withError(RpcError.ErrorType.APPLICATION, String.format("Message processing failed : %s", deviceDataException.getError()), deviceDataException)
                     .build();
             requestContext.setResult(rpcResult);