From fb03c118da7d604bd0b4c5ae5c57d144b37b54bd Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 15 Mar 2024 17:30:51 +0100 Subject: [PATCH] Migrate to better RpcProviderService.registerRpcImplementations() Remove the use of class references and ClassToInstanceMap. Change-Id: I1e0d1ca61e1efb26cd77607bae03b4cc77eddc42 Signed-off-by: Robert Varga --- .../aaa/cert/impl/AaaCertRpcServiceImpl.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java index 6c0b7c99a..2382596db 100644 --- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java +++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java @@ -11,7 +11,6 @@ import static java.util.Objects.requireNonNull; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.util.concurrent.ListenableFuture; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.aaa.cert.api.IAaaCertProvider; @@ -37,7 +36,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertificateOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertificateOutputBuilder; import org.opendaylight.yangtools.concepts.Registration; -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; @@ -63,13 +61,12 @@ final class AaaCertRpcServiceImpl { } @NonNull Registration registerWith(final RpcProviderService rpcProviderService) { - return rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.>builder() - .put(GetNodeCertificate.class, this::getNodeCertificate) - .put(SetNodeCertificate.class, this::setNodeCertificate) - .put(GetODLCertificate.class, this::getODLCertificate) - .put(SetODLCertificate.class, this::setODLCertificate) - .put(GetODLCertificateReq.class, this::getODLCertificateReq) - .build()); + return rpcProviderService.registerRpcImplementations( + (GetNodeCertificate) this::getNodeCertificate, + (SetNodeCertificate) this::setNodeCertificate, + (GetODLCertificate) this::getODLCertificate, + (SetODLCertificate) this::setODLCertificate, + (GetODLCertificateReq) this::getODLCertificateReq); } @VisibleForTesting -- 2.36.6