From 1c79e662c75f327e4d1953710cc78b70780ef4e1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 14 Mar 2024 11:24:05 +0100 Subject: [PATCH] Migrate users of deprecated methods Updated yangtools/mdsal are providing a few more convenient methods, use those instead of their deprecated equivalents. Change-Id: I6a971e349dc7d5aed00697c179dfa0c37afa8209 Signed-off-by: Robert Varga --- .../dsbenchmark/DsbenchmarkProvider.java | 7 +-- .../impl/NtfbenchmarkProvider.java | 7 +-- .../impl/GlobalBindingRTCServer.java | 9 ++-- .../impl/RoutedBindingRTCServer.java | 10 ++-- .../impl/RpcbenchmarkProvider.java | 7 +-- .../eos/akka/AkkaEntityOwnershipService.java | 11 ++-- .../admin/ClusterAdminRpcService.java | 41 +++++++-------- .../clustering/it/provider/CarProvider.java | 21 ++++---- .../provider/MdsalLowLevelTestProvider.java | 51 +++++++++---------- .../it/provider/impl/GetConstantService.java | 7 +-- .../impl/RoutedGetConstantService.java | 7 +-- .../impl/SingletonGetConstantService.java | 7 +-- .../toaster/provider/OpendaylightToaster.java | 11 ++-- 13 files changed, 76 insertions(+), 120 deletions(-) diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java index 4d5058557c..32f849596e 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java @@ -9,7 +9,6 @@ package org.opendaylight.dsbenchmark; import static java.util.Objects.requireNonNull; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import java.util.Collections; @@ -51,7 +50,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchm import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestStatusBuilder; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.common.Uint32; @@ -98,10 +96,7 @@ public final class DsbenchmarkProvider implements AutoCloseable { LOG.warn("Working around Bugs 8829 and 6793 by ignoring exception from setTestOperData", e); } - rpcReg = rpcService.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(StartTest.class, this::startTest) - .put(CleanupStore.class, this::cleanupStore) - .build()); + rpcReg = rpcService.registerRpcImplementations((StartTest) this::startTest, (CleanupStore) this::cleanupStore); LOG.info("DsbenchmarkProvider initiated"); } diff --git a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java index dacf2529d9..7c8e51f643 100644 --- a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java +++ b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java @@ -10,7 +10,6 @@ package ntfbenchmark.impl; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; import java.util.concurrent.ExecutionException; @@ -33,7 +32,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ntfbench import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ntfbenchmark.rev150105.TestStatusInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ntfbenchmark.rev150105.TestStatusOutput; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.common.Uint32; @@ -63,10 +61,7 @@ public final class NtfbenchmarkProvider implements AutoCloseable { @Reference final RpcProviderService rpcService) { this.listenService = requireNonNull(listenService); this.publishService = requireNonNull(publishService); - reg = rpcService.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(TestStatus.class, this::testStatus) - .put(StartTest.class, this::startTest) - .build()); + reg = rpcService.registerRpcImplementations((TestStatus) this::testStatus, (StartTest) this::startTest); LOG.debug("NtfbenchmarkProvider initiated"); } diff --git a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/GlobalBindingRTCServer.java b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/GlobalBindingRTCServer.java index bac7a659a2..78d8e4a1ba 100644 --- a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/GlobalBindingRTCServer.java +++ b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/GlobalBindingRTCServer.java @@ -7,12 +7,10 @@ */ package rpcbenchmark.impl; -import com.google.common.collect.ImmutableClassToInstanceMap; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.yang.gen.v1.rpcbench.payload.rev150702.GlobalRpcBench; import org.opendaylight.yang.gen.v1.rpcbench.payload.rev150702.RoutedRpcBench; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.osgi.service.component.annotations.Reference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,10 +21,9 @@ final class GlobalBindingRTCServer extends AbstractRpcbenchPayloadService implem private final Registration reg; GlobalBindingRTCServer(@Reference final RpcProviderService rpcProvider) { - reg = rpcProvider.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(GlobalRpcBench.class, this::globalRpcBench) - .put(RoutedRpcBench.class, this::routedRpcBench) - .build()); + reg = rpcProvider.registerRpcImplementations( + (GlobalRpcBench) this::globalRpcBench, + (RoutedRpcBench) this::routedRpcBench); LOG.debug("GlobalBindingRTCServer started"); } diff --git a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RoutedBindingRTCServer.java b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RoutedBindingRTCServer.java index 37e03fbfdf..a6384606ed 100644 --- a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RoutedBindingRTCServer.java +++ b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RoutedBindingRTCServer.java @@ -7,23 +7,21 @@ */ package rpcbenchmark.impl; -import com.google.common.collect.ImmutableClassToInstanceMap; +import java.util.List; import java.util.Set; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.yang.gen.v1.rpcbench.payload.rev150702.GlobalRpcBench; import org.opendaylight.yang.gen.v1.rpcbench.payload.rev150702.RoutedRpcBench; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.Rpc; final class RoutedBindingRTCServer extends AbstractRpcbenchPayloadService implements AutoCloseable { private final Registration reg; RoutedBindingRTCServer(final RpcProviderService rpcProvider, final Set> paths) { - reg = rpcProvider.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(GlobalRpcBench.class, this::globalRpcBench) - .put(RoutedRpcBench.class, this::routedRpcBench) - .build(), paths); + reg = rpcProvider.registerRpcImplementations(List.of( + (GlobalRpcBench) this::globalRpcBench, + (RoutedRpcBench) this::routedRpcBench), paths); } @Override diff --git a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java index 356a034b54..c785e9b384 100644 --- a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java +++ b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java @@ -10,7 +10,6 @@ package rpcbenchmark.impl; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; import java.util.List; @@ -38,7 +37,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rpcbench import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rpcbenchmark.rev150702.TestStatusOutputBuilder; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.common.Uint32; @@ -70,10 +68,7 @@ public final class RpcbenchmarkProvider implements AutoCloseable { this.providerRegistry = requireNonNull(providerRegistry); this.consumerRegistry = requireNonNull(consumerRegistry); globalServer = new GlobalBindingRTCServer(providerRegistry); - reg = providerRegistry.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(TestStatus.class, this::testStatus) - .put(StartTest.class, this::startTest) - .build()); + reg = providerRegistry.registerRpcImplementations((TestStatus) this::testStatus, (StartTest) this::startTest); LOG.info("RpcbenchmarkProvider initiated"); } diff --git a/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipService.java b/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipService.java index 714273375c..332fb44af7 100644 --- a/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipService.java +++ b/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipService.java @@ -15,7 +15,6 @@ import akka.actor.typed.javadsl.AskPattern; import akka.actor.typed.javadsl.Behaviors; import akka.cluster.typed.Cluster; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -71,7 +70,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.entity.owners.norev.GetEntityOwnerInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.entity.owners.norev.GetEntityOwnerOutput; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.binding.RpcOutput; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -149,11 +147,10 @@ public class AkkaEntityOwnershipService implements DOMEntityOwnershipService, Da throws ExecutionException, InterruptedException { this(actorProvider.getActorSystem(), codecTree); - reg = rpcProvider.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(GetEntity.class, this::getEntity) - .put(GetEntities.class, this::getEntities) - .put(GetEntityOwner.class, this::getEntityOwner) - .build()); + reg = rpcProvider.registerRpcImplementations( + (GetEntity) this::getEntity, + (GetEntities) this::getEntities, + (GetEntityOwner) this::getEntityOwner); } @PreDestroy diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java index 47dcc66c2d..8ad1553dba 100644 --- a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java +++ b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java @@ -16,7 +16,6 @@ import akka.util.Timeout; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.base.Throwables; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.util.concurrent.FutureCallback; @@ -119,7 +118,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.shard.result.output.ShardResultBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.shard.result.output.ShardResultKey; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -163,26 +161,25 @@ public final class ClusterAdminRpcService { } Registration registerWith(final RpcProviderService rpcProviderService) { - return rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin - .rev151013.AddShardReplica.class, this::addShardReplica) - .put(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin - .rev151013.RemoveShardReplica.class, this::removeShardReplica) - .put(LocateShard.class, this::locateShard) - .put(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin - .rev151013.MakeLeaderLocal.class, this::makeLeaderLocal) - .put(AddReplicasForAllShards.class, this::addReplicasForAllShards) - .put(RemoveAllShardReplicas.class, this::removeAllShardReplicas) - .put(ChangeMemberVotingStatesForShard.class, this::changeMemberVotingStatesForShard) - .put(ChangeMemberVotingStatesForAllShards.class, this::changeMemberVotingStatesForAllShards) - .put(FlipMemberVotingStatesForAllShards.class, this::flipMemberVotingStatesForAllShards) - .put(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin - .rev151013.GetShardRole.class, this::getShardRole) - .put(BackupDatastore.class, this::backupDatastore) - .put(GetKnownClientsForAllShards.class, this::getKnownClientsForAllShards) - .put(ActivateEosDatacenter.class, this::activateEosDatacenter) - .put(DeactivateEosDatacenter.class, this::deactivateEosDatacenter) - .build()); + return rpcProviderService.registerRpcImplementations( + (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013 + .AddShardReplica) this::addShardReplica, + (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013 + .RemoveShardReplica) this::removeShardReplica, + (LocateShard) this::locateShard, + (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013 + .MakeLeaderLocal) this::makeLeaderLocal, + (AddReplicasForAllShards) this::addReplicasForAllShards, + (RemoveAllShardReplicas) this::removeAllShardReplicas, + (ChangeMemberVotingStatesForShard) this::changeMemberVotingStatesForShard, + (ChangeMemberVotingStatesForAllShards) this::changeMemberVotingStatesForAllShards, + (FlipMemberVotingStatesForAllShards) this::flipMemberVotingStatesForAllShards, + (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013 + .GetShardRole) this::getShardRole, + (BackupDatastore) this::backupDatastore, + (GetKnownClientsForAllShards) this::getKnownClientsForAllShards, + (ActivateEosDatacenter) this::activateEosDatacenter, + (DeactivateEosDatacenter) this::deactivateEosDatacenter); } @VisibleForTesting 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 46ffe4c626..bec65aa561 100644 --- 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 @@ -8,7 +8,6 @@ package org.opendaylight.controller.clustering.it.provider; import com.google.common.base.Stopwatch; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -78,7 +77,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -132,16 +130,15 @@ public final class CarProvider { this.dataProvider = dataProvider; this.ownershipService = ownershipService; this.domDataBroker = domDataBroker; - regs.add(rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(StressTest.class, this::stressTest) - .put(StopStressTest.class, this::stopStressTest) - .put(RegisterOwnership.class, this::registerOwnership) - .put(UnregisterOwnership.class, this::unregisterOwnership) - .put(RegisterLoggingDtcl.class, this::registerLoggingDtcl) - .put(UnregisterLoggingDtcls.class, this::unregisterLoggingDtcls) - .put(RegisterCommitCohort.class, this::registerCommitCohort) - .put(UnregisterCommitCohort.class, this::unregisterCommitCohort) - .build())); + regs.add(rpcProviderService.registerRpcImplementations( + (StressTest) this::stressTest, + (StopStressTest) this::stopStressTest, + (RegisterOwnership) this::registerOwnership, + (UnregisterOwnership) this::unregisterOwnership, + (RegisterLoggingDtcl) this::registerLoggingDtcl, + (UnregisterLoggingDtcls) this::unregisterLoggingDtcls, + (RegisterCommitCohort) this::registerCommitCohort, + (UnregisterCommitCohort) this::unregisterCommitCohort)); } @PreDestroy 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 8b7fe2a113..10dafba452 100644 --- 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 @@ -12,7 +12,6 @@ import akka.dispatch.Futures; import akka.dispatch.OnComplete; import akka.pattern.Patterns; import com.google.common.base.Strings; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import java.util.HashMap; @@ -135,7 +134,6 @@ import org.opendaylight.yangtools.concepts.AbstractObjectRegistration; import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -196,31 +194,30 @@ public final class MdsalLowLevelTestProvider { dataTreeChangeExtension = domDataBroker.extension(DataTreeChangeExtension.class); - registration = rpcRegistry.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(UnregisterSingletonConstant.class, this::unregisterSingletonConstant) - .put(StartPublishNotifications.class, this::startPublishNotifications) - .put(SubscribeDdtl.class, this::subscribeDdtl) - .put(WriteTransactions.class, this::writeTransactions) - .put(IsClientAborted.class, this::isClientAborted) - .put(RemoveShardReplica.class, this::removeShardReplica) - .put(SubscribeYnl.class, this::subscribeYnl) - .put(UnregisterBoundConstant.class, this::unregisterBoundConstant) - .put(RegisterSingletonConstant.class, this::registerSingletonConstant) - .put(RegisterDefaultConstant.class, this::registerDefaultConstant) - .put(UnregisterConstant.class, this::unregisterConstant) - .put(UnregisterFlappingSingleton.class, this::unregisterFlappingSingleton) - .put(AddShardReplica.class, this::addShardReplica) - .put(RegisterBoundConstant.class, this::registerBoundConstant) - .put(RegisterFlappingSingleton.class, this::registerFlappingSingleton) - .put(UnsubscribeDdtl.class, this::unsubscribeDdtl) - .put(UnsubscribeYnl.class, this::unsubscribeYnl) - .put(CheckPublishNotifications.class, this::checkPublishNotifications) - .put(ShutdownShardReplica.class, this::shutdownShardReplica) - .put(RegisterConstant.class, this::registerConstant) - .put(UnregisterDefaultConstant.class, this::unregisterDefaultConstant) - .put(SubscribeDtcl.class, this::subscribeDtcl) - .put(UnsubscribeDtcl.class, this::unsubscribeDtcl) - .build()); + registration = rpcRegistry.registerRpcImplementations( + (UnregisterSingletonConstant) this::unregisterSingletonConstant, + (StartPublishNotifications) this::startPublishNotifications, + (SubscribeDdtl) this::subscribeDdtl, + (WriteTransactions) this::writeTransactions, + (IsClientAborted) this::isClientAborted, + (RemoveShardReplica) this::removeShardReplica, + (SubscribeYnl) this::subscribeYnl, + (UnregisterBoundConstant) this::unregisterBoundConstant, + (RegisterSingletonConstant) this::registerSingletonConstant, + (RegisterDefaultConstant) this::registerDefaultConstant, + (UnregisterConstant) this::unregisterConstant, + (UnregisterFlappingSingleton) this::unregisterFlappingSingleton, + (AddShardReplica) this::addShardReplica, + (RegisterBoundConstant) this::registerBoundConstant, + (RegisterFlappingSingleton) this::registerFlappingSingleton, + (UnsubscribeDdtl) this::unsubscribeDdtl, + (UnsubscribeYnl) this::unsubscribeYnl, + (CheckPublishNotifications) this::checkPublishNotifications, + (ShutdownShardReplica) this::shutdownShardReplica, + (RegisterConstant) this::registerConstant, + (UnregisterDefaultConstant) this::unregisterDefaultConstant, + (SubscribeDtcl) this::subscribeDtcl, + (UnsubscribeDtcl) this::unsubscribeDtcl); } @PreDestroy diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java index 4d53a28401..54320705ac 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/GetConstantService.java @@ -17,8 +17,6 @@ import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; @@ -29,9 +27,8 @@ import org.slf4j.LoggerFactory; public final class GetConstantService implements DOMRpcImplementation { private static final Logger LOG = LoggerFactory.getLogger(GetConstantService.class); - private static final QNameModule MODULE = QNameModule.create( - XMLNamespace.of("tag:opendaylight.org,2017:controller:yang:lowlevel:target"), Revision.of("2017-02-15")) - .intern(); + private static final QNameModule MODULE = + QNameModule.ofRevision("tag:opendaylight.org,2017:controller:yang:lowlevel:target", "2017-02-15").intern(); private static final QName OUTPUT = YangConstants.operationOutputQName(MODULE).intern(); private static final QName CONSTANT = QName.create(MODULE, "constant").intern(); diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java index c5b8a56ca6..e3c1b20ff3 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/RoutedGetConstantService.java @@ -19,8 +19,6 @@ import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; @@ -31,9 +29,8 @@ import org.slf4j.LoggerFactory; public final class RoutedGetConstantService implements DOMRpcImplementation { private static final Logger LOG = LoggerFactory.getLogger(RoutedGetConstantService.class); - private static final QNameModule MODULE = QNameModule.create( - XMLNamespace.of("tag:opendaylight.org,2017:controller:yang:lowlevel:target"), Revision.of("2017-02-15")) - .intern(); + private static final QNameModule MODULE = + QNameModule.ofRevision("tag:opendaylight.org,2017:controller:yang:lowlevel:target", "2017-02-15").intern(); private static final QName OUTPUT = YangConstants.operationOutputQName(MODULE).intern(); private static final QName CONSTANT = QName.create(MODULE, "constant").intern(); private static final QName GET_CONTEXTED_CONSTANT = QName.create(MODULE, "get-contexted-constant").intern(); diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java index d1d3b927c1..9177cc6ec7 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java @@ -20,8 +20,6 @@ import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; @@ -32,9 +30,8 @@ import org.slf4j.LoggerFactory; public final class SingletonGetConstantService implements DOMRpcImplementation, ClusterSingletonService { private static final Logger LOG = LoggerFactory.getLogger(SingletonGetConstantService.class); - private static final QNameModule MODULE = QNameModule.create( - XMLNamespace.of("tag:opendaylight.org,2017:controller:yang:lowlevel:target"), Revision.of("2017-02-15")) - .intern(); + private static final QNameModule MODULE = + QNameModule.ofRevision("tag:opendaylight.org,2017:controller:yang:lowlevel:target", "2017-02-15").intern(); private static final QName OUTPUT = YangConstants.operationOutputQName(MODULE).intern(); private static final QName CONSTANT = QName.create(MODULE, "constant").intern(); private static final QName CONTEXT = QName.create(MODULE, "context").intern(); 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 33f2d2e14d..cc275a9b00 100644 --- 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 @@ -12,7 +12,6 @@ import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATI import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL; import static org.opendaylight.yangtools.yang.common.ErrorType.APPLICATION; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -66,7 +65,6 @@ import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120 import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterRestockedBuilder; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.Rpc; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcError; @@ -139,11 +137,10 @@ public final class OpendaylightToaster extends AbstractMXBean this.maxMakeToastTries = maxMakeToastTries; executor = Executors.newFixedThreadPool(1); - reg = rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(CancelToast.class, this::cancelToast) - .put(MakeToast.class, this) - .put(RestockToaster.class, this::restockToaster) - .build()); + reg = rpcProviderService.registerRpcImplementations( + (CancelToast) this::cancelToast, + this, + (RestockToaster) this::restockToaster); LOG.info("Initializing..."); -- 2.36.6