Bump upstreams for 2022.09 Chlorine

[lispflowmapping.git] / mappingservice / implementation / src / test / java / org / opendaylight / lispflowmapping / implementation / MappingSystemTest.java

diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java
index cebcb93d5718386bf21d68f867cc21ad23afe2d1..f129a0e76b03f1152817e2144ef5f6e5be4760eb 100644 (file)
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java
@@ -19,6 +19,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.EnumMap;
 import java.util.List;
+import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -162,7 +163,7 @@ public class MappingSystemTest {
     /**
      * This method changes the lookup policy.
      */
-    private static void setLookupPolicy(IMappingService.LookupPolicy policy) throws NoSuchFieldException,
+    private static void setLookupPolicy(final IMappingService.LookupPolicy policy) throws NoSuchFieldException,
             IllegalAccessException {
         final Field lookupPolicy = ConfigIni.class.getDeclaredField("lookupPolicy");
         lookupPolicy.setAccessible(true);
@@ -182,7 +183,7 @@ public class MappingSystemTest {
         final Mapping mapping = new MappingBuilder()
                 .setEidUri(new EidUri("ipv4:" + IPV4_DST))
                 .setOrigin(MappingOrigin.Southbound)
-                .setSiteId(Lists.newArrayList(SITE_ID))
+                .setSiteId(Set.of(SITE_ID))
                 .setMappingRecord(mappingData.getRecord()).build();
 
         assertNull(mappingSystem.getMapping(EID_IPV4_SRC, EID_IPV4_DST));
@@ -354,7 +355,7 @@ public class MappingSystemTest {
         final Mapping mapping = new MappingBuilder()
                 .setEidUri(new EidUri("ipv4:" + IPV4_DST))
                 .setOrigin(MappingOrigin.Southbound)
-                .setSiteId(Lists.newArrayList(SITE_ID))
+                .setSiteId(Set.of(SITE_ID))
                 .setMappingRecord(mappingRecord).build();
 
         assertEquals(nbMappingData, mappingSystem.getMapping(EID_IPV4_SRC, EID_IPV4_DST));
@@ -594,7 +595,7 @@ public class MappingSystemTest {
                 .setEid(EID_IPV4_DST);
     }
 
-    private static ServicePath getDefaultServicePath(short index) {
+    private static ServicePath getDefaultServicePath(final short index) {
         org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
                 .service.path.ServicePathBuilder servicePathBuilder = new org.opendaylight.yang.gen.v1.urn.ietf.params
                 .xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.service.path.ServicePathBuilder();
@@ -620,7 +621,7 @@ public class MappingSystemTest {
 
         return new RlocBuilder()
                 .setAddress(explicitLocatorPath)
-                .setAddressType(ExplicitLocatorPathLcaf.class).build();
+                .setAddressType(ExplicitLocatorPathLcaf.VALUE).build();
     }
 
     private static Rloc getIpPrefixTypeRloc() {
@@ -630,6 +631,6 @@ public class MappingSystemTest {
 
         return new RlocBuilder()
                 .setAddress(address)
-                .setAddressType(Ipv4PrefixAfi.class).build();
+                .setAddressType(Ipv4PrefixAfi.VALUE).build();
     }
 }