Code clean up

replace long literal 'l' by 'L'

Change-Id: I9d8bffb3559887336299e84d77db82fdf7e5f379
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/BgpCliUtilsTests.java b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/BgpCliUtilsTests.java
index a005fd6ab5579e4c25bb3eb3b092d68cd6f38977..2dc6605893e9fd31dcd38e1a78c6804dd1979a7c 100644 (file)
--- a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/BgpCliUtilsTests.java
+++ b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/BgpCliUtilsTests.java
@@ -47,7 +47,7 @@ public final class BgpCliUtilsTests{
         when(bgpSessionState.getMessagesStats()).thenReturn(msgStats);
         when(speakerPref.getAddPathCapability()).thenReturn(true);
         when(peerPref.getAddPathCapability()).thenReturn(true);
-        when(errorReceived.getCount()).thenReturn(new ZeroBasedCounter32(5l));
+        when(errorReceived.getCount()).thenReturn(new ZeroBasedCounter32(5L));
 
         when(errorMsgs.getErrorReceived()).thenReturn(newlist);
         when(msgStats.getErrorMsgs()).thenReturn(errorMsgs);

diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtilTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtilTest.java
index d9b81d5dcc23695016e0102698c73115b0107451..cd29039b660da15266cf3e43e995152e510718b5 100644 (file)
--- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtilTest.java
+++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtilTest.java
@@ -38,13 +38,13 @@ public class PathIdUtilTest {
 
     @Test
     public void testWritePathIdZero() {
-        PathIdUtil.writePathId(new PathId(0l), this.buffer);
+        PathIdUtil.writePathId(new PathId(0L), this.buffer);
         Assert.assertEquals(0, this.buffer.readableBytes());
     }
 
     @Test
     public void testWritePathId() {
-        PathIdUtil.writePathId(new PathId(10l), this.buffer);
+        PathIdUtil.writePathId(new PathId(10L), this.buffer);
         Assert.assertEquals(Integer.BYTES, this.buffer.readableBytes());
     }
 

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AbstractRIBImplModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AbstractRIBImplModuleTest.java
index 2d582b3d7e3d1b6a53dc32620d1599bb5868d6e2..f421c6a315e7323e01717d5a05de8cb1ee99cd02 100755 (executable)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AbstractRIBImplModuleTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AbstractRIBImplModuleTest.java
@@ -288,7 +288,7 @@ public abstract class AbstractRIBImplModuleTest extends AbstractConfigTest {
         doReturn(mockedChain).when(this.mockedRIB).createPeerChain(any());
         doNothing().when(mockedChain).close();
         doReturn(YangInstanceIdentifier.of(BgpRib.QNAME)).when(this.mockedRIB).getYangRibId();
-        doReturn(new AsNumber(123456l)).when(this.mockedRIB).getLocalAs();
+        doReturn(new AsNumber(123456L)).when(this.mockedRIB).getLocalAs();
         doReturn(BGP_ID).when(this.mockedRIB).getBgpIdentifier();
         final BGPRenderStats mockedRenderStats = mock(BGPRenderStats.class);
         doReturn(new LongAdder()).when(mockedRenderStats).getConfiguredPeerCounter();

diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java
index 621e56596f2cd02d749edf50cb61f03847aae20b..e8e8ba3206ec0bfb865bc152136af7de07355357 100644 (file)
--- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java
+++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java
@@ -74,7 +74,7 @@ public class IncrementalSynchronizationProcedureTest extends AbstractPCEPSession
         this.listener = (Stateful07TopologySessionListener) getSessionListener();
 
         //session up - expect sync (LSP-DBs do not match)
-        final LspDbVersion localDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(2l)).build();
+        final LspDbVersion localDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(2L)).build();
         this.session = getPCEPSession(getOpen(localDbVersion), getOpen(null));
         this.listener.onSessionUp(session);
 
@@ -138,7 +138,7 @@ public class IncrementalSynchronizationProcedureTest extends AbstractPCEPSession
         return MsgBuilderUtil.createPcRtpMessage(createLsp(0, false, Optional.of(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class,
                     new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
-                        .optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(3l)).build()).build()).build()), true, false), Optional.<Srp>absent(),
+                        .optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(3L)).build()).build()).build()), true, false), Optional.<Srp>absent(),
             createPath(Collections.<Subobject>emptyList()));
     }
 }

diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java
index c14569ac24fc2f946ae4ef2549422da8641f45a5..0dc8f0b7eed3d053160ac56e74a790dec84617c7 100644 (file)
--- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java
+++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java
@@ -49,7 +49,7 @@ public class PCEPStatefulPeerProposalTest {
             .child(Topology.class, new TopologyKey(new TopologyId("topology")));
     private static final NodeId NODE_ID = new NodeId("node");
     private static final LspDbVersion LSP_DB_VERSION = new LspDbVersionBuilder().setLspDbVersionValue(
-            BigInteger.valueOf(1l)).build();
+            BigInteger.valueOf(1L)).build();
 
     @Mock
     private DataBroker dataBroker;

diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java
index f75a17df263d8f3b61576b259653f3fd95f54f4e..7a0f6bdf016713103e9f4f396705385ca59887ee 100644 (file)
--- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java
+++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java
@@ -65,7 +65,7 @@ public class PCEPTriggeredReSynchronizationProcedureTest extends AbstractPCEPSes
     @Test
     public void testTriggeredResynchronization() throws InterruptedException, ExecutionException {
         //session up - sync skipped (LSP-DBs match)
-        final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1l)).build();
+        final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1L)).build();
         this.session = getPCEPSession(getOpen(lspDbVersion), getOpen(lspDbVersion));
         this.listener.onSessionUp(session);
 
@@ -109,7 +109,7 @@ public class PCEPTriggeredReSynchronizationProcedureTest extends AbstractPCEPSes
     @Test
     public void testTriggeredResynchronizationLsp() throws InterruptedException, ExecutionException {
         //session up - sync skipped (LSP-DBs match)
-        final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1l)).build();
+        final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1L)).build();
         this.session = getPCEPSession(getOpen(lspDbVersion), getOpen(lspDbVersion));
         this.listener.onSessionUp(session);
 
@@ -171,18 +171,18 @@ public class PCEPTriggeredReSynchronizationProcedureTest extends AbstractPCEPSes
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder().addAugmentation(
                     org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class,
                     new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder()
-                        .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(3l)).build()).build()).build()), true, false),
+                        .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(3L)).build()).build()).build()), true, false),
                             Optional.of(srpBuilder.build()), createPath(Collections.<Subobject>emptyList()));
     }
 
     private Pcrpt getPcrt() {
-        return MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setPlspId(new PlspId(1l)).setTlvs(
+        return MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setPlspId(new PlspId(1L)).setTlvs(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.
-                    TlvsBuilder().setLspIdentifiers(new LspIdentifiersBuilder().setLspId(new LspId(1l)).build()).setSymbolicPathName(
+                    TlvsBuilder().setLspIdentifiers(new LspIdentifiersBuilder().setLspId(new LspId(1L)).build()).setSymbolicPathName(
                     new SymbolicPathNameBuilder().setPathName(new SymbolicPathName("test".getBytes())).build())
                     .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class,
                         new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder()
-                            .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1l)).build()).build()).build())
+                            .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1L)).build()).build()).build())
                 .setPlspId(new PlspId(1L)).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.<Srp>absent(),
             createPath(Collections.<Subobject>emptyList()));
     }

diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java
index 0be8b120bf435f7cfcaf4689fb490ba4f9ea5502..a109c9de44fdd10ca828f70c4cbffa3df510adf9 100644 (file)
--- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java
+++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java
@@ -66,8 +66,8 @@ public class PCETriggeredInitialSyncProcedureTest extends AbstractPCEPSessionTes
         this.listener = (Stateful07TopologySessionListener) getSessionListener();
 
         //session up - expect triggered sync (LSP-DBs do not match)
-        final LspDbVersion localDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1l)).build();
-        final LspDbVersion localDbVersion2 = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(2l)).build();
+        final LspDbVersion localDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1L)).build();
+        final LspDbVersion localDbVersion2 = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(2L)).build();
         this.session = getPCEPSession(getOpen(localDbVersion, Boolean.FALSE), getOpen(localDbVersion2, Boolean.FALSE));
         this.listener.onSessionUp(session);
 
@@ -107,19 +107,19 @@ public class PCETriggeredInitialSyncProcedureTest extends AbstractPCEPSessionTes
                         .xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class, new org.opendaylight
                         .yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714
                         .Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger
