Clean up createUpdateMessageSync() a bit

We can use a simple fluent builder if we just shuffle the code around
a bit.

Change-Id: I72d0d23cd89fdb8cf38da900275a5caca85c827f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 1660e74ea677a4fb55854e988ada4ebda9b9439f)

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySessionListener.java
index 74f3e7744300072407dd92a88ad464da512d8799..18cd9d750034c85acda85da9e2dcd4e282ed9c5c 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySessionListener.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySessionListener.java
@@ -176,23 +176,19 @@ class PCEPTopologySessionListener extends AbstractTopologySessionListener {
     }
 
     private SrpIdNumber createUpdateMessageSync(final PcupdMessageBuilder pcupdMessageBuilder) {
-        final UpdatesBuilder updBuilder = new UpdatesBuilder();
-        // LSP mandatory in Upd
-        final Lsp lsp = new LspBuilder().setPlspId(PLSPID_ZERO).setSync(Boolean.TRUE).build();
-        // SRP Mandatory in Upd
-        final SrpBuilder srpBuilder = new SrpBuilder();
-        // not sue whether use 0 instead of nextRequest() or do not insert srp == SRP-ID-number = 0
-        srpBuilder.setOperationId(nextRequest());
-        final Srp srp = srpBuilder.build();
-        //ERO Mandatory in Upd
-        final PathBuilder pb = new PathBuilder();
-        pb.setEro(new EroBuilder().build());
-
-        updBuilder.setPath(pb.build());
-        updBuilder.setLsp(lsp).setSrp(srp).setPath(pb.build());
-
-        pcupdMessageBuilder.setUpdates(List.of(updBuilder.build()));
-        return srp.getOperationId();
+        // FIXME: not sure whether use 0 instead of nextRequest() or do not insert srp == SRP-ID-number = 0
+        final var operationId = nextRequest();
+
+        pcupdMessageBuilder.setUpdates(List.of(new UpdatesBuilder()
+            // LSP mandatory in PCUpd
+            .setLsp(new LspBuilder().setPlspId(PLSPID_ZERO).setSync(Boolean.TRUE).build())
+            // SRP Mandatory in PCUpd
+            .setSrp(new SrpBuilder().setOperationId(operationId).build())
+            // ERO Mandatory in PCUpd
+            .setPath(new PathBuilder().setEro(new EroBuilder().build()).build())
+            .build()));
+
+        return operationId;
     }
 
     @Holding("this")