Bump upstreams to snapshots 27/100827/7
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 26 Apr 2022 19:26:37 +0000 (21:26 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Wed, 27 Apr 2022 11:04:48 +0000 (13:04 +0200)
Adopt:
- odlparent-11.0.0-SNAPSHOT
- yangtools-9.0.0-SNAPSHOT
- mdsal-10.0.0-SNAPSHOT

Also adjust to identity mapping change by referencing .VALUE instead of
.class.

Change-Id: Idf2e4a845aa20ec029708a174e2787490170a927
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
50 files changed:
akka/pom.xml
akka/repackaged-akka-jar/pom.xml
artifacts/pom.xml
benchmark/pom.xml
bundle-parent/pom.xml
docs/pom.xml
features/features-controller-experimental/pom.xml
features/features-controller-testing/pom.xml
features/features-controller/pom.xml
features/odl-clustering-test-app/src/main/feature/feature.xml
features/odl-controller-blueprint/src/main/feature/feature.xml
features/odl-controller-broker-local/src/main/feature/feature.xml
features/odl-controller-exp-netty-config/src/main/feature/feature.xml
features/odl-controller-mdsal-common/src/main/feature/feature.xml
features/odl-mdsal-broker/src/main/feature/feature.xml
features/odl-mdsal-clustering-commons/src/main/feature/feature.xml
features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
features/odl-toaster/src/main/feature/feature.xml
features/pom.xml
features/single-feature-parent/pom.xml
jolokia/pom.xml
karaf/pom.xml
opendaylight/blueprint/pom.xml
opendaylight/config/netty-event-executor-config/pom.xml
opendaylight/config/netty-threadgroup-config/pom.xml
opendaylight/config/netty-timer-config/pom.xml
opendaylight/config/pom.xml
opendaylight/config/threadpool-config-api/pom.xml
opendaylight/config/threadpool-config-impl/pom.xml
opendaylight/md-sal/mdsal-it-base/pom.xml
opendaylight/md-sal/mdsal-it-parent/pom.xml
opendaylight/md-sal/parent/pom.xml
opendaylight/md-sal/pom.xml
opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AddShardReplicaCommand.java
opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/ChangeMemberVotingStatesForShardCommand.java
opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/GetShardRoleCommand.java
opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/LocateShardCommand.java
opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/MakeLeaderLocalCommand.java
opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/RemoveShardReplicaCommand.java
opendaylight/md-sal/sal-clustering-config/pom.xml
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java
opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
opendaylight/md-sal/samples/clustering-test-app/pom.xml
opendaylight/md-sal/samples/pom.xml
opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java
opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java
opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java
pom.xml

index 2331e54..2861c77 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 7e39964..7a6da32 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index fca5728..ea610b2 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index f70fe2c..4f710c7 100644 (file)
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index a95960d..d3c813d 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>dom-parent</artifactId>
-        <version>9.0.2</version>
+        <version>10.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index fa9b9a7..012cbc2 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <artifactId>org.osgi.framework</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <artifactId>org.osgi.service.component</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.metatype.annotations</artifactId>
         </dependency>
     </dependencies>
 
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.9/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/10.0.0/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/8.0.3/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/9.0.2/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/11.0.0-SNAPSHOT/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/9.0.0-SNAPSHOT/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/10.0.0-SNAPSHOT/</link>
                     </links>
                     <groups>
                         <group>
index 899dd25..d2d978e 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 265221a..257a919 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index df433e6..98302bf 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index e4abdff..e31d501 100644 (file)
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-clustering-test-app-${project.version}">
     <feature name="odl-clustering-test-app" version="${project.version}">
-        <feature version="[9,10)">odl-mdsal-model-rfc6991</feature>
+        <feature version="[10,11)">odl-mdsal-model-rfc6991</feature>
     </feature>
 </features>
index 4016e0c..e0e9c95 100644 (file)
@@ -8,10 +8,10 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-blueprint-${project.version}">
     <feature name="odl-controller-blueprint" version="${project.version}">
-        <feature version="[8,9)">odl-yangtools-codec</feature>
-        <feature version="[9,10)">odl-mdsal-binding-api</feature>
-        <feature version="[9,10)">odl-mdsal-binding-runtime</feature>
-        <feature version="[9,10)">odl-mdsal-dom-api</feature>
+        <feature version="[9,10)">odl-yangtools-codec</feature>
+        <feature version="[10,11)">odl-mdsal-binding-api</feature>
+        <feature version="[10,11)">odl-mdsal-binding-runtime</feature>
+        <feature version="[10,11)">odl-mdsal-dom-api</feature>
         <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${project.version}</bundle>
     </feature>
 </features>
index 0272cec..d5fe32c 100644 (file)
@@ -8,9 +8,9 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
     <feature name="odl-controller-broker-local" version="${project.version}">
-        <feature version="[9,10)">odl-mdsal-dom</feature>
-        <feature version="[9,10)">odl-mdsal-eos-binding</feature>
-        <feature version="[9,10)">odl-mdsal-eos-dom</feature>
-        <feature version="[9,10)">odl-mdsal-singleton-dom</feature>
+        <feature version="[10,11)">odl-mdsal-dom</feature>
+        <feature version="[10,11)">odl-mdsal-eos-binding</feature>
+        <feature version="[10,11)">odl-mdsal-eos-dom</feature>
+        <feature version="[10,11)">odl-mdsal-singleton-dom</feature>
     </feature>
 </features>
index c2261ce..5e6bc3c 100644 (file)
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-exp-netty-config">
     <feature name="odl-controller-exp-netty-config">
-        <feature version="[10,11)">odl-netty-4</feature>
+        <feature version="[11,12)">odl-netty-4</feature>
     </feature>
 </features>
index 08bc954..567080d 100644 (file)
@@ -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="[9,10)">odl-mdsal-common</feature>
-        <feature version="[9,10)">odl-mdsal-binding-runtime</feature>
+        <feature version="[10,11)">odl-mdsal-common</feature>
+        <feature version="[10,11)">odl-mdsal-binding-runtime</feature>
     </feature>
 </features>
index f20c516..f10a915 100644 (file)
@@ -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="[9,10)">odl-mdsal-singleton-dom</feature>
-        <feature version="[9,10)">odl-mdsal-eos-binding</feature>
+        <feature version="[10,11)">odl-mdsal-singleton-dom</feature>
+        <feature version="[10,11)">odl-mdsal-eos-binding</feature>
     </feature>
 </features>
index 82c96ac..b206e7f 100644 (file)
@@ -8,10 +8,10 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
     <feature name="odl-mdsal-clustering-commons" version="${project.version}">
-        <feature version="[10,11)">odl-apache-commons-lang3</feature>
-        <feature version="[10,11)">odl-dropwizard-metrics</feature>
-        <feature version="[10,11)">odl-servlet-api</feature>
-        <feature version="[8,9)">odl-yangtools-data</feature>
-        <feature version="[8,9)">odl-yangtools-codec</feature>
+        <feature version="[11,12)">odl-apache-commons-lang3</feature>
+        <feature version="[11,12)">odl-dropwizard-metrics</feature>
+        <feature version="[11,12)">odl-servlet-api</feature>
+        <feature version="[9,10)">odl-yangtools-data</feature>
+        <feature version="[9,10)">odl-yangtools-codec</feature>
     </feature>
 </features>
index 9d12ed2..d5c6767 100644 (file)
@@ -8,11 +8,11 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
     <feature name="odl-mdsal-distributed-datastore" version="${project.version}">
-        <feature version="[10,11)">odl-apache-commons-text</feature>
-        <feature version="[8,9)">odl-yangtools-codec</feature>
-        <feature version="[9,10)">odl-mdsal-eos-dom</feature>
-        <feature version="[9,10)">odl-mdsal-dom-broker</feature>
-        <feature version="[9,10)">odl-mdsal-binding-dom-adapter</feature>
+        <feature version="[11,12)">odl-apache-commons-text</feature>
+        <feature version="[9,10)">odl-yangtools-codec</feature>
+        <feature version="[10,11)">odl-mdsal-eos-dom</feature>
+        <feature version="[10,11)">odl-mdsal-dom-broker</feature>
+        <feature version="[10,11)">odl-mdsal-binding-dom-adapter</feature>
         <configfile finalname="configuration/initial/akka.conf">
             mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf
         </configfile>
index 4466dbe..cb2bf7e 100644 (file)
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-toaster-${project.version}">
     <feature name="odl-toaster" version="${project.version}">
-        <feature version="[9,10)">odl-mdsal-binding-runtime</feature>
+        <feature version="[10,11)">odl-mdsal-binding-runtime</feature>
     </feature>
 </features>
index df58dc2..8d09bea 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index 506f6b8..4e2d0c3 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index fd778b7..b99d6cb 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index 957fae5..e232102 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index a66c391..074343f 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>8.0.3</version>
+        <version>9.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>9.0.2</version>
+        <version>10.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
index 75046ee..1af0d72 100644 (file)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index dbfb99a..bb5889e 100644 (file)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index cf273dc..7d38f13 100644 (file)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index 75bcdc3..9a018e7 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index d3a996e..2726a6a 100644 (file)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index bb918e1..392db67 100644 (file)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index 559c20c..0e98cdc 100644 (file)
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>9.0.2</version>
+        <version>10.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
index 53f18d9..f6d082e 100644 (file)
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index 74a33fc..a2d7eda 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>9.0.2</version>
+    <version>10.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index 9b1beb9..4a85bfd 100644 (file)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index 77c039e..341195b 100644 (file)
@@ -33,7 +33,7 @@ public class AddShardReplicaCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .addShardReplica(new AddShardReplicaInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .build());
     }
 }
