Sho SHIMIZU
Committed by Gerrit Code Review

Use long literal to shorten codes

Change-Id: I7a6c4e32b98aa37ce862ab94cab246889aea986a
...@@ -41,36 +41,36 @@ public class AsPathTest { ...@@ -41,36 +41,36 @@ public class AsPathTest {
41 41
42 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_CONFED_SEQUENCE; 42 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_CONFED_SEQUENCE;
43 segmentAsNumbers = new ArrayList<>(); 43 segmentAsNumbers = new ArrayList<>();
44 - segmentAsNumbers.add((long) 1); 44 + segmentAsNumbers.add(1L);
45 - segmentAsNumbers.add((long) 2); 45 + segmentAsNumbers.add(2L);
46 - segmentAsNumbers.add((long) 3); 46 + segmentAsNumbers.add(3L);
47 pathSegment = 47 pathSegment =
48 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers); 48 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers);
49 pathSegments.add(pathSegment); 49 pathSegments.add(pathSegment);
50 // 50 //
51 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_CONFED_SET; 51 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_CONFED_SET;
52 segmentAsNumbers = new ArrayList<>(); 52 segmentAsNumbers = new ArrayList<>();
53 - segmentAsNumbers.add((long) 4); 53 + segmentAsNumbers.add(4L);
54 - segmentAsNumbers.add((long) 5); 54 + segmentAsNumbers.add(5L);
55 - segmentAsNumbers.add((long) 6); 55 + segmentAsNumbers.add(6L);
56 pathSegment = 56 pathSegment =
57 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers); 57 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers);
58 pathSegments.add(pathSegment); 58 pathSegments.add(pathSegment);
59 // 59 //
60 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE; 60 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE;
61 segmentAsNumbers = new ArrayList<>(); 61 segmentAsNumbers = new ArrayList<>();
62 - segmentAsNumbers.add((long) 7); 62 + segmentAsNumbers.add(7L);
63 - segmentAsNumbers.add((long) 8); 63 + segmentAsNumbers.add(8L);
64 - segmentAsNumbers.add((long) 9); 64 + segmentAsNumbers.add(9L);
65 pathSegment = 65 pathSegment =
66 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers); 66 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers);
67 pathSegments.add(pathSegment); 67 pathSegments.add(pathSegment);
68 // 68 //
69 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SET; 69 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SET;
70 segmentAsNumbers = new ArrayList<>(); 70 segmentAsNumbers = new ArrayList<>();
71 - segmentAsNumbers.add((long) 10); 71 + segmentAsNumbers.add(10L);
72 - segmentAsNumbers.add((long) 11); 72 + segmentAsNumbers.add(11L);
73 - segmentAsNumbers.add((long) 12); 73 + segmentAsNumbers.add(12L);
74 pathSegment = 74 pathSegment =
75 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers); 75 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers);
76 pathSegments.add(pathSegment); 76 pathSegments.add(pathSegment);
...@@ -176,36 +176,36 @@ public class AsPathTest { ...@@ -176,36 +176,36 @@ public class AsPathTest {
176 176
177 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_CONFED_SEQUENCE; 177 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_CONFED_SEQUENCE;
178 segmentAsNumbers = new ArrayList<>(); 178 segmentAsNumbers = new ArrayList<>();
179 - segmentAsNumbers.add((long) 1); 179 + segmentAsNumbers.add(1L);
180 - segmentAsNumbers.add((long) 2); 180 + segmentAsNumbers.add(2L);
181 - segmentAsNumbers.add((long) 3); 181 + segmentAsNumbers.add(3L);
182 pathSegment = 182 pathSegment =
183 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers); 183 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers);
184 pathSegments.add(pathSegment); 184 pathSegments.add(pathSegment);
185 // 185 //
186 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_CONFED_SET; 186 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_CONFED_SET;
187 segmentAsNumbers = new ArrayList<>(); 187 segmentAsNumbers = new ArrayList<>();
188 - segmentAsNumbers.add((long) 4); 188 + segmentAsNumbers.add(4L);
189 - segmentAsNumbers.add((long) 5); 189 + segmentAsNumbers.add(5L);
190 - segmentAsNumbers.add((long) 6); 190 + segmentAsNumbers.add(6L);
191 pathSegment = 191 pathSegment =
192 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers); 192 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers);
193 pathSegments.add(pathSegment); 193 pathSegments.add(pathSegment);
194 // 194 //
195 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE; 195 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE;
196 segmentAsNumbers = new ArrayList<>(); 196 segmentAsNumbers = new ArrayList<>();
197 - segmentAsNumbers.add((long) 7); 197 + segmentAsNumbers.add(7L);
198 - segmentAsNumbers.add((long) 8); 198 + segmentAsNumbers.add(8L);
199 - segmentAsNumbers.add((long) 9); 199 + segmentAsNumbers.add(9L);
200 pathSegment = 200 pathSegment =
201 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers); 201 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers);
202 pathSegments.add(pathSegment); 202 pathSegments.add(pathSegment);
203 // 203 //
204 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SET; 204 pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SET;
205 segmentAsNumbers = new ArrayList<>(); 205 segmentAsNumbers = new ArrayList<>();
206 - segmentAsNumbers.add((long) 10); 206 + segmentAsNumbers.add(10L);
207 - segmentAsNumbers.add((long) 111); // Different 207 + segmentAsNumbers.add(111L); // Different
208 - segmentAsNumbers.add((long) 12); 208 + segmentAsNumbers.add(12L);
209 pathSegment = 209 pathSegment =
210 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers); 210 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers);
211 pathSegments.add(pathSegment); 211 pathSegments.add(pathSegment);
......
...@@ -99,18 +99,18 @@ public class BgpRouteEntryTest { ...@@ -99,18 +99,18 @@ public class BgpRouteEntryTest {
99 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>(); 99 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>();
100 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE; 100 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE;
101 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>(); 101 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>();
102 - segmentAsNumbers1.add((long) 1); 102 + segmentAsNumbers1.add(1L);
103 - segmentAsNumbers1.add((long) 2); 103 + segmentAsNumbers1.add(2L);
104 - segmentAsNumbers1.add((long) 3); 104 + segmentAsNumbers1.add(3L);
105 BgpRouteEntry.PathSegment pathSegment1 = 105 BgpRouteEntry.PathSegment pathSegment1 =
106 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1); 106 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1);
107 pathSegments.add(pathSegment1); 107 pathSegments.add(pathSegment1);
108 // 108 //
109 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SET; 109 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SET;
110 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>(); 110 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>();
111 - segmentAsNumbers2.add((long) 4); 111 + segmentAsNumbers2.add(4L);
112 - segmentAsNumbers2.add((long) 5); 112 + segmentAsNumbers2.add(5L);
113 - segmentAsNumbers2.add((long) 6); 113 + segmentAsNumbers2.add(6L);
114 BgpRouteEntry.PathSegment pathSegment2 = 114 BgpRouteEntry.PathSegment pathSegment2 =
115 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2); 115 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2);
116 pathSegments.add(pathSegment2); 116 pathSegments.add(pathSegment2);
...@@ -191,18 +191,18 @@ public class BgpRouteEntryTest { ...@@ -191,18 +191,18 @@ public class BgpRouteEntryTest {
191 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>(); 191 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>();
192 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE; 192 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE;
193 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>(); 193 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>();
194 - segmentAsNumbers1.add((long) 1); 194 + segmentAsNumbers1.add(1L);
195 - segmentAsNumbers1.add((long) 2); 195 + segmentAsNumbers1.add(2L);
196 - segmentAsNumbers1.add((long) 3); 196 + segmentAsNumbers1.add(3L);
197 BgpRouteEntry.PathSegment pathSegment1 = 197 BgpRouteEntry.PathSegment pathSegment1 =
198 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1); 198 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1);
199 pathSegments.add(pathSegment1); 199 pathSegments.add(pathSegment1);
200 // 200 //
201 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SET; 201 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SET;
202 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>(); 202 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>();
203 - segmentAsNumbers2.add((long) 4); 203 + segmentAsNumbers2.add(4L);
204 - segmentAsNumbers2.add((long) 5); 204 + segmentAsNumbers2.add(5L);
205 - segmentAsNumbers2.add((long) 6); 205 + segmentAsNumbers2.add(6L);
206 BgpRouteEntry.PathSegment pathSegment2 = 206 BgpRouteEntry.PathSegment pathSegment2 =
207 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2); 207 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2);
208 pathSegments.add(pathSegment2); 208 pathSegments.add(pathSegment2);
...@@ -245,18 +245,18 @@ public class BgpRouteEntryTest { ...@@ -245,18 +245,18 @@ public class BgpRouteEntryTest {
245 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>(); 245 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>();
246 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SET; 246 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SET;
247 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>(); 247 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>();
248 - segmentAsNumbers1.add((long) 1); 248 + segmentAsNumbers1.add(1L);
249 - segmentAsNumbers1.add((long) 2); 249 + segmentAsNumbers1.add(2L);
250 - segmentAsNumbers1.add((long) 3); 250 + segmentAsNumbers1.add(3L);
251 BgpRouteEntry.PathSegment pathSegment1 = 251 BgpRouteEntry.PathSegment pathSegment1 =
252 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1); 252 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1);
253 pathSegments.add(pathSegment1); 253 pathSegments.add(pathSegment1);
254 // 254 //
255 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE; 255 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE;
256 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>(); 256 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>();
257 - segmentAsNumbers2.add((long) 4); 257 + segmentAsNumbers2.add(4L);
258 - segmentAsNumbers2.add((long) 5); 258 + segmentAsNumbers2.add(5L);
259 - segmentAsNumbers2.add((long) 6); 259 + segmentAsNumbers2.add(6L);
260 BgpRouteEntry.PathSegment pathSegment2 = 260 BgpRouteEntry.PathSegment pathSegment2 =
261 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2); 261 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2);
262 pathSegments.add(pathSegment2); 262 pathSegments.add(pathSegment2);
...@@ -293,7 +293,7 @@ public class BgpRouteEntryTest { ...@@ -293,7 +293,7 @@ public class BgpRouteEntryTest {
293 // Get neighbor AS for non-local route 293 // Get neighbor AS for non-local route
294 // 294 //
295 BgpRouteEntry bgpRouteEntry = generateBgpRouteEntry(); 295 BgpRouteEntry bgpRouteEntry = generateBgpRouteEntry();
296 - assertThat(bgpRouteEntry.getNeighborAs(), is((long) 1)); 296 + assertThat(bgpRouteEntry.getNeighborAs(), is(1L));
297 297
298 // 298 //
299 // Get neighbor AS for a local route 299 // Get neighbor AS for a local route
...@@ -355,18 +355,18 @@ public class BgpRouteEntryTest { ...@@ -355,18 +355,18 @@ public class BgpRouteEntryTest {
355 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>(); 355 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>();
356 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE; 356 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE;
357 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>(); 357 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>();
358 - segmentAsNumbers1.add((long) 1); 358 + segmentAsNumbers1.add(1L);
359 - segmentAsNumbers1.add((long) 2); 359 + segmentAsNumbers1.add(2L);
360 - segmentAsNumbers1.add((long) 3); 360 + segmentAsNumbers1.add(3L);
361 BgpRouteEntry.PathSegment pathSegment1 = 361 BgpRouteEntry.PathSegment pathSegment1 =
362 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1); 362 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1);
363 pathSegments.add(pathSegment1); 363 pathSegments.add(pathSegment1);
364 // 364 //
365 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SET; 365 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SET;
366 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>(); 366 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>();
367 - segmentAsNumbers2.add((long) 4); 367 + segmentAsNumbers2.add(4L);
368 - segmentAsNumbers2.add((long) 5); 368 + segmentAsNumbers2.add(5L);
369 - segmentAsNumbers2.add((long) 6); 369 + segmentAsNumbers2.add(6L);
370 BgpRouteEntry.PathSegment pathSegment2 = 370 BgpRouteEntry.PathSegment pathSegment2 =
371 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2); 371 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2);
372 pathSegments.add(pathSegment2); 372 pathSegments.add(pathSegment2);
...@@ -474,18 +474,18 @@ public class BgpRouteEntryTest { ...@@ -474,18 +474,18 @@ public class BgpRouteEntryTest {
474 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>(); 474 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>();
475 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE; 475 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE;
476 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>(); 476 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>();
477 - segmentAsNumbers1.add((long) 1); 477 + segmentAsNumbers1.add(1L);
478 - segmentAsNumbers1.add((long) 2); 478 + segmentAsNumbers1.add(2L);
479 - segmentAsNumbers1.add((long) 3); 479 + segmentAsNumbers1.add(3L);
480 BgpRouteEntry.PathSegment pathSegment1 = 480 BgpRouteEntry.PathSegment pathSegment1 =
481 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1); 481 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1);
482 pathSegments.add(pathSegment1); 482 pathSegments.add(pathSegment1);
483 // 483 //
484 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SET; 484 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SET;
485 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>(); 485 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>();
486 - segmentAsNumbers2.add((long) 4); 486 + segmentAsNumbers2.add(4L);
487 - segmentAsNumbers2.add((long) 5); 487 + segmentAsNumbers2.add(5L);
488 - segmentAsNumbers2.add((long) 6); 488 + segmentAsNumbers2.add(6L);
489 BgpRouteEntry.PathSegment pathSegment2 = 489 BgpRouteEntry.PathSegment pathSegment2 =
490 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2); 490 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2);
491 pathSegments.add(pathSegment2); 491 pathSegments.add(pathSegment2);
......
...@@ -289,9 +289,9 @@ public class BgpSessionManagerTest { ...@@ -289,9 +289,9 @@ public class BgpSessionManagerTest {
289 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>(); 289 ArrayList<BgpRouteEntry.PathSegment> pathSegments = new ArrayList<>();
290 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE; 290 byte pathSegmentType1 = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE;
291 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>(); 291 ArrayList<Long> segmentAsNumbers1 = new ArrayList<>();
292 - segmentAsNumbers1.add((long) 65010); 292 + segmentAsNumbers1.add(65010L);
293 - segmentAsNumbers1.add((long) 65020); 293 + segmentAsNumbers1.add(65020L);
294 - segmentAsNumbers1.add((long) 65030); 294 + segmentAsNumbers1.add(65030L);
295 BgpRouteEntry.PathSegment pathSegment1 = 295 BgpRouteEntry.PathSegment pathSegment1 =
296 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1); 296 new BgpRouteEntry.PathSegment(pathSegmentType1, segmentAsNumbers1);
297 pathSegments.add(pathSegment1); 297 pathSegments.add(pathSegment1);
...@@ -299,9 +299,9 @@ public class BgpSessionManagerTest { ...@@ -299,9 +299,9 @@ public class BgpSessionManagerTest {
299 // 299 //
300 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SET; 300 byte pathSegmentType2 = (byte) BgpConstants.Update.AsPath.AS_SET;
301 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>(); 301 ArrayList<Long> segmentAsNumbers2 = new ArrayList<>();
302 - segmentAsNumbers2.add((long) 65041); 302 + segmentAsNumbers2.add(65041L);
303 - segmentAsNumbers2.add((long) 65042); 303 + segmentAsNumbers2.add(65042L);
304 - segmentAsNumbers2.add((long) 65043); 304 + segmentAsNumbers2.add(65043L);
305 BgpRouteEntry.PathSegment pathSegment2 = 305 BgpRouteEntry.PathSegment pathSegment2 =
306 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2); 306 new BgpRouteEntry.PathSegment(pathSegmentType2, segmentAsNumbers2);
307 pathSegments.add(pathSegment2); 307 pathSegments.add(pathSegment2);
......
...@@ -36,9 +36,9 @@ public class PathSegmentTest { ...@@ -36,9 +36,9 @@ public class PathSegmentTest {
36 private BgpRouteEntry.PathSegment generatePathSegment() { 36 private BgpRouteEntry.PathSegment generatePathSegment() {
37 byte pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE; 37 byte pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE;
38 ArrayList<Long> segmentAsNumbers = new ArrayList<>(); 38 ArrayList<Long> segmentAsNumbers = new ArrayList<>();
39 - segmentAsNumbers.add((long) 1); 39 + segmentAsNumbers.add(1L);
40 - segmentAsNumbers.add((long) 2); 40 + segmentAsNumbers.add(2L);
41 - segmentAsNumbers.add((long) 3); 41 + segmentAsNumbers.add(3L);
42 BgpRouteEntry.PathSegment pathSegment = 42 BgpRouteEntry.PathSegment pathSegment =
43 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers); 43 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers);
44 44
...@@ -75,9 +75,9 @@ public class PathSegmentTest { ...@@ -75,9 +75,9 @@ public class PathSegmentTest {
75 // Create the fields to compare against 75 // Create the fields to compare against
76 byte pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE; 76 byte pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE;
77 ArrayList<Long> segmentAsNumbers = new ArrayList<>(); 77 ArrayList<Long> segmentAsNumbers = new ArrayList<>();
78 - segmentAsNumbers.add((long) 1); 78 + segmentAsNumbers.add(1L);
79 - segmentAsNumbers.add((long) 2); 79 + segmentAsNumbers.add(2L);
80 - segmentAsNumbers.add((long) 3); 80 + segmentAsNumbers.add(3L);
81 81
82 // Generate the entry to test 82 // Generate the entry to test
83 BgpRouteEntry.PathSegment pathSegment = generatePathSegment(); 83 BgpRouteEntry.PathSegment pathSegment = generatePathSegment();
...@@ -107,9 +107,9 @@ public class PathSegmentTest { ...@@ -107,9 +107,9 @@ public class PathSegmentTest {
107 // Setup Path Segment 2 107 // Setup Path Segment 2
108 byte pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE; 108 byte pathSegmentType = (byte) BgpConstants.Update.AsPath.AS_SEQUENCE;
109 ArrayList<Long> segmentAsNumbers = new ArrayList<>(); 109 ArrayList<Long> segmentAsNumbers = new ArrayList<>();
110 - segmentAsNumbers.add((long) 1); 110 + segmentAsNumbers.add(1L);
111 - segmentAsNumbers.add((long) 22); // Different 111 + segmentAsNumbers.add(22L); // Different
112 - segmentAsNumbers.add((long) 3); 112 + segmentAsNumbers.add(3L);
113 // 113 //
114 BgpRouteEntry.PathSegment pathSegment2 = 114 BgpRouteEntry.PathSegment pathSegment2 =
115 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers); 115 new BgpRouteEntry.PathSegment(pathSegmentType, segmentAsNumbers);
......
...@@ -150,7 +150,7 @@ public class LLDPLinkProviderTest { ...@@ -150,7 +150,7 @@ public class LLDPLinkProviderTest {
150 deviceListener.event(portEvent(DeviceEvent.Type.PORT_ADDED, DID1, port(DID1, 3, true))); 150 deviceListener.event(portEvent(DeviceEvent.Type.PORT_ADDED, DID1, port(DID1, 3, true)));
151 151
152 assertTrue("Port not added to discoverer", 152 assertTrue("Port not added to discoverer",
153 - provider.discoverers.get(DID1).containsPort((long) 3)); 153 + provider.discoverers.get(DID1).containsPort(3L));
154 } 154 }
155 155
156 @Test 156 @Test
...@@ -162,8 +162,8 @@ public class LLDPLinkProviderTest { ...@@ -162,8 +162,8 @@ public class LLDPLinkProviderTest {
162 162
163 163
164 assertFalse("Port added to discoverer", 164 assertFalse("Port added to discoverer",
165 - provider.discoverers.get(DID1).containsPort((long) 1)); 165 + provider.discoverers.get(DID1).containsPort(1L));
166 - assertTrue("Port is not gone.", vanishedPort((long) 1)); 166 + assertTrue("Port is not gone.", vanishedPort(1L));
167 } 167 }
168 168
169 @Test 169 @Test
......
...@@ -125,7 +125,7 @@ public abstract class FlowModBuilder { ...@@ -125,7 +125,7 @@ public abstract class FlowModBuilder {
125 this.factory = factory; 125 this.factory = factory;
126 this.flowRule = flowRule; 126 this.flowRule = flowRule;
127 this.selector = flowRule.selector(); 127 this.selector = flowRule.selector();
128 - this.xid = xid.orElse((long) 0); 128 + this.xid = xid.orElse(0L);
129 129
130 } 130 }
131 131
......