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%2Fmessages%2FDataExists.java;h=db62547d424506efb26236610e9d1567e032e6fd;hb=12e16922ccae84464390f8767aa470f63fa49251;hp=08394622fbd7ec3a410914d1ff2d57c42cf909c1;hpb=dd16edd5a758f0e51727de511f9868c72b2a1dd0;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExists.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExists.java index 08394622fb..db62547d42 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExists.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExists.java @@ -8,12 +8,10 @@ package org.opendaylight.controller.cluster.datastore.messages; +import com.google.common.base.Preconditions; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.SettableFuture; -import org.opendaylight.controller.cluster.datastore.DataStoreVersions; -import org.opendaylight.controller.cluster.datastore.util.InstanceIdentifierUtils; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; -import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -27,13 +25,6 @@ public class DataExists extends AbstractRead { super(path, version); } - @Deprecated - @Override - protected Object newLegacySerializedInstance() { - return ShardTransactionMessages.DataExists.newBuilder() - .setInstanceIdentifierPathArguments(InstanceIdentifierUtils.toSerializable(getPath())).build(); - } - @Override public CheckedFuture apply(DOMStoreReadTransaction readDelegate) { return readDelegate.exists(getPath()); @@ -54,16 +45,11 @@ public class DataExists extends AbstractRead { } public static DataExists fromSerializable(final Object serializable){ - if(serializable instanceof DataExists) { - return (DataExists)serializable; - } else { - ShardTransactionMessages.DataExists o = (ShardTransactionMessages.DataExists) serializable; - return new DataExists(InstanceIdentifierUtils.fromSerializable(o.getInstanceIdentifierPathArguments()), - DataStoreVersions.LITHIUM_VERSION); - } + Preconditions.checkArgument(serializable instanceof DataExists); + return (DataExists)serializable; } public static boolean isSerializedType(Object message) { - return message instanceof DataExists || message instanceof ShardTransactionMessages.DataExists; + return message instanceof DataExists; } }