index cbfd570..52f3794 100644 (file)
@@ -47,7 +47,7 @@ public class ChangeMemberVotingStatesForShardCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .changeMemberVotingStatesForShard(new ChangeMemberVotingStatesForShardInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .setMemberVotingState(List.of(memberVotingState))
                         .build());
     }
index 8e91427..617b2dc 100644 (file)
@@ -33,7 +33,7 @@ public class GetShardRoleCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .getShardRole(new GetShardRoleInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .build());
     }
 }
index 13d99a8..a7acab1 100644 (file)
@@ -33,7 +33,7 @@ public class LocateShardCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .locateShard(new LocateShardInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .build());
     }
 }
index 3b1c145..a585f19 100644 (file)
@@ -33,7 +33,7 @@ public class MakeLeaderLocalCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .makeLeaderLocal(new MakeLeaderLocalInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .build());
     }
 }
index e4a7864..1db5707 100644 (file)
@@ -35,7 +35,7 @@ public class RemoveShardReplicaCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .removeShardReplica(new RemoveShardReplicaInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .setMemberName(memberName)
                         .build());
     }
index 8f9ada4..98f7620 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index 0ee005a..06d5759 100644 (file)
@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import javax.management.ConstructorParameters;
@@ -84,7 +83,7 @@ public class DatastoreContextIntrospector {
     private static void introspectPrimitiveTypes() {
         final Set<Class<?>> primitives = ImmutableSet.<Class<?>>builder().addAll(
                 Primitives.allWrapperTypes()).add(String.class).build();
-        for (final Class<?> primitive: primitives) {
+        for (final Class<?> primitive : primitives) {
             try {
                 processPropertyType(primitive);
             } catch (final NoSuchMethodException e) {
@@ -382,9 +381,8 @@ public class DatastoreContextIntrospector {
         if (propertyType.isEnum()) {
             try {
                 final Method enumConstructor = propertyType.getDeclaredMethod("forName", String.class);
-                final Object optional =  enumConstructor.invoke(null, from.toString().toLowerCase(Locale.ROOT));
-                if (optional instanceof Optional) {
-                    return ((Optional<Object>)optional).orElseThrow();
+                if (enumConstructor.getReturnType().equals(propertyType)) {
+                    return enumConstructor.invoke(null, from.toString().toLowerCase(Locale.ROOT));
                 }
             } catch (NoSuchMethodException e) {
                 LOG.error("Error constructing value ({}) for enum {}", from, propertyType);
index 21ef896..2dbbaa3 100644 (file)
@@ -30,8 +30,6 @@ public class ClientBackedWriteTransactionTest extends ClientBackedTransactionTes
     @Mock
     private NormalizedNode data;
     @Mock
-    private YangInstanceIdentifier path;
-    @Mock
     private DOMStoreThreePhaseCommitCohort readyCohort;
 
     @Before
@@ -49,20 +47,20 @@ public class ClientBackedWriteTransactionTest extends ClientBackedTransactionTes
 
     @Test
     public void testWrite() {
-        object().write(path, data);
-        verify(delegate).write(path, data);
+        object().write(YangInstanceIdentifier.empty(), data);
+        verify(delegate).write(YangInstanceIdentifier.empty(), data);
     }
 
     @Test
     public void testMerge() {
-        object().merge(path, data);
-        verify(delegate).merge(path, data);
+        object().merge(YangInstanceIdentifier.empty(), data);
+        verify(delegate).merge(YangInstanceIdentifier.empty(), data);
     }
 
     @Test
     public void testDelete() {
-        object().delete(path);
-        verify(delegate).delete(path);
+        object().delete(YangInstanceIdentifier.empty());
+        verify(delegate).delete(YangInstanceIdentifier.empty());
     }
 
     @Test
index a7b3819..636d730 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index cafcb75..7f76087 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 0ddc30c..b686a50 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index b4c6217..e3034dd 100644 (file)
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.sample.kitchen.api;
 
-import java.util.concurrent.Future;
+import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToastType;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
 public interface KitchenService {
-    Future<RpcResult<Void>> makeBreakfast(EggsType eggs, Class<? extends ToastType> toast, int toastDoneness);
+
+    ListenableFuture<RpcResult<Void>> makeBreakfast(EggsType eggs, ToastType toast, int toastDoneness);
 }
index 1e5c10c..4f24568 100644 (file)
@@ -16,7 +16,6 @@ import com.google.common.util.concurrent.MoreExecutors;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean;
 import org.opendaylight.controller.sample.kitchen.api.EggsType;
 import org.opendaylight.controller.sample.kitchen.api.KitchenService;
@@ -58,7 +57,7 @@ public class KitchenServiceImpl extends AbstractMXBean
     }
 
     @Override
-    public Future<RpcResult<Void>> makeBreakfast(final EggsType eggsType, final Class<? extends ToastType> toastType,
+    public ListenableFuture<RpcResult<Void>> makeBreakfast(final EggsType eggsType, final ToastType toastType,
             final int toastDoneness) {
         // Call makeToast, The OpendaylightToaster impl already returns a ListenableFuture so the conversion is
         // actually a no-op.
@@ -95,9 +94,7 @@ public class KitchenServiceImpl extends AbstractMXBean
         return executor.submit(() -> RpcResultBuilder.<Void>success().build());
     }
 
-    private ListenableFuture<RpcResult<MakeToastOutput>> makeToast(final Class<? extends ToastType> toastType,
-            final int toastDoneness) {
-
+    private ListenableFuture<RpcResult<MakeToastOutput>> makeToast(final ToastType toastType, final int toastDoneness) {
         if (toasterOutOfBread) {
             LOG.info("We're out of toast but we can make eggs");
             return RpcResultBuilder.success(EMPTY_MAKE_OUTPUT)
@@ -118,7 +115,7 @@ public class KitchenServiceImpl extends AbstractMXBean
     public Boolean makeScrambledWithWheat() {
         try {
             // This call has to block since we must return a result to the JMX client.
-            RpcResult<Void> result = makeBreakfast(EggsType.SCRAMBLED, WheatBread.class, 2).get();
+            RpcResult<Void> result = makeBreakfast(EggsType.SCRAMBLED, WheatBread.VALUE, 2).get();
             if (result.isSuccessful()) {
                 LOG.info("makeBreakfast succeeded");
             } else {
index ed2e47b..dd55356 100644 (file)
@@ -55,8 +55,8 @@ public class ToasterTest extends AbstractMdsalTestBase {
         boolean success = true;
 
         // Make toasts using OSGi service
-        success &= kitchenService.makeBreakfast(EggsType.SCRAMBLED, HashBrown.class, 4).get().isSuccessful();
-        success &= kitchenService.makeBreakfast(EggsType.POACHED, WhiteBread.class, 8).get().isSuccessful();
+        success &= kitchenService.makeBreakfast(EggsType.SCRAMBLED, HashBrown.VALUE, 4).get().isSuccessful();
+        success &= kitchenService.makeBreakfast(EggsType.POACHED, WhiteBread.VALUE, 8).get().isSuccessful();
 
         assertTrue("Not all breakfasts succeeded", success);
 
index 1b6dc3c..4851522 100644 (file)
@@ -73,7 +73,7 @@ public class OpenDaylightToasterTest extends AbstractConcurrentDataBrokerTest {
     @Ignore //ignored because it is not a test right now. Illustrative purposes only.
     public void testSomething() throws Exception {
         MakeToastInput toastInput = new MakeToastInputBuilder().setToasterDoneness(Uint32.valueOf(1))
-                .setToasterToastType(WheatBread.class).build();
+                .setToasterToastType(WheatBread.VALUE).build();
 
         // NOTE: In a real test we would want to override the Thread.sleep() to
         // prevent our junit test
diff --git a/pom.xml b/pom.xml
index 5f3ec0a..30b208c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>