Modernize RPC implementation registration

Use a plain varargs array instead of ClassToInstanceMap.

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

Author: rovarga

mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingService.java

@@ -10,7 +10,6 @@
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.List;
@@ -117,7 +116,6 @@
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingsOutput;
 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;
@@ -185,31 +183,28 @@ public void initialize() {
         dsbe = new DataStoreBackEnd(dataBroker);
 
         rpcRegistration = rpcProviderService.registerRpcImplementations(
-            ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
-                .put(AddKey.class, this::addKey)
-                .put(GetKey.class, this::getKey)
-                .put(UpdateKey.class, this::updateKey)
-                .put(RemoveKey.class, this::removeKey)
-                .put(AddMapping.class, this::addMapping)
-                .put(GetMapping.class, this::getMapping)
-                .put(GetMappingWithXtrId.class, this::getMappingWithXtrId)
-                .put(UpdateMapping.class, this::updateMapping)
-                .put(RemoveMapping.class, this::removeMapping)
-                .put(AddKeys.class, this::addKeys)
-                .put(GetKeys.class, this::getKeys)
-                .put(UpdateKeys.class, this::updateKeys)
-                .put(RemoveKeys.class, this::removeKeys)
-                .put(AddMappings.class, this::addMappings)
-                .put(GetMappings.class, this::getMappings)
-                .put(UpdateMappings.class, this::updateMappings)
-                .put(RemoveMappings.class, this::removeMappings)
-                .put(GetAllKeys.class, this::getAllKeys)
-                .put(GetAllMappings.class, this::getAllMappings)
-                .put(RemoveAllKeys.class, this::removeAllKeys)
-                .put(RemoveAllMappings.class, this::removeAllMappings)
-                .put(RemoveAllOperationalContent.class, this::removeAllOperationalContent)
-                .build()
-        );
+            (AddKey) this::addKey,
+            (GetKey) this::getKey,
+            (UpdateKey) this::updateKey,
+            (RemoveKey) this::removeKey,
+            (AddMapping) this::addMapping,
+            (GetMapping) this::getMapping,
+            (GetMappingWithXtrId) this::getMappingWithXtrId,
+            (UpdateMapping) this::updateMapping,
+            (RemoveMapping) this::removeMapping,
+            (AddKeys) this::addKeys,
+            (GetKeys) this::getKeys,
+            (UpdateKeys) this::updateKeys,
+            (RemoveKeys) this::removeKeys,
+            (AddMappings) this::addMappings,
+            (GetMappings) this::getMappings,
+            (UpdateMappings) this::updateMappings,
+            (RemoveMappings) this::removeMappings,
+            (GetAllKeys) this::getAllKeys,
+            (GetAllMappings) this::getAllMappings,
+            (RemoveAllKeys) this::removeAllKeys,
+            (RemoveAllMappings) this::removeAllMappings,
+            (RemoveAllOperationalContent) this::removeAllOperationalContent);
 
         mappingSystem = new MappingSystem(dao, iterateMask, notificationPublishService, mappingMergePolicy);
         mappingSystem.setDataStoreBackEnd(dsbe);

mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRPC.java

@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.southbound;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.nio.ByteBuffer;
@@ -52,7 +51,6 @@
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.get.stats.output.ControlMessageStatsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.get.stats.output.MapRegisterCacheStatsBuilder;
 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;
@@ -84,14 +82,13 @@ public class LispSouthboundRPC {
     public LispSouthboundRPC(final @Reference LispSouthboundPlugin lispSbPlugin,
             final @Reference RpcProviderService rpcProviderService) {
         this.lispSbPlugin = lispSbPlugin;
-        rpcRegistration = rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
-            .put(SendMapRequest.class, this::sendMapRequest)
-            .put(SendMapReply.class, this::sendMapReply)
-            .put(SendMapRegister.class, this::sendMapRegister)
-            .put(SendMapNotify.class, this::sendMapNotify)
-            .put(GetStats.class, this::getStats)
-            .put(ResetStats.class, this::resetStats)
-            .build());
+        rpcRegistration = rpcProviderService.registerRpcImplementations(
+            (SendMapRequest) this::sendMapRequest,
+            (SendMapReply) this::sendMapReply,
+            (SendMapRegister) this::sendMapRegister,
+            (SendMapNotify) this::sendMapNotify,
+            (GetStats) this::getStats,
+            (ResetStats) this::resetStats);
     }
 
     @Deactivate