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%2FSingletonGetConstantService.java;h=ffa3b80f9fef3fd9330c8b2f445cbc3c5c2ca180;hb=refs%2Fchanges%2F20%2F89320%2F2;hp=8f3dc2caad31c023081e6fda09c9ccad7ec3d7a2;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/SingletonGetConstantService.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java
index 8f3dc2caad..ffa3b80f9f 100644
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java
@@ -5,29 +5,26 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.clustering.it.provider.impl;
 
-import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcException;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementation;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementationRegistration;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
-import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult;
+import java.net.URI;
+import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
+import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
+import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.common.Revision;
+import org.opendaylight.yangtools.yang.common.YangConstants;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder;
@@ -39,15 +36,12 @@ public final class SingletonGetConstantService implements DOMRpcImplementation,
 
     private static final Logger LOG = LoggerFactory.getLogger(SingletonGetConstantService.class);
 
-    private static final QName OUTPUT =
-            QName.create("tag:opendaylight.org,2017:controller:yang:lowlevel:target","2017-02-15", "output");
-    private static final QName CONSTANT =
-            QName.create("tag:opendaylight.org,2017:controller:yang:lowlevel:target","2017-02-15", "constant");
-    private static final QName CONTEXT =
-            QName.create("tag:opendaylight.org,2017:controller:yang:lowlevel:target","2017-02-15", "context");
-    private static final QName GET_SINGLETON_CONSTANT =
-            QName.create("tag:opendaylight.org,2017:controller:yang:lowlevel:target","2017-02-15",
-                    "get-singleton-constant");
+    private static final QNameModule MODULE = QNameModule.create(
+        URI.create("tag:opendaylight.org,2017:controller:yang:lowlevel:target"), Revision.of("2017-02-15")).intern();
+    private static final QName OUTPUT = YangConstants.operationOutputQName(MODULE).intern();
+    private static final QName CONSTANT = QName.create(MODULE, "constant").intern();
+    private static final QName CONTEXT = QName.create(MODULE, "context").intern();
+    private static final QName GET_SINGLETON_CONSTANT = QName.create(MODULE, "get-singleton-constant").intern();
 
     private static final ServiceGroupIdentifier SERVICE_GROUP_IDENTIFIER =
             ServiceGroupIdentifier.create("get-singleton-constant-service");
@@ -56,10 +50,7 @@ public final class SingletonGetConstantService implements DOMRpcImplementation,
     private final String constant;
     private DOMRpcImplementationRegistration<SingletonGetConstantService> rpcRegistration;
 
-    private SingletonGetConstantService(final DOMRpcProviderService rpcProviderService,
-                                        final String constant) {
-
-
+    private SingletonGetConstantService(final DOMRpcProviderService rpcProviderService, final String constant) {
         this.rpcProviderService = rpcProviderService;
         this.constant = constant;
     }
@@ -69,27 +60,21 @@ public final class SingletonGetConstantService implements DOMRpcImplementation,
             final String constant) {
         LOG.debug("Registering get-singleton-constant into ClusterSingletonService, value {}", constant);
 
-        return singletonService
-                .registerClusterSingletonService(new SingletonGetConstantService(rpcProviderService, constant));
+        return singletonService.registerClusterSingletonService(
+            new SingletonGetConstantService(rpcProviderService, constant));
     }
 
-    @Nonnull
     @Override
-    public CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(@Nonnull DOMRpcIdentifier rpc,
-            @Nullable NormalizedNode<?, ?> input) {
+    public ListenableFuture<DOMRpcResult> invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode<?, ?> input) {
         LOG.debug("get-singleton-constant invoked, current value: {}", constant);
 
-        final LeafNode<Object> value = ImmutableLeafNodeBuilder.create()
+        return Futures.immediateFuture(new DefaultDOMRpcResult(ImmutableContainerNodeBuilder.create()
+            .withNodeIdentifier(new NodeIdentifier(OUTPUT))
+            .withChild(ImmutableLeafNodeBuilder.create()
                 .withNodeIdentifier(new NodeIdentifier(CONSTANT))
                 .withValue(constant)
-                .build();
-
-        final ContainerNode result = ImmutableContainerNodeBuilder.create()
-                .withNodeIdentifier(new NodeIdentifier(OUTPUT))
-                .withChild(value)
-                .build();
-
-        return Futures.immediateCheckedFuture(new DefaultDOMRpcResult(result));
+                .build())
+            .build()));
     }
 
     @Override