From: Robert Varga Date: Tue, 26 Apr 2022 19:26:37 +0000 (+0200) Subject: Bump upstreams to snapshots X-Git-Tag: v6.0.0~25 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=ded31428cae8b8907dcf06aba0dcd2fdd8cbe01b Bump upstreams to snapshots 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 --- diff --git a/akka/pom.xml b/akka/pom.xml index 2331e54b18..2861c77c98 100644 --- a/akka/pom.xml +++ b/akka/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/akka/repackaged-akka-jar/pom.xml b/akka/repackaged-akka-jar/pom.xml index 7e39964200..7a6da32e15 100644 --- a/akka/repackaged-akka-jar/pom.xml +++ b/akka/repackaged-akka-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/artifacts/pom.xml b/artifacts/pom.xml index fca5728c63..ea610b2a15 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/benchmark/pom.xml b/benchmark/pom.xml index f70fe2c09a..4f710c74e8 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index a95960dea2..d3c813dcbe 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal dom-parent - 9.0.2 + 10.0.0-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index fa9b9a7a0e..012cbc29f0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 10.0.0 + 11.0.0-SNAPSHOT @@ -111,11 +111,19 @@ org.osgi - osgi.core + org.osgi.framework org.osgi - osgi.cmpn + org.osgi.service.component + + + org.osgi + org.osgi.service.component.annotations + + + org.osgi + org.osgi.service.metatype.annotations @@ -224,9 +232,9 @@ https://commons.apache.org/proper/commons-lang/javadocs/api-3.9/ https://commons.apache.org/proper/commons-codec/apidocs/ - https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/10.0.0/ - https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/8.0.3/ - https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/9.0.2/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/11.0.0-SNAPSHOT/ + https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/9.0.0-SNAPSHOT/ + https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/10.0.0-SNAPSHOT/ diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml index 899dd25110..d2d978ee88 100644 --- a/features/features-controller-experimental/pom.xml +++ b/features/features-controller-experimental/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml index 265221aa6e..257a9191b1 100644 --- a/features/features-controller-testing/pom.xml +++ b/features/features-controller-testing/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml index df433e6dd4..98302bf620 100644 --- a/features/features-controller/pom.xml +++ b/features/features-controller/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/features/odl-clustering-test-app/src/main/feature/feature.xml b/features/odl-clustering-test-app/src/main/feature/feature.xml index e4abdffd55..e31d50148b 100644 --- a/features/odl-clustering-test-app/src/main/feature/feature.xml +++ b/features/odl-clustering-test-app/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-mdsal-model-rfc6991 + odl-mdsal-model-rfc6991 diff --git a/features/odl-controller-blueprint/src/main/feature/feature.xml b/features/odl-controller-blueprint/src/main/feature/feature.xml index 4016e0c2a7..e0e9c955d3 100644 --- a/features/odl-controller-blueprint/src/main/feature/feature.xml +++ b/features/odl-controller-blueprint/src/main/feature/feature.xml @@ -8,10 +8,10 @@ --> - odl-yangtools-codec - odl-mdsal-binding-api - odl-mdsal-binding-runtime - odl-mdsal-dom-api + odl-yangtools-codec + odl-mdsal-binding-api + odl-mdsal-binding-runtime + odl-mdsal-dom-api mvn:org.opendaylight.controller/blueprint/${project.version} diff --git a/features/odl-controller-broker-local/src/main/feature/feature.xml b/features/odl-controller-broker-local/src/main/feature/feature.xml index 0272cec8e5..d5fe32cb96 100644 --- a/features/odl-controller-broker-local/src/main/feature/feature.xml +++ b/features/odl-controller-broker-local/src/main/feature/feature.xml @@ -8,9 +8,9 @@ --> - odl-mdsal-dom - odl-mdsal-eos-binding - odl-mdsal-eos-dom - odl-mdsal-singleton-dom + odl-mdsal-dom + odl-mdsal-eos-binding + odl-mdsal-eos-dom + odl-mdsal-singleton-dom diff --git a/features/odl-controller-exp-netty-config/src/main/feature/feature.xml b/features/odl-controller-exp-netty-config/src/main/feature/feature.xml index c2261cea69..5e6bc3c088 100644 --- a/features/odl-controller-exp-netty-config/src/main/feature/feature.xml +++ b/features/odl-controller-exp-netty-config/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-netty-4 + odl-netty-4 diff --git a/features/odl-controller-mdsal-common/src/main/feature/feature.xml b/features/odl-controller-mdsal-common/src/main/feature/feature.xml index 08bc95441b..567080d1d9 100644 --- a/features/odl-controller-mdsal-common/src/main/feature/feature.xml +++ b/features/odl-controller-mdsal-common/src/main/feature/feature.xml @@ -8,7 +8,7 @@ --> - odl-mdsal-common - odl-mdsal-binding-runtime + odl-mdsal-common + odl-mdsal-binding-runtime diff --git a/features/odl-mdsal-broker/src/main/feature/feature.xml b/features/odl-mdsal-broker/src/main/feature/feature.xml index f20c516e0e..f10a915c9a 100644 --- a/features/odl-mdsal-broker/src/main/feature/feature.xml +++ b/features/odl-mdsal-broker/src/main/feature/feature.xml @@ -8,7 +8,7 @@ --> - odl-mdsal-singleton-dom - odl-mdsal-eos-binding + odl-mdsal-singleton-dom + odl-mdsal-eos-binding diff --git a/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml index 82c96ac699..b206e7f439 100644 --- a/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml +++ b/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml @@ -8,10 +8,10 @@ --> - odl-apache-commons-lang3 - odl-dropwizard-metrics - odl-servlet-api - odl-yangtools-data - odl-yangtools-codec + odl-apache-commons-lang3 + odl-dropwizard-metrics + odl-servlet-api + odl-yangtools-data + odl-yangtools-codec diff --git a/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml b/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml index 9d12ed2d39..d5c6767065 100644 --- a/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml +++ b/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml @@ -8,11 +8,11 @@ --> - odl-apache-commons-text - odl-yangtools-codec - odl-mdsal-eos-dom - odl-mdsal-dom-broker - odl-mdsal-binding-dom-adapter + odl-apache-commons-text + odl-yangtools-codec + odl-mdsal-eos-dom + odl-mdsal-dom-broker + odl-mdsal-binding-dom-adapter mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf diff --git a/features/odl-toaster/src/main/feature/feature.xml b/features/odl-toaster/src/main/feature/feature.xml index 4466dbe52b..cb2bf7e301 100644 --- a/features/odl-toaster/src/main/feature/feature.xml +++ b/features/odl-toaster/src/main/feature/feature.xml @@ -8,6 +8,6 @@ --> - odl-mdsal-binding-runtime + odl-mdsal-binding-runtime diff --git a/features/pom.xml b/features/pom.xml index df58dc2d1f..8d09bead9a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml index 506f6b8d43..4e2d0c3290 100644 --- a/features/single-feature-parent/pom.xml +++ b/features/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/jolokia/pom.xml b/jolokia/pom.xml index fd778b7cc8..b99d6cb7e7 100644 --- a/jolokia/pom.xml +++ b/jolokia/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/karaf/pom.xml b/karaf/pom.xml index 957fae5d29..e2321029d1 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index a66c391cad..074343f8a0 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 10.0.0 + 11.0.0-SNAPSHOT @@ -27,14 +27,14 @@ org.opendaylight.yangtools yangtools-artifacts - 8.0.3 + 9.0.0-SNAPSHOT pom import org.opendaylight.mdsal mdsal-artifacts - 9.0.2 + 10.0.0-SNAPSHOT pom import diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml index 75046ee524..1af0d727b9 100644 --- a/opendaylight/config/netty-event-executor-config/pom.xml +++ b/opendaylight/config/netty-event-executor-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml index dbfb99a18c..bb5889ecc2 100644 --- a/opendaylight/config/netty-threadgroup-config/pom.xml +++ b/opendaylight/config/netty-threadgroup-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml index cf273dc73d..7d38f13e00 100644 --- a/opendaylight/config/netty-timer-config/pom.xml +++ b/opendaylight/config/netty-timer-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 75bcdc3e8f..9a018e794a 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml index d3a996ecab..2726a6a2ba 100644 --- a/opendaylight/config/threadpool-config-api/pom.xml +++ b/opendaylight/config/threadpool-config-api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml index bb918e1f6b..392db674d3 100644 --- a/opendaylight/config/threadpool-config-impl/pom.xml +++ b/opendaylight/config/threadpool-config-impl/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml index 559c20c89a..0e98cdca6c 100644 --- a/opendaylight/md-sal/mdsal-it-base/pom.xml +++ b/opendaylight/md-sal/mdsal-it-base/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 10.0.0 + 11.0.0-SNAPSHOT @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 9.0.2 + 10.0.0-SNAPSHOT pom import diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index 53f18d9374..f6d082e520 100644 --- a/opendaylight/md-sal/mdsal-it-parent/pom.xml +++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index 74a33fc65e..a2d7eda34c 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 9.0.2 + 10.0.0-SNAPSHOT diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 9b1beb9897..4a85bfd2a5 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AddShardReplicaCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AddShardReplicaCommand.java index 77c039e9a3..341195bc4e 100644 --- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AddShardReplicaCommand.java +++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AddShardReplicaCommand.java @@ -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()); } } diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/ChangeMemberVotingStatesForShardCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/ChangeMemberVotingStatesForShardCommand.java index cbfd5704af..52f3794ee5 100644 --- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/ChangeMemberVotingStatesForShardCommand.java +++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/ChangeMemberVotingStatesForShardCommand.java @@ -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()); } diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/GetShardRoleCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/GetShardRoleCommand.java index 8e914279ea..617b2dc32b 100644 --- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/GetShardRoleCommand.java +++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/GetShardRoleCommand.java @@ -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()); } } diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/LocateShardCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/LocateShardCommand.java index 13d99a8e03..a7acab15b8 100644 --- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/LocateShardCommand.java +++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/LocateShardCommand.java @@ -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()); } } diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/MakeLeaderLocalCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/MakeLeaderLocalCommand.java index 3b1c1453d0..a585f191a1 100644 --- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/MakeLeaderLocalCommand.java +++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/MakeLeaderLocalCommand.java @@ -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()); } } diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/RemoveShardReplicaCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/RemoveShardReplicaCommand.java index e4a786432b..1db5707f8b 100644 --- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/RemoveShardReplicaCommand.java +++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/RemoveShardReplicaCommand.java @@ -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()); } diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index 8f9ada4cd3..98f76205cd 100644 --- a/opendaylight/md-sal/sal-clustering-config/pom.xml +++ b/opendaylight/md-sal/sal-clustering-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java index 0ee005a708..06d57595be 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java @@ -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> primitives = ImmutableSet.>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)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); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java index 21ef8967ae..2dbbaa3245 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java @@ -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 diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml index a7b3819d52..636d730add 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml index cafcb75cc9..7f76087006 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml index 0ddc30c784..b686a50034 100644 --- a/opendaylight/md-sal/samples/pom.xml +++ b/opendaylight/md-sal/samples/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java index b4c6217979..e3034dd482 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java @@ -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> makeBreakfast(EggsType eggs, Class toast, int toastDoneness); + + ListenableFuture> makeBreakfast(EggsType eggs, ToastType toast, int toastDoneness); } diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java index 1e5c10c0c1..4f245685aa 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java @@ -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> makeBreakfast(final EggsType eggsType, final Class toastType, + public ListenableFuture> 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.success().build()); } - private ListenableFuture> makeToast(final Class toastType, - final int toastDoneness) { - + private ListenableFuture> 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 result = makeBreakfast(EggsType.SCRAMBLED, WheatBread.class, 2).get(); + RpcResult result = makeBreakfast(EggsType.SCRAMBLED, WheatBread.VALUE, 2).get(); if (result.isSuccessful()) { LOG.info("makeBreakfast succeeded"); } else { diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java index ed2e47b061..dd5535697d 100644 --- a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java +++ b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java @@ -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); diff --git a/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java b/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java index 1b6dc3cc2c..4851522cb8 100644 --- a/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java +++ b/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java @@ -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 5f3ec0ac9f..30b208c6db 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.0 + 11.0.0-SNAPSHOT