BUG-5280: implement message queueing

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java
index 33f2f0001c6c518d7ac93f897dc184e11aef606e..a9d1311d61a2df968d5b45350b3d0a203fcbd1da 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java
@@ -9,33 +9,23 @@
 package org.opendaylight.controller.cluster.datastore.messages;
 
 import com.google.common.base.Optional;
+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.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;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 public class ReadData extends AbstractRead<Optional<NormalizedNode<?, ?>>> {
-  public static final Class<ShardTransactionMessages.ReadData> SERIALIZABLE_CLASS =
-          ShardTransactionMessages.ReadData.class;
+    private static final long serialVersionUID = 1L;
 
-  public ReadData(final YangInstanceIdentifier path) {
-    super(path);
-  }
-
-  public Object toSerializable(){
-    return ShardTransactionMessages.ReadData.newBuilder()
-        .setInstanceIdentifierPathArguments(InstanceIdentifierUtils.toSerializable(getPath()))
-        .build();
-  }
+    public ReadData() {
+    }
 
-  public static ReadData fromSerializable(final Object serializable){
-    ShardTransactionMessages.ReadData o = (ShardTransactionMessages.ReadData) serializable;
-    return new ReadData(InstanceIdentifierUtils.fromSerializable(o.getInstanceIdentifierPathArguments()));
-  }
+    public ReadData(final YangInstanceIdentifier path, short version) {
+        super(path, version);
+    }
 
     @Override
     public CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> apply(DOMStoreReadTransaction readDelegate) {
@@ -44,16 +34,25 @@ public class ReadData extends AbstractRead<Optional<NormalizedNode<?, ?>>> {
 
     @Override
     public void processResponse(Object readResponse, SettableFuture<Optional<NormalizedNode<?, ?>>> returnFuture) {
-        if(readResponse instanceof ReadDataReply) {
-            ReadDataReply reply = (ReadDataReply) readResponse;
-            returnFuture.set(Optional.<NormalizedNode<?, ?>> fromNullable(reply.getNormalizedNode()));
-
-        } else if(ReadDataReply.isSerializedType(readResponse)) {
+        if(ReadDataReply.isSerializedType(readResponse)) {
             ReadDataReply reply = ReadDataReply.fromSerializable(readResponse);
             returnFuture.set(Optional.<NormalizedNode<?, ?>> fromNullable(reply.getNormalizedNode()));
-
         } else {
             returnFuture.setException(new ReadFailedException("Invalid response reading data for path " + getPath()));
         }
     }
+
+    @Override
+    protected AbstractRead<Optional<NormalizedNode<?, ?>>> newInstance(short withVersion) {
+        return new ReadData(getPath(), withVersion);
+    }
+
+    public static ReadData fromSerializable(final Object serializable) {
+        Preconditions.checkArgument(serializable instanceof ReadData);
+        return (ReadData)serializable;
+    }
+
+    public static boolean isSerializedType(Object message) {
+        return message instanceof ReadData;
+    }
 }