Refactor Stateful07TopologySessionListener 89/29989/3
authorClaudio D. Gasparini <cgaspari@cisco.com>
Fri, 20 Nov 2015 13:49:02 +0000 (14:49 +0100)
committerMilos Fabian <milfabia@cisco.com>
Mon, 23 Nov 2015 18:25:47 +0000 (18:25 +0000)
Refactor Stateful07TopologySessionListener to fix Sonar
complains.

Change-Id: Ib9548697baa6e405cadc1013857388df1379b99b
Signed-off-by: Claudio D. Gasparini <cgaspari@cisco.com>
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java

index cd3f7c956c66b645bdc8d651035f3f75af298baa..642aeeb5a3c71c3cee659921465646516dbff562 100644 (file)
@@ -140,38 +140,48 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener<
     @Override
     public synchronized ListenableFuture<OperationResult> triggerSync(final TriggerSyncArgs input) {
         if (isTriggeredInitialSynchro() && !isSynchronized()) {
-            LOG.trace("Trigger Initial Synchronization {}", input);
-            final PcupdMessageBuilder pcupdMessageBuilder = new PcupdMessageBuilder(MESSAGE_HEADER);
-            final SrpIdNumber srpIdNumber = createUpdateMessageSync(pcupdMessageBuilder);
-            final Message msg = new PcupdBuilder().setPcupdMessage(pcupdMessageBuilder.build()).build();
-            // Send the message
-            return sendMessage(msg, srpIdNumber, null);
+            return triggerSynchronization(input);
         } else if (isSynchronized() && isTriggeredReSyncEnabled()) {
             Preconditions.checkArgument(input != null && input.getNode() != null, MISSING_XML_TAG);
             if (input.getName() == null) {
-                LOG.trace("Trigger Resynchronization {}", input);
-                markAllLspAsStale();
-                updatePccState(PccSyncState.PcepTriggeredResync);
-                final PcupdMessageBuilder pcupdMessageBuilder = new PcupdMessageBuilder(MESSAGE_HEADER);
-                final SrpIdNumber srpIdNumber = createUpdateMessageSync(pcupdMessageBuilder);
-                final Message msg = new PcupdBuilder().setPcupdMessage(pcupdMessageBuilder.build()).build();
-                // Send the message
-                return sendMessage(msg, srpIdNumber, null);
+                return triggerResyncronization(input);
             } else {
-                LOG.trace("Trigger Lsp Resynchronization {}", input);
-
-                // Make sure the LSP exists
-                final InstanceIdentifier<ReportedLsp> lsp = lspIdentifier(input.getName());
-                final ListenableFuture<Optional<ReportedLsp>> f = readOperationalData(lsp);
-                if (f == null) {
-                    return OperationResults.createUnsent(PCEPErrors.LSP_INTERNAL_ERROR).future();
-                }
-                return Futures.transform(f, new ResyncLspFunction(input));
+                return triggerLspSyncronization(input);
             }
         }
         return OperationResults.UNSENT.future();
     }
 
+    private ListenableFuture<OperationResult> triggerLspSyncronization(final TriggerSyncArgs input) {
+        LOG.trace("Trigger Lsp Resynchronization {}", input);
+
+        // Make sure the LSP exists
+        final InstanceIdentifier<ReportedLsp> lsp = lspIdentifier(input.getName());
+        final ListenableFuture<Optional<ReportedLsp>> f = readOperationalData(lsp);
+        if (f == null) {
+            return OperationResults.createUnsent(PCEPErrors.LSP_INTERNAL_ERROR).future();
+        }
+        return Futures.transform(f, new ResyncLspFunction(input));
+    }
+
+    private ListenableFuture<OperationResult> triggerResyncronization(final TriggerSyncArgs input) {
+        LOG.trace("Trigger Resynchronization {}", input);
+        markAllLspAsStale();
+        updatePccState(PccSyncState.PcepTriggeredResync);
+        final PcupdMessageBuilder pcupdMessageBuilder = new PcupdMessageBuilder(MESSAGE_HEADER);
+        final SrpIdNumber srpIdNumber = createUpdateMessageSync(pcupdMessageBuilder);
+        final Message msg = new PcupdBuilder().setPcupdMessage(pcupdMessageBuilder.build()).build();
+        return sendMessage(msg, srpIdNumber, null);
+    }
+
+    private ListenableFuture<OperationResult> triggerSynchronization(final TriggerSyncArgs input) {
+        LOG.trace("Trigger Initial Synchronization {}", input);
+        final PcupdMessageBuilder pcupdMessageBuilder = new PcupdMessageBuilder(MESSAGE_HEADER);
+        final SrpIdNumber srpIdNumber = createUpdateMessageSync(pcupdMessageBuilder);
+        final Message msg = new PcupdBuilder().setPcupdMessage(pcupdMessageBuilder.build()).build();
+        return sendMessage(msg, srpIdNumber, null);
+    }
+
     private SrpIdNumber createUpdateMessageSync(final PcupdMessageBuilder pcupdMessageBuilder) {
         final UpdatesBuilder updBuilder = new UpdatesBuilder();
         // LSP mandatory in Upd