Bump upstreams

Adopt:
- odparent-13.0.3
- infrautils-6.0.1
- yangtools-11.0.0
- mdsal-12.0.0
- controller-8.0.0
- aaa-0.18.0
- netconf-6.0.0

Change-Id: I3565609227c85dad80b92eed98b605565a741992
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 2a6e26281e8bb8b3abdd1269c0fd25a87c118729..15f68d8422c49b7637f912c5797f068be0fee5c7 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index fdc4593d8152d3be86f1f29721a24f34c79959e6..bde6013bbe5bbb751121db1e52154a9ed6d4f0ba 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,7 +15,7 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 
@@ -45,14 +45,14 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>11.0.7</version>
+        <version>12.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>7.0.4</version>
+        <version>8.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml
index 1d7cdfb388947f4ef6d297b32a7fd2e1c20c5a15..daa76048cbc198d2649f3194efe404954921887d 100644 (file)
--- a/features/features-lispflowmapping/pom.xml
+++ b/features/features-lispflowmapping/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml
index 98967ffb98bc1e25ca747057091381b064a6001a..171dd892be8c937bc4d4d2f94426f50dc4c8ef71 100644 (file)
--- a/features/odl-lispflowmapping-inmemorydb/pom.xml
+++ b/features/odl-lispflowmapping-inmemorydb/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>7.0.4</version>
+        <version>8.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml
index 8310e7cd5b6c63584dfba981fbb7b60272e8d97d..d791937115ba7141f17d5eeb609dfa286c39b48b 100644 (file)
--- a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml
+++ b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml
@@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-inmemorydb">
     <feature name="odl-lispflowmapping-inmemorydb">
-        <feature version="[7,8)">odl-mdsal-broker</feature>
+        <feature version="[8,9)">odl-mdsal-broker</feature>
     </feature>
 </features>

diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
index 83b02b3e71fa94229f62751177a8090e2cf1e8c0..715bb5c682ad166e105885e2dbf32bda2f92d187 100644 (file)
--- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml
index 9abe935bb7f0fff9457e1e90182424fea5f17233..15908de5681ed87b790f31340b94f116223d76e3 100644 (file)
--- a/features/odl-lispflowmapping-mappingservice/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>odl-restconf</artifactId>
-      <version>5.0.4</version>
+      <version>6.0.0</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>

diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml
index 60324a2685adc81d760b255937c0d965e43c7a45..aa201ab75c15f96c9872574884c9b83da50b272b 100644 (file)
--- a/features/odl-lispflowmapping-models/pom.xml
+++ b/features/odl-lispflowmapping-models/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>11.0.7</version>
+        <version>12.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/odl-lispflowmapping-models/src/main/feature/feature.xml b/features/odl-lispflowmapping-models/src/main/feature/feature.xml
index b2828906c90ca1fa2e32055a93daa29b18e00ae3..844fd90839499324ce365790a950d0b16543529e 100644 (file)
--- a/features/odl-lispflowmapping-models/src/main/feature/feature.xml
+++ b/features/odl-lispflowmapping-models/src/main/feature/feature.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-models">
     <feature name="odl-lispflowmapping-models">
-        <feature version="[12,13)">odl-apache-commons-lang3</feature>
-        <feature version="[11,12)">odl-mdsal-model-rfc6991</feature>
+        <feature version="[13,14)">odl-apache-commons-lang3</feature>
+        <feature version="[12,13)">odl-mdsal-model-rfc6991</feature>
     </feature>
 </features>

diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml
index 0bdc6a83f0ff84e9d855ea5c47558e1a52d7f90d..72fe7677216de06227199a72daec458c5950b6f8 100644 (file)
--- a/features/odl-lispflowmapping-msmr/pom.xml
+++ b/features/odl-lispflowmapping-msmr/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml
index 54a2bfec51b1a4f77182ea5768ee723473166735..8f4a872695fc40dc3b01c75dae4e0b90ff06520e 100644 (file)
--- a/features/odl-lispflowmapping-southbound/pom.xml
+++ b/features/odl-lispflowmapping-southbound/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 
@@ -28,14 +28,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>odl-restconf</artifactId>
-      <version>5.0.4</version>
+      <version>6.0.0</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>odl-mdsal-broker</artifactId>
-      <version>7.0.4</version>
+      <version>8.0.0</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>

diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
index 69651d811186d4cee40c6c957b9a16ec517896c7..1c00de49a8ddccd960a5d5ec64171ad2832ae3de 100644 (file)
--- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
+++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-southbound">
     <feature name="odl-lispflowmapping-southbound">
-        <feature version="[12,13)">odl-netty-4</feature>
-        <feature version="[7,8)">odl-mdsal-broker</feature>
+        <feature version="[12,14)">odl-netty-4</feature>
+        <feature version="[8,9)">odl-mdsal-broker</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 8c7d0013ba305f604265dc2831f1cf7dac6dcd58..dacf4f1d0dfaed23cb78ec848e0a95ad8ac24eda 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index df629c238f4b65afdfbf1cf008d6c41029dee0aa..1d5adfe5a5b50940946c9d07c6e365dff005793f 100644 (file)
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>7.0.4</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml
index d94521a900ddec86d435d5049ed42030804cab66..7b1668fa5c9e974c01583eb2b4f790bf22b3f150 100644 (file)
--- a/lispflowmapping-karaf/pom.xml
+++ b/lispflowmapping-karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index db199566f098b46e9e449b9aa6c31af6205bb445..609452b0c4e1822b43576c224f2e1e4126f70877 100644 (file)
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>11.0.7</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml
index 44b2c2d33ecfcfc2ae64cc95445cf2ed2ec30283..6d4538b5f09b4b18b0182ebfa6aaa43fc200fe91 100644 (file)
--- a/mappingservice/dsbackend/pom.xml
+++ b/mappingservice/dsbackend/pom.xml
@@ -31,6 +31,11 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.lisp-proto</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-api</artifactId>

