Integrate MRI projects for Neon

[netconf.git] / netconf / netconf-topology-singleton / src / main / java / org / opendaylight / netconf / topology / singleton / messages / rpc / InvokeRpcMessageReply.java

diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessageReply.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessageReply.java
index b70582354cc6cd476fd72e93d0303a0211d7babf..e43ab4030dd4ddb99829ff3e85e18ceaf1ed6b1c 100644 (file)
--- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessageReply.java
+++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessageReply.java
@@ -16,6 +16,9 @@ import java.io.ObjectOutput;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.Objects;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.opendaylight.netconf.topology.singleton.messages.NormalizedNodeMessage;
 import org.opendaylight.yangtools.yang.common.RpcError;
 
@@ -23,20 +26,22 @@ public class InvokeRpcMessageReply implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @SuppressFBWarnings("SE_BAD_FIELD")
-    private final Collection<RpcError> rpcErrors;
+    private final Collection<? extends RpcError> rpcErrors;
     private final NormalizedNodeMessage normalizedNodeMessage;
 
-    public InvokeRpcMessageReply(final NormalizedNodeMessage normalizedNodeMessage,
-                                 final Collection<RpcError> rpcErrors) {
+    public InvokeRpcMessageReply(@Nullable final NormalizedNodeMessage normalizedNodeMessage,
+                                 @Nonnull final Collection<? extends RpcError> rpcErrors) {
         this.normalizedNodeMessage = normalizedNodeMessage;
-        this.rpcErrors = rpcErrors;
+        this.rpcErrors = Objects.requireNonNull(rpcErrors);
     }
 
+    @Nullable
     public NormalizedNodeMessage getNormalizedNodeMessage() {
         return normalizedNodeMessage;
     }
 
-    public Collection<RpcError> getRpcErrors() {
+    @Nonnull
+    public Collection<? extends RpcError> getRpcErrors() {
         return rpcErrors;
     }
 
@@ -59,7 +64,7 @@ public class InvokeRpcMessageReply implements Serializable {
         }
 
         @Override
-        public void writeExternal(ObjectOutput out) throws IOException {
+        public void writeExternal(final ObjectOutput out) throws IOException {
             out.writeInt(invokeRpcMessageReply.getRpcErrors().size());
             for (final RpcError rpcError : invokeRpcMessageReply.getRpcErrors()) {
                 out.writeObject(rpcError);
@@ -68,7 +73,7 @@ public class InvokeRpcMessageReply implements Serializable {
         }
 
         @Override
-        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
             final int size = in.readInt();
             final Collection<RpcError> rpcErrors = new LinkedList<>();
             for (int i = 0; i < size; i++) {