Merge "Optimize ArbitratorReconciliationManagerImpl"

diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterDirectOFRpc.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterDirectOFRpc.java
index 7ad33aba253b8b0a018624aff7a49eefb8b13c33..02bc9bd88cf7bae8e72577db2ccd1f325c1b8544 100644 (file)
--- a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterDirectOFRpc.java
+++ b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/FlowWriterDirectOFRpc.java
@@ -132,7 +132,7 @@ public class FlowWriterDirectOFRpc {
 
                 AddFlowInput addFlowInput = builder.build();
 
-                LOG.debug("RPC invocation for adding flow-id {} with input {}", flowId, addFlowInput.toString());
+                LOG.debug("RPC invocation for adding flow-id {} with input {}", flowId, addFlowInput);
                 LoggingFutures.addErrorLogging(flowService.addFlow(addFlowInput), LOG, "addFlow");
 
                 if (i % batchSize == 0) {

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java
index b64fe2b79468628ea47d6fea442d7f5786c12d29..9ce70732f0b0568f29b6906791403b942dddad39 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java
@@ -275,7 +275,7 @@ public class FlowForwarder extends AbstractListeningCommiter<Flow> {
     @Override
     public void createStaleMarkEntity(InstanceIdentifier<Flow> identifier, Flow del,
             InstanceIdentifier<FlowCapableNode> nodeIdent) {
-        LOG.debug("Creating Stale-Mark entry for the switch {} for flow {} ", nodeIdent.toString(), del.toString());
+        LOG.debug("Creating Stale-Mark entry for the switch {} for flow {} ", nodeIdent, del);
         StaleFlow staleFlow = makeStaleFlow(identifier, del, nodeIdent);
         persistStaleFlow(staleFlow, nodeIdent);
     }
@@ -404,7 +404,7 @@ public class FlowForwarder extends AbstractListeningCommiter<Flow> {
                         getFlowId(addFlowInput.getFlowRef()), nodeId);
             } else {
                 LOG.error("Flow add with id {} failed for node {} with error {}", getFlowId(addFlowInput.getFlowRef()),
-                        nodeId, rpcResult.getErrors().toString());
+                        nodeId, rpcResult.getErrors());
                 resultFuture.set(RpcResultBuilder.<AddFlowOutput>failed()
                         .withRpcErrors(rpcResult.getErrors()).build());
             }
@@ -454,7 +454,7 @@ public class FlowForwarder extends AbstractListeningCommiter<Flow> {
                         getFlowId(updateFlowInput.getFlowRef()), nodeId);
             } else {
                 LOG.error("Flow update with id {} failed for node {} with error {}",
-                        getFlowId(updateFlowInput.getFlowRef()), nodeId, rpcResult.getErrors().toString());
+                        getFlowId(updateFlowInput.getFlowRef()), nodeId, rpcResult.getErrors());
                 resultFuture.set(RpcResultBuilder.<UpdateFlowOutput>failed()
                         .withRpcErrors(rpcResult.getErrors()).build());
             }

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 c721b8500a88bdd9902d20ec7b7690a4920ac39c..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
@@ -55,7 +55,7 @@ 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();
@@ -64,7 +64,7 @@ public class FrmReconciliationServiceImpl implements FrmReconciliationService {
                 .getNodeListener().reconcileConfiguration(connectedNode);
         Futures.addCallback(futureResult, new ResultCallBack(futureResult, rpcResult),
                 MoreExecutors.directExecutor());
-        LOG.debug("Completing reconciliation for node: {}", input.getNodeId().toString());
+        LOG.debug("Completing reconciliation for node: {}", input.getNodeId());
         return rpcResult;
     }
 

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java
index 0d5848d80cac00eab6b4fbdba607ff95d49fdd6f..a2522361f6f7d51ae327638bd643d7bbe9eb60b6 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java
@@ -200,7 +200,7 @@ public class GroupForwarder extends AbstractListeningCommiter<Group> {
     @Override
     public void createStaleMarkEntity(InstanceIdentifier<Group> identifier, Group del,
             InstanceIdentifier<FlowCapableNode> nodeIdent) {
-        LOG.debug("Creating Stale-Mark entry for the switch {} for Group {} ", nodeIdent.toString(), del.toString());
+        LOG.debug("Creating Stale-Mark entry for the switch {} for Group {} ", nodeIdent, del);
         StaleGroup staleGroup = makeStaleGroup(identifier, del, nodeIdent);
         persistStaleGroup(staleGroup, nodeIdent);
 

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java
index c65abc8d593c35784de22e47ec74c9c19a418d92..ef8d5d7d97a411d606fdfa87fe79ed62f124eed9 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java
@@ -149,7 +149,7 @@ public class MeterForwarder extends AbstractListeningCommiter<Meter> {
     @Override
     public void createStaleMarkEntity(InstanceIdentifier<Meter> identifier, Meter del,
             InstanceIdentifier<FlowCapableNode> nodeIdent) {
-        LOG.debug("Creating Stale-Mark entry for the switch {} for meter {} ", nodeIdent.toString(), del.toString());
+        LOG.debug("Creating Stale-Mark entry for the switch {} for meter {} ", nodeIdent, del);
         StaleMeter staleMeter = makeStaleMeter(del);
         persistStaleMeter(staleMeter, nodeIdent);
     }