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%2Fpersisted%2FCommitTransactionPayload.java;h=c348727cf89f4136a8e00ec1719621a1154e5d9c;hb=51a259618fa238c797257058b2f631350221de94;hp=dd27b4e629d2b593bc37e717ad52446e6b769eb2;hpb=8d865c6d69a4f5171162d8a8d84980600423c49d;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java index dd27b4e629..c348727cf8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java @@ -19,7 +19,6 @@ import java.io.ObjectOutput; import java.io.Serializable; import java.util.AbstractMap.SimpleImmutableEntry; import java.util.Map.Entry; -import java.util.Optional; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; @@ -31,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; * @author Robert Varga */ @Beta -public final class CommitTransactionPayload extends Payload implements DataTreeCandidateSupplier, Serializable { +public final class CommitTransactionPayload extends Payload implements Serializable { private static final class Proxy implements Externalizable { private static final long serialVersionUID = 1L; private byte[] serialized; @@ -78,10 +77,9 @@ public final class CommitTransactionPayload extends Payload implements DataTreeC return new CommitTransactionPayload(out.toByteArray()); } - @Override - public Entry, DataTreeCandidate> getCandidate() throws IOException { + public Entry getCandidate() throws IOException { final DataInput in = ByteStreams.newDataInput(serialized); - return new SimpleImmutableEntry<>(Optional.of(TransactionIdentifier.readFrom(in)), + return new SimpleImmutableEntry<>(TransactionIdentifier.readFrom(in), DataTreeCandidateInputOutput.readDataTreeCandidate(in)); }