-                        .valueOf(2l)).build()).build()).build()), true, false), Optional.<Srp>absent(),
+                        .valueOf(2L)).build()).build()).build()), true, false), Optional.<Srp>absent(),
                         createPath(Collections.<Subobject>emptyList()));
     }
 
     private Pcrpt getPcrpt() {
-        return MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setPlspId(new PlspId(1l)).setTlvs(
+        return MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setPlspId(new PlspId(1L)).setTlvs(
             new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp
-                .object.lsp.TlvsBuilder().setLspIdentifiers(new LspIdentifiersBuilder().setLspId(new LspId(1l)).build
+                .object.lsp.TlvsBuilder().setLspIdentifiers(new LspIdentifiersBuilder().setLspId(new LspId(1L)).build
                 ()).setSymbolicPathName(new SymbolicPathNameBuilder().setPathName(new SymbolicPathName("test"
                 .getBytes())).build()).addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns
                 .yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class, new org.opendaylight.yang.gen.v1
                 .urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder()
-                .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(3l)).build())
+                .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(3L)).build())
                 .build()).build()).setPlspId(new PlspId(1L)).setSync(true).setRemove(false).setOperational
             (OperationalStatus.Active).build(), Optional.<Srp>absent(), createPath(Collections.<Subobject>emptyList()));
     }

diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java
index 4efb8162e5c601044ff51bc63285dc3c7aa50e23..409160af149372bee6385687a2a30e70e245b267 100644 (file)
--- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java
+++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java
@@ -69,12 +69,12 @@ public class StateSynchronizationAvoidanceProcedureTest extends AbstractPCEPSess
         final Pcrpt pcRpt = MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setTlvs(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder()
                     .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class,
-                            new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1l)).build()).build()).build()).setPlspId(new PlspId(1L)).setSync(false).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.of(MsgBuilderUtil.createSrp(1l)), null);
+                            new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1L)).build()).build()).build()).setPlspId(new PlspId(1L)).setSync(false).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.of(MsgBuilderUtil.createSrp(1L)), null);
         this.listener.onMessage(session, pcRpt);
         //check topology
         final Topology topo1 = getTopology().get();
         final LspDbVersion lspDb1 = topo1.getNode().get(0).getAugmentation(Node1.class).getPathComputationClient().getAugmentation(PathComputationClient1.class).getLspDbVersion();
-        Assert.assertEquals(1l, lspDb1.getLspDbVersionValue().longValue());
+        Assert.assertEquals(1L, lspDb1.getLspDbVersionValue().longValue());
         //drop session
         this.listener.onSessionDown(session, new IllegalStateException());
         //check topology - node is persisted
@@ -85,7 +85,7 @@ public class StateSynchronizationAvoidanceProcedureTest extends AbstractPCEPSess
     @Test
     public void testStateSynchronizationSkipped() throws InterruptedException, ExecutionException {
         //session up - sync skipped (LSP-DBs match)
-        final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1l)).build();
+        final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1L)).build();
         this.session = getPCEPSession(getOpen(lspDbVersion), getOpen(lspDbVersion));
         this.listener.onSessionUp(session);
         //check node - synchronized
@@ -98,10 +98,10 @@ public class StateSynchronizationAvoidanceProcedureTest extends AbstractPCEPSess
         this.session = getPCEPSession(getOpen(null), getOpen(null));
         this.listener.onSessionUp(session);
         //report LSP + LSP-DB version number
-        final Pcrpt pcRpt = MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setPlspId(new PlspId(1l)).setTlvs(
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder().setLspIdentifiers(new LspIdentifiersBuilder().setLspId(new LspId(1l)).build()).setSymbolicPathName(new SymbolicPathNameBuilder().setPathName(new SymbolicPathName("test".getBytes())).build())
+        final Pcrpt pcRpt = MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setPlspId(new PlspId(1L)).setTlvs(
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder().setLspIdentifiers(new LspIdentifiersBuilder().setLspId(new LspId(1L)).build()).setSymbolicPathName(new SymbolicPathNameBuilder().setPathName(new SymbolicPathName("test".getBytes())).build())
                     .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class,
-                            new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1l)).build()).build()).build()).setPlspId(new PlspId(1L)).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.<Srp>absent(), createPath(Collections.<Subobject> emptyList()));
+                            new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1L)).build()).build()).build()).setPlspId(new PlspId(1L)).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.<Srp>absent(), createPath(Collections.<Subobject> emptyList()));
         this.listener.onMessage(session, pcRpt);
         final Topology topo = getTopology().get();
         final PathComputationClient pcc = topo.getNode().get(0).getAugmentation(Node1.class).getPathComputationClient();
