Merge "Use String(byte[], Charset)"

[openflowplugin.git] / applications / forwardingrules-manager / src / main / java / org / opendaylight / openflowplugin / applications / frm / impl / FrmReconciliationServiceImpl.java

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java
index ed55ce15521c8dc7dfa208ac032b17efd722179f..f25a34c2d57059a1776f2e1ef6ad8416af406d2c 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java
@@ -11,8 +11,12 @@ package org.opendaylight.openflowplugin.applications.frm.impl;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
-import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.aries.blueprint.annotation.service.Service;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
@@ -24,17 +28,21 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.frm.reconciliation.service.rev180227.ReconcileNodeOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.frm.reconciliation.service.rev180227.ReconcileNodeOutputBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Singleton
+@Service(classes = FrmReconciliationService.class)
 public class FrmReconciliationServiceImpl implements FrmReconciliationService {
 
     private static final Logger LOG = LoggerFactory.getLogger(FrmReconciliationServiceImpl.class);
 
     private final ForwardingRulesManagerImpl forwardingRulesManagerImpl;
 
+    @Inject
     public FrmReconciliationServiceImpl(ForwardingRulesManagerImpl forwardingRulesManagerImpl) {
         this.forwardingRulesManagerImpl = forwardingRulesManagerImpl;
     }
@@ -47,15 +55,16 @@ public class FrmReconciliationServiceImpl implements FrmReconciliationService {
 
     @Override
     public ListenableFuture<RpcResult<ReconcileNodeOutput>> reconcileNode(ReconcileNodeInput input) {
-        LOG.debug("Triggering reconciliation for node: {}", input.getNodeId().toString());
+        LOG.debug("Triggering reconciliation for node: {}", input.getNodeId());
         Node nodeDpn = buildNode(input.getNodeId().longValue());
         InstanceIdentifier<FlowCapableNode> connectedNode = InstanceIdentifier.builder(Nodes.class)
                 .child(Node.class, nodeDpn.key()).augmentation(FlowCapableNode.class).build();
         SettableFuture<RpcResult<ReconcileNodeOutput>> rpcResult = SettableFuture.create();
         ListenableFuture<Boolean> futureResult = forwardingRulesManagerImpl
                 .getNodeListener().reconcileConfiguration(connectedNode);
-        Futures.addCallback(futureResult, new ResultCallBack(futureResult, rpcResult));
-        LOG.debug("Completing reconciliation for node: {}", input.getNodeId().toString());
+        Futures.addCallback(futureResult, new ResultCallBack(futureResult, rpcResult),
+                MoreExecutors.directExecutor());
+        LOG.debug("Completing reconciliation for node: {}", input.getNodeId());
         return rpcResult;
     }
 
@@ -68,16 +77,22 @@ public class FrmReconciliationServiceImpl implements FrmReconciliationService {
         }
 
         @Override
-        public void onSuccess(@Nullable Boolean result) {
-            ReconcileNodeOutput output = new ReconcileNodeOutputBuilder().setResult(result).build();
-            futureResult.set(RpcResultBuilder.success(output).build());
+        public void onSuccess(Boolean result) {
+            if (result) {
+                ReconcileNodeOutput output = new ReconcileNodeOutputBuilder().setResult(result).build();
+                futureResult.set(RpcResultBuilder.success(output).build());
+            } else {
+                futureResult.set(RpcResultBuilder.<ReconcileNodeOutput>failed()
+                        .withError(RpcError.ErrorType.APPLICATION, "Error while triggering reconciliation").build());
+            }
+
         }
 
         @Override
         public void onFailure(Throwable error) {
             LOG.error("initReconciliation failed", error);
-            ReconcileNodeOutput output = new ReconcileNodeOutputBuilder().setResult(false).build();
-            futureResult.set(RpcResultBuilder.success(output).build());
+            futureResult.set(RpcResultBuilder.<ReconcileNodeOutput>failed()
+                    .withError(RpcError.ErrorType.RPC,"Error while calling RPC").build());
         }
     }
 }