diff --git a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java
index e3758080941a80694da2bf91f73222587c619ed9..93375c4cd7453ab526957f0b10b80791b6a8b118 100644 (file)
--- a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java
+++ b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java
@@ -286,7 +286,7 @@ public class DataStoreBackEnd implements TransactionChainListener {
         try {
             Optional<U> optionalDataObject = readFuture.get();
             if (optionalDataObject != null && optionalDataObject.isPresent()) {
-                return optionalDataObject.get();
+                return optionalDataObject.orElseThrow();
             } else {
                 LOG.debug("{}: Failed to read", Thread.currentThread().getStackTrace()[1]);
             }

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java
index 41495ec7f180b093e1dc7fd2eea3264cf9432651..00fc1360b1a8befa48ff9073a7c4ca4bdca6ca20 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java
@@ -9,8 +9,8 @@ package org.opendaylight.lispflowmapping.implementation.util;
 
 import static java.util.Objects.requireNonNull;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.Set;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.lispflowmapping.lisp.type.MappingData;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId;

diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml
index 65e586f8a60171b09f8e8d916844d61b66ebae81..0866a79babc6832f119fdbd1def42a975fd42492 100644 (file)
--- a/mappingservice/lisp-proto/pom.xml
+++ b/mappingservice/lisp-proto/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>11.0.7</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java
index 54609f5589cc10136dd5b3ae15cc59b6f9d6ed94..c1d983357caafdf33a9c220aa8aa9d96a26e4a2b 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java
@@ -108,7 +108,7 @@ public final class Ipv4BinarySerializer extends LispAddressSerializer {
     private static Ipv4Address deserializeDataNonBinary(ByteBuffer buffer) {
         byte[] ipBuffer = new byte[4];
         buffer.get(ipBuffer);
-        return IetfInetUtil.INSTANCE.ipv4AddressFor(ipBuffer);
+        return IetfInetUtil.ipv4AddressFor(ipBuffer);
     }
 
     protected interface Length {

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java
index f69216ac2b310bf2300b34425504edcf07acddad..4ac25f82748e1bfbf57c57fb68b6b5c761ee7da7 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java
@@ -105,7 +105,7 @@ public final class Ipv4Serializer extends LispAddressSerializer {
     private static Ipv4Address deserializeData(ByteBuffer buffer) {
         byte[] ipBuffer = new byte[4];
         buffer.get(ipBuffer);
-        return IetfInetUtil.INSTANCE.ipv4AddressFor(ipBuffer);
+        return IetfInetUtil.ipv4AddressFor(ipBuffer);
     }
 
     protected interface Length {

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java
index 7f0bd3c07411f0c826076e31240d5ffc985896c8..76e0d53447ff699f4e53b2ecd229d32ed4fc34ec 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java
@@ -51,12 +51,12 @@ public final class MacSerializer extends LispAddressSerializer {
     @Override
     protected void serializeData(ByteBuffer buffer, LispAddress lispAddress) {
         Mac mac = (Mac) lispAddress.getAddress();
-        buffer.put(IetfYangUtil.INSTANCE.macAddressBytes(mac.getMac()));
+        buffer.put(IetfYangUtil.macAddressBytes(mac.getMac()));
     }
 
     @Override
     protected void serializeData(ByteBuffer buffer, SimpleAddress simpleAddress) {
-        buffer.put(IetfYangUtil.INSTANCE.macAddressBytes(simpleAddress.getMacAddress()));
+        buffer.put(IetfYangUtil.macAddressBytes(simpleAddress.getMacAddress()));
     }
 
     @Override
@@ -85,7 +85,7 @@ public final class MacSerializer extends LispAddressSerializer {
     private static MacAddress deserializeData(ByteBuffer buffer) {
         byte[] macBuffer = new byte[6];
         buffer.get(macBuffer);
-        return IetfYangUtil.INSTANCE.macAddressFor(macBuffer);
+        return IetfYangUtil.macAddressFor(macBuffer);
     }
 
     private interface Length {

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java
index f24b58965bfa8aa8e962f3795607882750c47fe2..f38856a4115c94e2eb068ec1e9639d0995b39677 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java
@@ -148,11 +148,11 @@ public final class LispAddressUtil {
         if (address instanceof Inet4Address) {
             return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
                     .rev151105.lisp.address.address.Ipv4Builder()
-                    .setIpv4(IetfInetUtil.INSTANCE.ipv4AddressFor(address)).build();
+                    .setIpv4(IetfInetUtil.ipv4AddressFor(address)).build();
         } else if (address instanceof Inet6Address) {
             return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
                     .rev151105.lisp.address.address.Ipv6Builder()
-                    .setIpv6(IetfInetUtil.INSTANCE.ipv6AddressFor(address)).build();
+                    .setIpv6(IetfInetUtil.ipv6AddressFor(address)).build();
         }
         return null;
     }
@@ -454,7 +454,7 @@ public final class LispAddressUtil {
     }
 
     public static Eid asIpv4PrefixEid(Ipv4Address addr, InstanceIdType vni) {
-        return toEid(new IpPrefix(IetfInetUtil.INSTANCE.ipv4PrefixFor(addr)), vni);
+        return toEid(new IpPrefix(IetfInetUtil.ipv4PrefixFor(addr)), vni);
     }
 
     public static Eid asIpv4PrefixEid(final String prefix, final InstanceIdType iiType) {
@@ -466,7 +466,7 @@ public final class LispAddressUtil {
         builder.setAddressType(Ipv4PrefixAfi.VALUE);
         builder.setVirtualNetworkId(eid.getVirtualNetworkId());
         builder.setAddress(new Ipv4PrefixBuilder().setIpv4Prefix(
-                IetfInetUtil.INSTANCE.ipv4PrefixFor(address, mask)).build());
+                IetfInetUtil.ipv4PrefixFor(address, mask)).build());
         return builder.build();
     }
 
@@ -529,7 +529,7 @@ public final class LispAddressUtil {
     }
 
     public static Eid asIpv6PrefixEid(Ipv6Address addr, InstanceIdType vni) {
-        return toEid(new IpPrefix(IetfInetUtil.INSTANCE.ipv6PrefixFor(addr)), vni);
+        return toEid(new IpPrefix(IetfInetUtil.ipv6PrefixFor(addr)), vni);
     }
 
     public static Eid asIpv6PrefixEid(Eid eid, Inet6Address address, short mask) {
@@ -537,7 +537,7 @@ public final class LispAddressUtil {
         builder.setAddressType(Ipv6PrefixAfi.VALUE);
         builder.setVirtualNetworkId(eid.getVirtualNetworkId());
         builder.setAddress(new Ipv6PrefixBuilder().setIpv6Prefix(
-                IetfInetUtil.INSTANCE.ipv6PrefixFor(address, mask)).build());
+                IetfInetUtil.ipv6PrefixFor(address, mask)).build());
         return builder.build();
     }
 
@@ -895,25 +895,25 @@ public final class LispAddressUtil {
 
     private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
             .lisp.address.address.Ipv4Prefix convertFromBinary(Ipv4PrefixBinary prefix) {
-        return new Ipv4PrefixBuilder().setIpv4Prefix(IetfInetUtil.INSTANCE.ipv4PrefixFor(
+        return new Ipv4PrefixBuilder().setIpv4Prefix(IetfInetUtil.ipv4PrefixFor(
                 prefix.getIpv4AddressBinary().getValue(),
                 prefix.getIpv4MaskLength().toJava())).build();
     }
 
     private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
             .lisp.address.address.Ipv6Prefix convertFromBinary(Ipv6PrefixBinary prefix) {
-        return new Ipv6PrefixBuilder().setIpv6Prefix(IetfInetUtil.INSTANCE.ipv6PrefixFor(
+        return new Ipv6PrefixBuilder().setIpv6Prefix(IetfInetUtil.ipv6PrefixFor(
                 prefix.getIpv6AddressBinary().getValue(),
                 prefix.getIpv6MaskLength().toJava())).build();
     }
 
     private static Ipv4 convertFromBinary(Ipv4Binary address) {
-        return new Ipv4Builder().setIpv4(IetfInetUtil.INSTANCE.ipv4AddressFor(address.getIpv4Binary().getValue()))
+        return new Ipv4Builder().setIpv4(IetfInetUtil.ipv4AddressFor(address.getIpv4Binary().getValue()))
                 .build();
     }
 
     private static Ipv6 convertFromBinary(Ipv6Binary address) {
-        return new Ipv6Builder().setIpv6(IetfInetUtil.INSTANCE.ipv6AddressFor(address.getIpv6Binary().getValue()))
+        return new Ipv6Builder().setIpv6(IetfInetUtil.ipv6AddressFor(address.getIpv6Binary().getValue()))
                 .build();
     }
 

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java
index 60219345c16614600226f780f7e81c8ae277619c..f2ecd098956319697b25be94fe24520be834393f 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java
@@ -173,7 +173,7 @@ public final class MaskUtil {
         short mask = Short.parseShort(prefix[1]);
 
         InetAddress normalizedAddress = normalizeIP(InetAddresses.forString(prefix[0]), mask);
-        return IetfInetUtil.INSTANCE.ipPrefixFor(normalizedAddress.getAddress(), mask);
+        return IetfInetUtil.ipPrefixFor(normalizedAddress.getAddress(), mask);
     }
 
     private static InetAddress normalizeIP(InetAddress address, int maskLength) throws UnknownHostException {

diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 9d7c0d53838aa05d3f6a3137ff20c55e90e9f3f2..4c43f7c5f7221f2e6991edb561f9e2bc7a9d4eb6 100644 (file)
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 
@@ -38,7 +38,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>11.0.7</version>
+        <version>12.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/cache/MapRegisterPartialDeserializer.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/cache/MapRegisterPartialDeserializer.java
index be6cfe6c91174e46338db07c6440ef1a167566c9..972b077fd78ea93c447cc587ed88e8514f8ae596 100644 (file)
--- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/cache/MapRegisterPartialDeserializer.java
+++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/cache/MapRegisterPartialDeserializer.java
@@ -167,7 +167,7 @@ public final class MapRegisterPartialDeserializer {
         final int eidPrefixAfi = ByteUtil.getUnsignedShort(buffer, startPositionOfEidPrefixAFI);
         Optional<Integer> eidPrefixLengthOpt = resolveEidPrefixAfi(eidPrefixAfi, buffer);
         if (eidPrefixLengthOpt.isPresent()) {
-            final byte[] eidPrefix = new byte[eidPrefixLengthOpt.get()];
+            final byte[] eidPrefix = new byte[eidPrefixLengthOpt.orElseThrow()];
             final int startPositionOfEidPrefix = startPositionOfEidPrefixAFI + NUM_OF_BYTES_EID_PREFIX_AFI;
             buffer.position(startPositionOfEidPrefix);
             buffer.get(eidPrefix);