@@ -110,7 +110,7 @@ public class StateSynchronizationAvoidanceProcedureTest extends AbstractPCEPSess
         this.listener = (Stateful07TopologySessionListener) getSessionListener();
 
         //session up - expect sync (LSP-DBs do not match)
-        final LspDbVersion localDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(2l)).build();
+        final LspDbVersion localDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(2L)).build();
         this.session = getPCEPSession(getOpen(localDbVersion), getOpen(null));
         this.listener.onSessionUp(session);
 
@@ -123,7 +123,7 @@ public class StateSynchronizationAvoidanceProcedureTest extends AbstractPCEPSess
         //sync rpt + LSP-DB
         final Pcrpt syncMsg = MsgBuilderUtil.createPcRtpMessage(createLsp(0, false, Optional.of(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class,
-                        new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(2l)).build()).build()).build()), true, false), Optional.<Srp>absent(),
+                        new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(2L)).build()).build()).build()), true, false), Optional.<Srp>absent(),
                 createPath(Collections.<Subobject> emptyList()));
         this.listener.onMessage(session, syncMsg);
         final Topology topo3 = getTopology().get();

diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimizationTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimizationTest.java
index 105e1dab871f573d00a6beab72653069b81780ae..571c2553c1cf398eae2710f2a85d7637a263fd34 100644 (file)
--- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimizationTest.java
+++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimizationTest.java
@@ -41,7 +41,7 @@ public class SyncOptimizationTest {
 
     @Test
     public void testDoesLspDbMatchPositive() {
-        final Tlvs tlvs = createTlvs(1l, false, false);
+        final Tlvs tlvs = createTlvs(1L, false, false);
         Mockito.doReturn(tlvs).when(pcepSession).localSessionCharacteristics();
         Mockito.doReturn(tlvs).when(pcepSession).getRemoteTlvs();
         final SyncOptimization syncOpt = new SyncOptimization(pcepSession);
@@ -50,8 +50,8 @@ public class SyncOptimizationTest {
 
     @Test
     public void testDoesLspDbMatchNegative() {
-        final Tlvs localTlvs = createTlvs(1l, false, false);
-        final Tlvs remoteTlvs = createTlvs(2l, false, false);
+        final Tlvs localTlvs = createTlvs(1L, false, false);
+        final Tlvs remoteTlvs = createTlvs(2L, false, false);
         Mockito.doReturn(localTlvs).when(pcepSession).localSessionCharacteristics();
         Mockito.doReturn(remoteTlvs).when(pcepSession).getRemoteTlvs();
         final SyncOptimization syncOpt = new SyncOptimization(pcepSession);
@@ -60,7 +60,7 @@ public class SyncOptimizationTest {
 
     @Test
     public void testIsSyncAvoidanceEnabledPositive() {
-        final Tlvs tlvs = createTlvs(1l, true, false);
+        final Tlvs tlvs = createTlvs(1L, true, false);
         Mockito.doReturn(tlvs).when(pcepSession).localSessionCharacteristics();
         Mockito.doReturn(tlvs).when(pcepSession).getRemoteTlvs();
         final SyncOptimization syncOpt = new SyncOptimization(pcepSession);
@@ -69,8 +69,8 @@ public class SyncOptimizationTest {
 
     @Test
     public void testIsSyncAvoidanceEnabledNegative() {
-        final Tlvs localTlvs = createTlvs(1l, true, false);
-        final Tlvs remoteTlvs = createTlvs(2l, false, false);
+        final Tlvs localTlvs = createTlvs(1L, true, false);
+        final Tlvs remoteTlvs = createTlvs(2L, false, false);
         Mockito.doReturn(localTlvs).when(pcepSession).localSessionCharacteristics();
         Mockito.doReturn(remoteTlvs).when(pcepSession).getRemoteTlvs();
         final SyncOptimization syncOpt = new SyncOptimization(pcepSession);
@@ -79,7 +79,7 @@ public class SyncOptimizationTest {
 
     @Test
     public void testIsDeltaSyncEnabledPositive() {
-        final Tlvs tlvs = createTlvs(1l, true, true);
+        final Tlvs tlvs = createTlvs(1L, true, true);
         Mockito.doReturn(tlvs).when(pcepSession).localSessionCharacteristics();
         Mockito.doReturn(tlvs).when(pcepSession).getRemoteTlvs();
         final SyncOptimization syncOpt = new SyncOptimization(pcepSession);
@@ -88,8 +88,8 @@ public class SyncOptimizationTest {
 
     @Test
     public void testIsDeltaSyncEnabledNegative() {
-        final Tlvs localTlvs = createTlvs(1l, true, true);
-        final Tlvs remoteTlvs = createTlvs(2l, false, false);
+        final Tlvs localTlvs = createTlvs(1L, true, true);
+        final Tlvs remoteTlvs = createTlvs(2L, false, false);
         Mockito.doReturn(localTlvs).when(pcepSession).localSessionCharacteristics();
         Mockito.doReturn(remoteTlvs).when(pcepSession).getRemoteTlvs();
         final SyncOptimization syncOpt = new SyncOptimization(pcepSession);
@@ -99,7 +99,7 @@ public class SyncOptimizationTest {
     @Test
     public void testIsDbVersionPresentPositive() {
         final Tlvs localTlvs = createTlvs(null, false, false);
-        final Tlvs remoteTlvs = createTlvs(2l, false, false);
+        final Tlvs remoteTlvs = createTlvs(2L, false, false);
         Mockito.doReturn(localTlvs).when(pcepSession).localSessionCharacteristics();
         Mockito.doReturn(remoteTlvs).when(pcepSession).getRemoteTlvs();
         final SyncOptimization syncOpt = new SyncOptimization(pcepSession);

diff --git a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java
index ea44f7419e60335e199cd281a44b5e1b90efe215..b36add12c8d03ae49a38e3df82c96c759e84bc2d 100644 (file)
--- a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java
+++ b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java
@@ -204,7 +204,7 @@ public class ProgrammingServiceImplTest extends AbstractDataBrokerTest {
 
     @Test(timeout = 30 * 1000)
     public void testTimeoutWhileScheduledTransaction() throws Exception {
-        final BigInteger deadlineOffset = BigInteger.valueOf(1000l * 1000 * 1000 * INSTRUCTION_DEADLINE_OFFSET_IN_SECONDS /* seconds */);
+        final BigInteger deadlineOffset = BigInteger.valueOf(1000L * 1000 * 1000 * INSTRUCTION_DEADLINE_OFFSET_IN_SECONDS /* seconds */);
         final Nanotime current = NanotimeUtil.currentTime();
         final Nanotime deadlineNano = new Nanotime(current.getValue().add(deadlineOffset));
 
@@ -224,7 +224,7 @@ public class ProgrammingServiceImplTest extends AbstractDataBrokerTest {
 
     @Test(timeout = 30 * 1000)
     public void testTimeoutWhileSuccessfulTransaction() throws Exception {
-        final BigInteger deadlineOffset = BigInteger.valueOf(1000l * 1000 * 1000 * INSTRUCTION_DEADLINE_OFFSET_IN_SECONDS /* seconds */);
+        final BigInteger deadlineOffset = BigInteger.valueOf(1000L * 1000 * 1000 * INSTRUCTION_DEADLINE_OFFSET_IN_SECONDS /* seconds */);
         final Nanotime current = NanotimeUtil.currentTime();
         final Nanotime deadlineNano = new Nanotime(current.getValue().add(deadlineOffset));
 
@@ -248,7 +248,7 @@ public class ProgrammingServiceImplTest extends AbstractDataBrokerTest {
 
     @Test(timeout = 30 * 1000)
     public void testTimeoutWhileExecutingWithDependenciesTransaction() throws Exception {
-        final BigInteger deadlineOffset = BigInteger.valueOf(1000l * 1000 * 1000 * INSTRUCTION_DEADLINE_OFFSET_IN_SECONDS /* seconds */);
+        final BigInteger deadlineOffset = BigInteger.valueOf(1000L * 1000 * 1000 * INSTRUCTION_DEADLINE_OFFSET_IN_SECONDS /* seconds */);
         final Nanotime current = NanotimeUtil.currentTime();
         final Nanotime deadlineNano = new Nanotime(current.getValue().add(deadlineOffset));