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=b7e38d50824095a4f0e31c094272593ef704441c;hb=7a38f0591bc527178510d749ae361e317dcc9788;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..b7e38d5082 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,13 +8,11 @@
 
 package org.opendaylight.controller.cluster.datastore.messages;
 
-import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.FluentFuture;
 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.mdsal.common.api.ReadFailedException;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 public class DataExists extends AbstractRead<Boolean> {
@@ -27,24 +25,18 @@ public class DataExists extends AbstractRead<Boolean> {
         super(path, version);
     }
 
-    @Deprecated
     @Override
-    protected Object newLegacySerializedInstance() {
-        return ShardTransactionMessages.DataExists.newBuilder()
-                .setInstanceIdentifierPathArguments(InstanceIdentifierUtils.toSerializable(getPath())).build();
-    }
-
-    @Override
-    public CheckedFuture<Boolean, ReadFailedException> apply(DOMStoreReadTransaction readDelegate) {
+    public FluentFuture<Boolean> apply(DOMStoreReadTransaction readDelegate) {
         return readDelegate.exists(getPath());
     }
 
     @Override
     public void processResponse(Object response, SettableFuture<Boolean> returnFuture) {
-        if(DataExistsReply.isSerializedType(response)) {
+        if (DataExistsReply.isSerializedType(response)) {
             returnFuture.set(Boolean.valueOf(DataExistsReply.fromSerializable(response).exists()));
         } else {
-            returnFuture.setException(new ReadFailedException("Invalid response checking exists for path " + getPath()));
+            returnFuture.setException(new ReadFailedException("Invalid response checking exists for path "
+                    + getPath()));
         }
     }
 
@@ -53,17 +45,12 @@ public class DataExists extends AbstractRead<Boolean> {
         return new DataExists(getPath(), withVersion);
     }
 
-    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);
-        }
+    public static DataExists fromSerializable(final Object serializable) {
+        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;
     }
 }