X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsamples%2Fclustering-test-app%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fclustering%2Fit%2Fprovider%2Fimpl%2FPrefixShardHandler.java;h=163d46ab9e6cfae8bd59571534017bc105cfe016;hb=aea716f562ae010af4687812fab27af03f8a2a26;hp=e3b6f980616a4d040b946372890f40a19beaec76;hpb=7c6334fbe717fd51f76984e5789ae3d8ee2eb29a;p=controller.git

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PrefixShardHandler.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PrefixShardHandler.java
index e3b6f98061..163d46ab9e 100644
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PrefixShardHandler.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PrefixShardHandler.java
@@ -37,7 +37,11 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeService;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeShardingConflictException;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor;
 import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.CreatePrefixShardInput;
+import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.CreatePrefixShardOutput;
+import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.CreatePrefixShardOutputBuilder;
 import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RemovePrefixShardInput;
+import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RemovePrefixShardOutput;
+import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.RemovePrefixShardOutputBuilder;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -73,9 +77,10 @@ public class PrefixShardHandler {
         this.serializer = serializer;
     }
 
-    public ListenableFuture<RpcResult<Void>> onCreatePrefixShard(final CreatePrefixShardInput input) {
+    public ListenableFuture<RpcResult<CreatePrefixShardOutput>> onCreatePrefixShard(
+            final CreatePrefixShardInput input) {
 
-        final SettableFuture<RpcResult<Void>> future = SettableFuture.create();
+        final SettableFuture<RpcResult<CreatePrefixShardOutput>> future = SettableFuture.create();
 
         final CompletionStage<DistributedShardRegistration> completionStage;
         final YangInstanceIdentifier identifier = serializer.toYangInstanceIdentifier(input.getPrefix());
@@ -89,12 +94,12 @@ public class PrefixShardHandler {
                 LOG.debug("Shard[{}] created successfully.", identifier);
                 registrations.put(identifier, registration);
 
-                final ListenableFuture<Void> ensureFuture = ensureListExists();
-                Futures.addCallback(ensureFuture, new FutureCallback<Void>() {
+                final ListenableFuture<?> ensureFuture = ensureListExists();
+                Futures.addCallback(ensureFuture, new FutureCallback<Object>() {
                     @Override
-                    public void onSuccess(@Nullable final Void result) {
+                    public void onSuccess(@Nullable final Object result) {
                         LOG.debug("Initial list write successful.");
-                        future.set(RpcResultBuilder.<Void>success().build());
+                        future.set(RpcResultBuilder.success(new CreatePrefixShardOutputBuilder().build()).build());
                     }
 
                     @Override
@@ -103,7 +108,7 @@ public class PrefixShardHandler {
 
                         final RpcError error = RpcResultBuilder.newError(RpcError.ErrorType.APPLICATION,
                                 "create-shard-failed", "Shard creation failed", "cluster-test-app", "", throwable);
-                        future.set(RpcResultBuilder.<Void>failed().withRpcError(error).build());
+                        future.set(RpcResultBuilder.<CreatePrefixShardOutput>failed().withRpcError(error).build());
                     }
                 }, MoreExecutors.directExecutor());
             });
@@ -112,7 +117,7 @@ public class PrefixShardHandler {
 
                 final RpcError error = RpcResultBuilder.newError(RpcError.ErrorType.APPLICATION, "create-shard-failed",
                         "Shard creation failed", "cluster-test-app", "", throwable);
-                future.set(RpcResultBuilder.<Void>failed().withRpcError(error).build());
+                future.set(RpcResultBuilder.<CreatePrefixShardOutput>failed().withRpcError(error).build());
                 return null;
             });
         } catch (final DOMDataTreeShardingConflictException e) {
@@ -120,13 +125,14 @@ public class PrefixShardHandler {
 
             final RpcError error = RpcResultBuilder.newError(RpcError.ErrorType.APPLICATION, "create-shard-failed",
                     "Sharding conflict", "cluster-test-app", "", e);
-            future.set(RpcResultBuilder.<Void>failed().withRpcError(error).build());
+            future.set(RpcResultBuilder.<CreatePrefixShardOutput>failed().withRpcError(error).build());
         }
 
         return future;
     }
 
-    public ListenableFuture<RpcResult<Void>> onRemovePrefixShard(final RemovePrefixShardInput input) {
+    public ListenableFuture<RpcResult<RemovePrefixShardOutput>> onRemovePrefixShard(
+            final RemovePrefixShardInput input) {
 
         final YangInstanceIdentifier identifier = serializer.toYangInstanceIdentifier(input.getPrefix());
         final DistributedShardRegistration registration = registrations.get(identifier);
@@ -134,26 +140,27 @@ public class PrefixShardHandler {
         if (registration == null) {
             final RpcError error = RpcResultBuilder.newError(RpcError.ErrorType.APPLICATION, "registration-missing",
                     "No shard registered at this prefix.");
-            return Futures.immediateFuture(RpcResultBuilder.<Void>failed().withRpcError(error).build());
+            return Futures.immediateFuture(RpcResultBuilder.<RemovePrefixShardOutput>failed().withRpcError(error)
+                .build());
         }
 
-        final SettableFuture<RpcResult<Void>> future = SettableFuture.create();
+        final SettableFuture<RpcResult<RemovePrefixShardOutput>> future = SettableFuture.create();
 
         final CompletionStage<Void> close = registration.close();
-        close.thenRun(() -> future.set(RpcResultBuilder.<Void>success().build()));
+        close.thenRun(() -> future.set(RpcResultBuilder.success(new RemovePrefixShardOutputBuilder().build()).build()));
         close.exceptionally(throwable -> {
             LOG.warn("Shard[{}] removal failed:", identifier, throwable);
 
             final RpcError error = RpcResultBuilder.newError(RpcError.ErrorType.APPLICATION, "remove-shard-failed",
                     "Shard removal failed", "cluster-test-app", "", throwable);
-            future.set(RpcResultBuilder.<Void>failed().withRpcError(error).build());
+            future.set(RpcResultBuilder.<RemovePrefixShardOutput>failed().withRpcError(error).build());
             return null;
         });
 
         return future;
     }
 
-    private ListenableFuture<Void> ensureListExists() {
+    private ListenableFuture<?> ensureListExists() {
 
         final CollectionNodeBuilder<MapEntryNode, MapNode> mapBuilder = ImmutableNodes.mapNodeBuilder(ID_INT);
 
@@ -183,10 +190,10 @@ public class PrefixShardHandler {
         cursor.merge(containerNode.getIdentifier(), containerNode);
         cursor.close();
 
-        final ListenableFuture<Void> future = tx.submit();
-        Futures.addCallback(future, new FutureCallback<Void>() {
+        final ListenableFuture<?> future = tx.commit();
+        Futures.addCallback(future, new FutureCallback<Object>() {
             @Override
-            public void onSuccess(@Nullable final Void result) {
+            public void onSuccess(@Nullable final Object result) {
                 try {
                     LOG.debug("Closing producer for initial list.");
                     producer.close();