BUG-5280: introduce request/response Envelope

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / actors / client / ClientActorContext.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/client/ClientActorContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/client/ClientActorContext.java
index 9f4fd137a4ca5dc88834935714d1f0285b658235..530d7e277f3732fb6e3be96318c955483e5f2ca2 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/client/ClientActorContext.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/client/ClientActorContext.java
@@ -19,7 +19,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
 import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier;
 import org.opendaylight.controller.cluster.access.concepts.RequestException;
 import javax.annotation.concurrent.ThreadSafe;
 import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier;
 import org.opendaylight.controller.cluster.access.concepts.RequestException;

-import org.opendaylight.controller.cluster.access.concepts.Response;
+import org.opendaylight.controller.cluster.access.concepts.ResponseEnvelope;

 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import org.opendaylight.yangtools.concepts.Identifiable;
 import org.opendaylight.yangtools.concepts.WritableIdentifier;
 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import org.opendaylight.yangtools.concepts.Identifiable;
 import org.opendaylight.yangtools.concepts.WritableIdentifier;


@@ -94,8 +94,8 @@ public class ClientActorContext extends AbstractClientActorContext implements Id
         queues.remove(queue.getCookie(), queue);
     }
 
         queues.remove(queue.getCookie(), queue);
     }
 

-    ClientActorBehavior completeRequest(final ClientActorBehavior current, final Response<?, ?> response) {
-        final WritableIdentifier id = response.getTarget();
+    ClientActorBehavior completeRequest(final ClientActorBehavior current, final ResponseEnvelope<?> response) {
+        final WritableIdentifier id = response.getMessage().getTarget();

 
         // FIXME: this will need to be updated for other Request/Response types to extract cookie
         Preconditions.checkArgument(id instanceof TransactionIdentifier);
 
         // FIXME: this will need to be updated for other Request/Response types to extract cookie
         Preconditions.checkArgument(id instanceof TransactionIdentifier);