Bump mdsal to 5.0.2

This bumps mdsal to 5.0.2 as part of Magnesium MRI.

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

diff --git a/benchmark/api/pom.xml b/benchmark/api/pom.xml
index 6c82382d6a56765f6103dfe3f46919882ad4e548..7530e26064566212167872fb9961b17f1037064d 100644 (file)
--- a/benchmark/api/pom.xml
+++ b/benchmark/api/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/benchmark/dsbenchmark/pom.xml b/benchmark/dsbenchmark/pom.xml
index 5b297dd6f1c31288b78a6fe0bb27538c973ad242..19d97e307444f0effa55ad67c8811c1e57d5e613 100644 (file)
--- a/benchmark/dsbenchmark/pom.xml
+++ b/benchmark/dsbenchmark/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>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/benchmark/ntfbenchmark/pom.xml b/benchmark/ntfbenchmark/pom.xml
index 39f5b5862a0f0b7c077d11b07fd3f20f36517291..0c4a53cb90e1b4d9611e3c556edf56863dada89e 100644 (file)
--- a/benchmark/ntfbenchmark/pom.xml
+++ b/benchmark/ntfbenchmark/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>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/benchmark/rpcbenchmark/pom.xml b/benchmark/rpcbenchmark/pom.xml
index 966ce5fa8682b695d626e7c1d6f2ba2aad55966e..deb8c6b42ca3c7016fde069c95d989f98e3ee493 100644 (file)
--- a/benchmark/rpcbenchmark/pom.xml
+++ b/benchmark/rpcbenchmark/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>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/benchmark/odl-benchmark-api/pom.xml
index 06941863ea730a4ac4fcc177f494247d0dc7141c..4fdaacd0f5c509c68545ca3bae9c075169418f5d 100644 (file)
--- a/features/benchmark/odl-benchmark-api/pom.xml
+++ b/features/benchmark/odl-benchmark-api/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>4.0.6</version>
+            <version>5.0.2</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/mdsal/odl-clustering-test-app/pom.xml
index 79d8ca50f49b41ab106a9746fca47ec3700d4b51..17a490a465d34a55402b509538813437685b6c65 100644 (file)
--- a/features/mdsal/odl-clustering-test-app/pom.xml
+++ b/features/mdsal/odl-clustering-test-app/pom.xml
@@ -26,7 +26,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features/mdsal/odl-controller-binding-api/pom.xml b/features/mdsal/odl-controller-binding-api/pom.xml
index 9de5f56ea352e4243a3adb6e1741b6e186ac1382..ef855f734a73925613f1d904b4dc67f3105b9f35 100644 (file)
--- a/features/mdsal/odl-controller-binding-api/pom.xml
+++ b/features/mdsal/odl-controller-binding-api/pom.xml
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/mdsal/odl-controller-binding-api/src/main/feature/feature.xml b/features/mdsal/odl-controller-binding-api/src/main/feature/feature.xml
index 4557829b98d869028834d82a61409df1fe939c30..815e9a5100e1bfa4ea466e139ca1006f89beddc5 100644 (file)
--- a/features/mdsal/odl-controller-binding-api/src/main/feature/feature.xml
+++ b/features/mdsal/odl-controller-binding-api/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-binding-api-${project.version}">
     <feature name="odl-controller-binding-api" version="${project.version}">
-        <feature version="[4,5)">odl-mdsal-binding-api</feature>
+        <feature version="[5,6)">odl-mdsal-binding-api</feature>
     </feature>
 </features>

diff --git a/features/mdsal/odl-controller-dom-api/pom.xml b/features/mdsal/odl-controller-dom-api/pom.xml
index 3560bda655dbb61bad38f9a9b37e88d97849e576..4fec589e46a27a6cba790dbac628fca9d5203649 100644 (file)
--- a/features/mdsal/odl-controller-dom-api/pom.xml
+++ b/features/mdsal/odl-controller-dom-api/pom.xml
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml b/features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml
index f3f8161fca6e08b47a417fc7f29e393b4ab36236..b6c03f124b6498be6fb21f6a94ee64024a92ce77 100644 (file)
--- a/features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml
+++ b/features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-dom-api-${project.version}">
     <feature name="odl-controller-dom-api" version="${project.version}">
-        <feature version="[4,5)">odl-mdsal-dom-api</feature>
+        <feature version="[5,6)">odl-mdsal-dom-api</feature>
     </feature>
 </features>

diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml
index 5aa669d7919ac184b28e62fa8e22338ed757fcc2..5037ac01f3982824c6790653b1830e29379d2fbb 100644 (file)
--- a/features/mdsal/odl-controller-mdsal-common/pom.xml
+++ b/features/mdsal/odl-controller-mdsal-common/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml b/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml
index b01808ce9334aea9330a3265a820c21a1a4cf943..f8859f6be37a5046c8763a9eb267aeb069c3517e 100644 (file)
--- a/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml
+++ b/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-mdsal-common-${project.version}">
     <feature name="odl-controller-mdsal-common" version="${project.version}">
-        <feature version="[4,5)">odl-mdsal-common</feature>
-        <feature version="[4,5)">odl-mdsal-binding-runtime</feature>
+        <feature version="[5,6)">odl-mdsal-common</feature>
+        <feature version="[5,6)">odl-mdsal-binding-runtime</feature>
     </feature>
 </features>

diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml
index 3b0d22fe68d8bc4ad0baca17a4b17775ab2fb950..e2c04ef4def3961e0f0d5d911ba7a585ffa508f5 100644 (file)
--- a/features/mdsal/odl-controller-model-topology/pom.xml
+++ b/features/mdsal/odl-controller-model-topology/pom.xml
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 7dafb4d2eb3e1bd12426b3f3b93cf5b4e00639bd..da5b6dd97461a81429bb03320b7c99e87978d587 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -44,7 +44,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
index de892133973881fa6bb58ea86a4d0b05c2e0a0fe..af96237bfe9bb14203752e9cfec144d193354501 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
@@ -8,9 +8,9 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
     <feature name="odl-mdsal-broker-local" version="${project.version}">
-        <feature version="[4,5)">odl-mdsal-dom</feature>
-        <feature version="[4,5)">odl-mdsal-eos-binding</feature>
-        <feature version="[4,5)">odl-mdsal-eos-dom</feature>
-        <feature version="[4,5)">odl-mdsal-singleton-dom</feature>
+        <feature version="[5,6)">odl-mdsal-dom</feature>
+        <feature version="[5,6)">odl-mdsal-eos-binding</feature>
+        <feature version="[5,6)">odl-mdsal-eos-dom</feature>
+        <feature version="[5,6)">odl-mdsal-singleton-dom</feature>
     </feature>
 </features>

diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml
index c1721b05cd469fb6c6822482c8f7939a4b794559..9ae7e57f4a84bacead4d8e86f9208df8d41f1993 100644 (file)
--- a/features/mdsal/odl-mdsal-broker/pom.xml
+++ b/features/mdsal/odl-mdsal-broker/pom.xml
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml
index d6c13823492d1c06075190afd9b8db5324f7b020..68f4daa2f260f71465c2aa3f53b1b3e534e535d0 100644 (file)
--- a/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
     <feature name="odl-mdsal-broker" version="${project.version}">
-        <feature version="[4,5)">odl-mdsal-singleton-dom</feature>
-        <feature version="[4,5)">odl-mdsal-eos-binding</feature>
+        <feature version="[5,6)">odl-mdsal-singleton-dom</feature>
+        <feature version="[5,6)">odl-mdsal-eos-binding</feature>
     </feature>
 </features>

diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
index d07dd9da0a0be0145b4b4bed462d67f972ec0da6..dd551278495302705f142e5d93bdb771f82da247 100644 (file)
--- a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
+++ b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
@@ -36,7 +36,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
index 089d7683b80ec5953698552cc12d40736fbbf76c..b313b584d9bef23cecbf8d0652656d3bdf2d4bf1 100644 (file)
--- a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
@@ -10,9 +10,9 @@
     <feature name="odl-mdsal-distributed-datastore" version="${project.version}">
         <feature version="[6,7)">odl-apache-commons-text</feature>
         <feature version="[4,5)">odl-yangtools-codec</feature>
-        <feature version="[4,5)">odl-mdsal-eos-dom</feature>
-        <feature version="[4,5)">odl-mdsal-dom-broker</feature>
-        <feature version="[4.0.1,5)">odl-mdsal-binding-dom-adapter</feature>
+        <feature version="[5,6)">odl-mdsal-eos-dom</feature>
+        <feature version="[5,6)">odl-mdsal-dom-broker</feature>
+        <feature version="[5,6)">odl-mdsal-binding-dom-adapter</feature>
         <configfile finalname="configuration/initial/akka.conf">
             mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf
         </configfile>

diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml
index d14fa5a7691181963b541c8d3ff89080721097ce..252537a726e943cae4fc79783a36eec8635e2228 100644 (file)
--- a/features/mdsal/odl-mdsal-model-inventory/pom.xml
+++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml
index 5564292b3d6ef564f23ad1178beaffc6effaf743..b6c25c3abc35c6f4981dc4f3bc096b19db55cc0a 100644 (file)
--- a/features/mdsal/odl-message-bus-collector/pom.xml
+++ b/features/mdsal/odl-message-bus-collector/pom.xml
@@ -37,7 +37,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml
index e526bddfa6ea9905ffe2926fd8d77a5d3ca548b7..6331db4052e4ceccc738e5dad01b455841aacfbb 100644 (file)
--- a/features/mdsal/odl-toaster/pom.xml
+++ b/features/mdsal/odl-toaster/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-runtime</artifactId>
-            <version>4.0.6</version>
+            <version>5.0.2</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 52f70c591b928c2661271aa6b26a4e8f8c9a7256..0fc6257a5427847650e9d9a5803ea86387b9b707 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>features-mdsal</artifactId>
-      <version>4.0.6</version>
+      <version>5.0.2</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index e672ef168b01586f98515a8194a07dc0bb8abf99..a6980ae488e248f0c82cd9b4d23d8ce22ff8c459 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.6</version>
+        <version>5.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 140f770cd93b5be43a5fb6ff183bc7a0dda262d4..034eef99fdf31aa4e7ac45640bdfaab79f06ed87 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml
index 4c646b93b805fe3b4f02180e98712d82580f59aa..d7e51df9434396e7129cfc5c10359df8ed4c12bd 100644 (file)
--- a/opendaylight/md-sal/parent/pom.xml
+++ b/opendaylight/md-sal/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java
index e0a332f593f06d6d147cf6446e818f7e9f55e958..cd4e4101d972c8b2872f20a0d1b7b574c554b737 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java
@@ -12,16 +12,12 @@ import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.concurrent.ExecutorService;
-import javassist.ClassPool;
 
 @Beta
 @Deprecated
 public class BindingBrokerTestFactory {
-
-    private static final ClassPool CLASS_POOL = ClassPool.getDefault();
     private boolean startWithParsedSchema = true;
     private ExecutorService executor;
-    private ClassPool classPool;
 
 
     public boolean isStartWithParsedSchema() {
@@ -45,18 +41,4 @@ public class BindingBrokerTestFactory {
         ListeningExecutorService listenableExecutor = MoreExecutors.listeningDecorator(executor);
         return new BindingTestContext(listenableExecutor, startWithParsedSchema);
     }
-
-    @Deprecated
-    public ClassPool getClassPool() {
-        if (classPool == null) {
-            return CLASS_POOL;
-        }
-
-        return classPool;
-    }
-
-    @Deprecated
-    public void setClassPool(final ClassPool classPool) {
-        this.classPool = classPool;
-    }
 }

diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index 21cf3df976294d28cf70ecd8fb0951722d524056..3a7ea724855a19bbc1785d3792158f1816bcfaa9 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -25,7 +25,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.6</version>
+        <version>5.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java
index a6f154bfcde7282b7b0bdb6c0d5a7166bdbd3238..1daef6eeb1c5ed386f45af91c584830aff31c83f 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java
@@ -138,16 +138,16 @@ public class CarProvider implements CarService {
         final long inputCount;
 
         // If rate is not provided, or given as zero, then just return.
-        if (input.getRate() == null || input.getRate() == 0) {
+        if (input.getRate() == null || input.getRate().toJava() == 0) {
             LOG_PURCHASE_CAR.info("Exiting stress test as no rate is given.");
             return Futures.immediateFuture(RpcResultBuilder.<StressTestOutput>failed()
                     .withError(ErrorType.PROTOCOL, "invalid rate")
                     .build());
         }
 
-        inputRate = input.getRate();
+        inputRate = input.getRate().toJava();
         if (input.getCount() != null) {
-            inputCount = input.getCount();
+            inputCount = input.getCount().toJava();
         } else {
             inputCount = 0;
         }

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java
index 8c4e9716f054de39b58324eb4a3245899d7d8b6a..f4fb21b6ddcba65cd7ff9d8db579e197548e893b 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/MdsalLowLevelTestProvider.java
@@ -258,7 +258,7 @@ public class MdsalLowLevelTestProvider implements OdlMdsalLowlevelControlService
         LOG.info("In startPublishNotifications - input: {}", input);
 
         final PublishNotificationsTask task = new PublishNotificationsTask(notificationPublishService, input.getId(),
-                input.getSeconds(), input.getNotificationsPerSecond());
+                input.getSeconds().toJava(), input.getNotificationsPerSecond().toJava());
 
         publishNotificationsTasks.put(input.getId(), task);
 

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/AbstractTransactionHandler.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/AbstractTransactionHandler.java
index 1a0f39e6936dec0152da35cb7f96ee8e832be959..de4f3efa03b3b9da5798793494f06c060be4ae28 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/AbstractTransactionHandler.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/AbstractTransactionHandler.java
@@ -81,8 +81,8 @@ abstract class AbstractTransactionHandler {
     private volatile State state;
 
     AbstractTransactionHandler(final TransactionsParams params) {
-        runtimeNanos = TimeUnit.SECONDS.toNanos(params.getSeconds());
-        delayNanos = SECOND_AS_NANO / params.getTransactionsPerSecond();
+        runtimeNanos = TimeUnit.SECONDS.toNanos(params.getSeconds().toJava());
+        delayNanos = SECOND_AS_NANO / params.getTransactionsPerSecond().toJava();
     }
 
     final synchronized void doStart() {

diff --git a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java
index 4b94182d6dede10ee74e5e894eca5f3be92a7a35..ab91aaba3a2941564bd4e3c7818bd44e576fa83f 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java
+++ b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java
@@ -66,6 +66,7 @@ import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -184,9 +185,9 @@ public class OpendaylightToaster extends AbstractMXBean
                         + "old Toaster: {}, new Toaster: {}", change.getRootPath().getRootIdentifier(),
                         oldToaster, newToaster);
 
-                Long darkness = newToaster.getDarknessFactor();
+                Uint32 darkness = newToaster.getDarknessFactor();
                 if (darkness != null) {
-                    darknessFactor.set(darkness);
+                    darknessFactor.set(darkness.toJava());
                 }
             } else if (rootNode.getModificationType() == DELETE) {
                 LOG.info("onDataTreeChanged - Toaster config with path {} was deleted: old Toaster: {}",
@@ -218,7 +219,7 @@ public class OpendaylightToaster extends AbstractMXBean
 
         final SettableFuture<RpcResult<MakeToastOutput>> futureResult = SettableFuture.create();
 
-        checkStatusAndMakeToast(input, futureResult, toasterAppConfig.getMaxMakeToastTries());
+        checkStatusAndMakeToast(input, futureResult, toasterAppConfig.getMaxMakeToastTries().toJava());
 
         return futureResult;
     }
@@ -323,7 +324,7 @@ public class OpendaylightToaster extends AbstractMXBean
     public ListenableFuture<RpcResult<RestockToasterOutput>> restockToaster(final RestockToasterInput input) {
         LOG.info("restockToaster: {}", input);
 
-        amountOfBreadInStock.set(input.getAmountOfBreadToStock());
+        amountOfBreadInStock.set(input.getAmountOfBreadToStock().toJava());
 
         if (amountOfBreadInStock.get() > 0) {
             ToasterRestocked reStockedNotification = new ToasterRestockedBuilder()
@@ -398,7 +399,8 @@ public class OpendaylightToaster extends AbstractMXBean
         public Void call() {
             try {
                 // make toast just sleeps for n seconds per doneness level.
-                Thread.sleep(OpendaylightToaster.this.darknessFactor.get() * toastRequest.getToasterDoneness());
+                Thread.sleep(OpendaylightToaster.this.darknessFactor.get()
+                        * toastRequest.getToasterDoneness().toJava());
 
             } catch (InterruptedException e) {
                 LOG.info("Interrupted while making the toast");

diff --git a/opendaylight/model/model-inventory/pom.xml b/opendaylight/model/model-inventory/pom.xml
index dea7718a5f2fc0c32f289de319f6a5e6b36b3786..bcbe93c3b0ec7bd84172f6f3fef58b0d0202ee82 100644 (file)
--- a/opendaylight/model/model-inventory/pom.xml
+++ b/opendaylight/model/model-inventory/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>4.0.6</version>
+        <version>5.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/model/model-topology/pom.xml b/opendaylight/model/model-topology/pom.xml
index ad038b77ff17358d7505122f6e72aa01ab808316..1b8fc12e55b470c65d92788d2ec1d19622c039b1 100644 (file)
--- a/opendaylight/model/model-topology/pom.xml
+++ b/opendaylight/model/model-topology/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>4.0.6</version>
+        <version>5.0.2</version>
         <relativePath/>
     </parent>