Fix warnings in tests

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / persisted / ShardSnapshotState.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotState.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotState.java
index d4556cd374b18ff5e105382805b0bb70cdcab3f6..5275582f079ba188eb71bf7fcc1c15bd6c082af1 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotState.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotState.java
@@ -11,10 +11,8 @@ import com.google.common.base.Preconditions;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.Externalizable;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.OutputStream;
 import javax.annotation.Nonnull;
 import org.opendaylight.controller.cluster.raft.persisted.Snapshot;
 
@@ -44,38 +42,12 @@ public class ShardSnapshotState implements Snapshot.State {
 
         @Override
         public void writeExternal(final ObjectOutput out) throws IOException {
-            snapshotState.snapshot.serialize(toOutputStream(out));
-        }
-
-        private OutputStream toOutputStream(final ObjectOutput out) {
-            if (out instanceof OutputStream) {
-                return (OutputStream) out;
-            }
-
-            return new OutputStream() {
-                @Override
-                public void write(int value) throws IOException {
-                    out.write(value);
-                }
-            };
+            snapshotState.snapshot.serialize(out);
         }
 
         @Override
         public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
-            snapshotState = new ShardSnapshotState(ShardDataTreeSnapshot.deserialize(toInputStream(in)));
-        }
-
-        private InputStream toInputStream(final ObjectInput in) {
-            if (in instanceof InputStream) {
-                return (InputStream) in;
-            }
-
-            return new InputStream() {
-                @Override
-                public int read() throws IOException {
-                    return in.read();
-                }
-            };
+            snapshotState = new ShardSnapshotState(ShardDataTreeSnapshot.deserialize(in));
         }
 
         private Object readResolve() {
@@ -88,7 +60,7 @@ public class ShardSnapshotState implements Snapshot.State {
             + "aren't serialized. FindBugs does not recognize this.")
     private final ShardDataTreeSnapshot snapshot;
 
-    public ShardSnapshotState(@Nonnull ShardDataTreeSnapshot snapshot) {
+    public ShardSnapshotState(@Nonnull final ShardDataTreeSnapshot snapshot) {
         this.snapshot = Preconditions.checkNotNull(snapshot);
     }
 
@@ -97,7 +69,6 @@ public class ShardSnapshotState implements Snapshot.State {
         return snapshot;
     }
 
-    @SuppressWarnings("static-method")
     private Object writeReplace() {
         return new Proxy(this);
     }