X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Factors%2FShardSnapshotActor.java;h=d7d380830fd81b34502fe606ce3ca1e63da1113a;hb=3402cfce32b05957219e54754dd7ca5b0a54cd0e;hp=14cf4cd1a3ec2d58552a3a86377f9da3127b04ac;hpb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActor.java index 14cf4cd1a3..d7d380830f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActor.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore.actors; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.Props; -import com.google.common.base.Preconditions; import java.io.IOException; import java.io.ObjectOutputStream; import java.io.OutputStream; @@ -17,6 +18,7 @@ import java.util.Optional; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActorWithMetering; import org.opendaylight.controller.cluster.datastore.persisted.ShardDataTreeSnapshot; import org.opendaylight.controller.cluster.datastore.persisted.ShardSnapshotState; +import org.opendaylight.controller.cluster.io.InputOutputStreamFactory; import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshotReply; /** @@ -34,9 +36,9 @@ public final class ShardSnapshotActor extends AbstractUntypedActorWithMetering { SerializeSnapshot(final ShardDataTreeSnapshot snapshot, final Optional installSnapshotStream, final ActorRef replyTo) { - this.snapshot = Preconditions.checkNotNull(snapshot); - this.installSnapshotStream = Preconditions.checkNotNull(installSnapshotStream); - this.replyTo = Preconditions.checkNotNull(replyTo); + this.snapshot = requireNonNull(snapshot); + this.installSnapshotStream = requireNonNull(installSnapshotStream); + this.replyTo = requireNonNull(replyTo); } ShardDataTreeSnapshot getSnapshot() { @@ -55,8 +57,11 @@ public final class ShardSnapshotActor extends AbstractUntypedActorWithMetering { //actor name override used for metering. This does not change the "real" actor name private static final String ACTOR_NAME_FOR_METERING = "shard-snapshot"; - private ShardSnapshotActor() { + private final InputOutputStreamFactory streamFactory; + + private ShardSnapshotActor(final InputOutputStreamFactory streamFactory) { super(ACTOR_NAME_FOR_METERING); + this.streamFactory = requireNonNull(streamFactory); } @Override @@ -71,7 +76,7 @@ public final class ShardSnapshotActor extends AbstractUntypedActorWithMetering { private void onSerializeSnapshot(final SerializeSnapshot request) { Optional installSnapshotStream = request.getInstallSnapshotStream(); if (installSnapshotStream.isPresent()) { - try (ObjectOutputStream out = new ObjectOutputStream(installSnapshotStream.get())) { + try (ObjectOutputStream out = getOutputStream(installSnapshotStream.get())) { request.getSnapshot().serialize(out); } catch (IOException e) { // TODO - we should communicate the failure in the CaptureSnapshotReply. @@ -83,6 +88,10 @@ public final class ShardSnapshotActor extends AbstractUntypedActorWithMetering { installSnapshotStream), ActorRef.noSender()); } + private ObjectOutputStream getOutputStream(final OutputStream outputStream) throws IOException { + return new ObjectOutputStream(streamFactory.wrapOutputStream(outputStream)); + } + /** * Sends a request to a ShardSnapshotActor to process a snapshot and send a CaptureSnapshotReply. * @@ -97,7 +106,7 @@ public final class ShardSnapshotActor extends AbstractUntypedActorWithMetering { snapshotActor.tell(new SerializeSnapshot(snapshot, installSnapshotStream, replyTo), ActorRef.noSender()); } - public static Props props() { - return Props.create(ShardSnapshotActor.class); + public static Props props(final InputOutputStreamFactory streamFactory) { + return Props.create(ShardSnapshotActor.class, streamFactory); } }