Removed some sonar warnings from pcep.

[bgpcep.git] / pcep / topology-provider / src / main / java / org / opendaylight / bgpcep / pcep / topology / provider / ServerSessionManager.java

diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
index cba6cdb58ebda0e1ab0bb48446a851d12d285da4..ee4a16142dbf59f727fafd9e513b6b7211dc57f1 100644 (file)
--- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
+++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
@@ -115,7 +115,7 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
                private long requestId = 1;
                private NodeId nodeId;
 
-               final Node topologyNode(final DataModificationTransaction trans, final InetAddress address) {
+               Node topologyNode(final DataModificationTransaction trans, final InetAddress address) {
                        final String pccId = createNodeId(address);
                        final Topology topo = (Topology) trans.readOperationalData(ServerSessionManager.this.topology);
 
@@ -252,7 +252,7 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
                public synchronized void onMessage(final PCEPSession session, final Message message) {
                        if (!(message instanceof PcrptMessage)) {
                                LOG.info("Unhandled message {} on session {}", message, session);
-                               session.sendMessage(unhandledMessageError);
+                               session.sendMessage(UNHANDLED_MESSAGE_ERROR);
                        }
 
                        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcrpt.message.PcrptMessage rpt = ((PcrptMessage) message).getPcrptMessage();
@@ -310,7 +310,7 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
                                                final SymbolicPathName name = tlvs.getSymbolicPathName();
                                                if (name == null) {
                                                        LOG.error("PLSPID {} seen for the first time, not reporting the LSP", id);
-                                                       // TODO: what should we do here?
+                                                       // FIXME: BUG-189
                                                        continue;
                                                }
                                                this.lsps.put(id, name);
@@ -370,9 +370,9 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
        }
 
        private static final Logger LOG = LoggerFactory.getLogger(ServerSessionManager.class);
-       private static final Pcerr unhandledMessageError = new PcerrBuilder().setPcerrMessage(
+       private static final Pcerr UNHANDLED_MESSAGE_ERROR = new PcerrBuilder().setPcerrMessage(
                        new PcerrMessageBuilder().setErrorType(null).build()).build();
-       private static final MessageHeader messageHeader = new MessageHeader() {
+       private static final MessageHeader MESSAGE_HEADER = new MessageHeader() {
                private final ProtocolVersion version = new ProtocolVersion((short) 1);
 
                @Override
@@ -412,9 +412,17 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
                                                                new TopologyTypes1Builder().setTopologyPcep(new TopologyPcepBuilder().build()).build()).build()).setNode(
                                                new ArrayList<Node>()).build());
 
-               // FIXME: attach to the future to notify of failures
-               t.commit();
+               Futures.addCallback(JdkFutureAdapters.listenInPoolThread(t.commit()), new FutureCallback<RpcResult<TransactionStatus>>() {
+                       @Override
+                       public void onSuccess(final RpcResult<TransactionStatus> result) {
+                               // Nothing to do
+                       }
 
+                       @Override
+                       public void onFailure(final Throwable t) {
+                               LOG.error("Failed to create topology {}", topology);
+                       }
+               });
        }
 
        @Override
@@ -444,7 +452,7 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
                rb.setLsp(new LspBuilder().setAdministrative(input.getArguments().isAdministrative()).setDelegate(Boolean.TRUE).setTlvs(
                                new TlvsBuilder().setSymbolicPathName(new SymbolicPathNameBuilder().setPathName(input.getName()).build()).build()).build());
 
-               final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder(messageHeader);
+               final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder(MESSAGE_HEADER);
                ib.setRequests(ImmutableList.of(rb.build()));
 
                // Send the message
@@ -487,7 +495,7 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
                rb.setSrp(new SrpBuilder().setOperationId(l.nextRequest()).setProcessingRule(Boolean.TRUE).setFlags(new Flags(Boolean.TRUE)).build());
                rb.setLsp(new LspBuilder().setRemove(Boolean.TRUE).setPlspId(rep.getLsp().getPlspId()).setDelegate(Boolean.TRUE).build());
 
-               final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder(messageHeader);
+               final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder(MESSAGE_HEADER);
                ib.setRequests(ImmutableList.of(rb.build()));
                return l.sendMessage(new PcinitiateBuilder().setPcinitiateMessage(ib.build()).build(), rb.getSrp().getOperationId());
        }
@@ -516,7 +524,7 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
                final PathBuilder pb = new PathBuilder();
                rb.setPath(pb.setEro(input.getArguments().getEro()).build());
 
-               final PcupdMessageBuilder ub = new PcupdMessageBuilder(messageHeader);
+               final PcupdMessageBuilder ub = new PcupdMessageBuilder(MESSAGE_HEADER);
                ub.setUpdates(ImmutableList.of(rb.build()));
                return l.sendMessage(new PcupdBuilder().setPcupdMessage(ub.build()).build(), rb.getSrp().getOperationId());
        }
@@ -530,9 +538,8 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
                }
 
                // Make sure the LSP exists
-               final InstanceIdentifier<ReportedLsps> lsp = InstanceIdentifier.builder(l.topologyAugment).
-                               child(PathComputationClient.class).
-                               child(ReportedLsps.class, new ReportedLspsKey(input.getName())).toInstance();
+               final InstanceIdentifier<ReportedLsps> lsp = InstanceIdentifier.builder(l.topologyAugment).child(PathComputationClient.class).child(
+                               ReportedLsps.class, new ReportedLspsKey(input.getName())).toInstance();
                LOG.debug("Checking if LSP {} has operational state {}", lsp, input.getArguments().getOperational());
                final ReportedLsps rep = (ReportedLsps) this.dataProvider.readOperationalData(lsp);
                if (rep == null) {