Fix lead transaction cancellation

[mdsal.git] / dom / mdsal-dom-spi / src / main / java / org / opendaylight / mdsal / dom / spi / DefaultDOMRpcResult.java

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java
index eb2c8ee8cb19088359a7f344dab333763ce2d376..0f16df01fb5d8417c51c75be744fc934d6fa631e 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java
@@ -10,12 +10,12 @@ package org.opendaylight.mdsal.dom.spi;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Objects;
-import javax.annotation.Nonnull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
@@ -30,10 +30,12 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 @NonNullByDefault
 public final class DefaultDOMRpcResult implements DOMRpcResult, Immutable, Serializable {
     private static final long serialVersionUID = 1L;
-    private final @Nullable NormalizedNode<?, ?> result;
-    private final Collection<RpcError> errors;
 
-    public DefaultDOMRpcResult(final NormalizedNode<?, ?> result, final RpcError... errors) {
+    @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "Interfaces do not specify Serializable")
+    private final @Nullable NormalizedNode result;
+    private final Collection<? extends RpcError> errors;
+
+    public DefaultDOMRpcResult(final NormalizedNode result, final RpcError... errors) {
         this(result, asCollection(errors));
     }
 
@@ -41,16 +43,17 @@ public final class DefaultDOMRpcResult implements DOMRpcResult, Immutable, Seria
         this(null, asCollection(errors));
     }
 
-    public DefaultDOMRpcResult(final @Nullable NormalizedNode<?, ?> result) {
+    public DefaultDOMRpcResult(final @Nullable NormalizedNode result) {
         this(result, Collections.emptyList());
     }
 
-    public DefaultDOMRpcResult(final @Nullable NormalizedNode<?, ?> result, final Collection<RpcError> errors) {
+    public DefaultDOMRpcResult(final @Nullable NormalizedNode result,
+            final Collection<? extends RpcError> errors) {
         this.result = result;
         this.errors = requireNonNull(errors);
     }
 
-    public DefaultDOMRpcResult(@Nonnull final Collection<RpcError> errors) {
+    public DefaultDOMRpcResult(final Collection<RpcError> errors) {
         this(null, errors);
     }
 
@@ -59,12 +62,12 @@ public final class DefaultDOMRpcResult implements DOMRpcResult, Immutable, Seria
     }
 
     @Override
-    public Collection<RpcError> getErrors() {
+    public Collection<? extends RpcError> getErrors() {
         return errors;
     }
 
     @Override
-    public @Nullable NormalizedNode<?, ?> getResult() {
+    public @Nullable NormalizedNode getResult() {
         return result;
     }