Bump upstreams

Adopt:
- odlparent-13.0.11
- infrautils-6.0.6
- yangtools-13.0.2
- mdsal-13.0.1
- controller-9.0.1
- aaa-0.19.2
- netconf-7.0.2

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

diff --git a/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java b/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java
index 0b6c59de79c2f94d4be0c5b0faf2c5e3cf885d63..5a3db5d0763ecd408bb8eec43ae881f87415a968 100644 (file)
--- a/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java
+++ b/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java
@@ -10,7 +10,6 @@ package org.opendaylight.openflowplugin.applications.arbitratorreconciliation.im
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Function;
-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;
@@ -75,7 +74,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 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.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
@@ -339,11 +337,9 @@ public final class ArbitratorReconciliationManagerImpl implements Reconciliation
     private void registerRpc(final DeviceInfo node) {
         final var path = InstanceIdentifier.create(Nodes.class).child(Node.class, new NodeKey(node.getNodeId()));
         LOG.debug("The path is registered : {}", path);
-        rpcRegistrations.put(node.getNodeId().getValue(), rpcProviderService.registerRpcImplementations(
-            ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
-                .put(GetActiveBundle.class, this::getActiveBundle)
-                .put(CommitActiveBundle.class, this::commitActiveBundle)
-                .build(), Set.of(path)));
+        rpcRegistrations.put(node.getNodeId().getValue(), rpcProviderService.registerRpcImplementations(List.of(
+            (GetActiveBundle) this::getActiveBundle,
+            (CommitActiveBundle) this::commitActiveBundle), Set.of(path)));
     }
 
     private void deregisterRpc(final DeviceInfo node) {

diff --git a/applications/arbitratorreconciliation/pom.xml b/applications/arbitratorreconciliation/pom.xml
index c6831ef2e9f684047fe517021da6fda5280397b0..f49b1a8b496a5867eb6e91d0ed726c650b91d336 100644 (file)
--- a/applications/arbitratorreconciliation/pom.xml
+++ b/applications/arbitratorreconciliation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/SalBulkFlowRpcs.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/SalBulkFlowRpcs.java
index 22aa5d4a56af93d5b9b397cd8bcf3696d51d1d20..eb8dcc74c48856345ceb8be22b5faf827dd2ef4b 100644 (file)
--- a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/SalBulkFlowRpcs.java
+++ b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/SalBulkFlowRpcs.java
@@ -11,7 +11,6 @@ import static java.util.Objects.requireNonNull;
 import static java.util.Objects.requireNonNullElse;
 
 import com.google.common.annotations.VisibleForTesting;
-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;
@@ -89,7 +88,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 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;
@@ -122,18 +120,17 @@ public final class SalBulkFlowRpcs implements AutoCloseable {
         this.dataBroker = requireNonNull(dataBroker);
         addFlow = rpcService.getRpc(AddFlow.class);
         removeFlow = rpcService.getRpc(RemoveFlow.class);
-        reg = rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
-            .put(Register.class, this::register)
-            .put(AddFlowsRpc.class, this::addFlowsRpc)
-            .put(RemoveFlowsRpc.class, this::removeFlowsRpc)
-            .put(AddFlowsDs.class, this::addFlowsDs)
-            .put(RemoveFlowsDs.class, this::removeFlowsDs)
-            .put(FlowTest.class, this::flowTest)
-            .put(ReadFlowTest.class, this::readFlowTest)
-            .put(FlowRpcAddTest.class, this::flowRpcAddTest)
-            .put(FlowRpcAddMultiple.class, this::flowRpcAddMultiple)
-            .put(TableTest.class, this::tableTest)
-            .build());
+        reg = rpcProviderService.registerRpcImplementations(
+            (Register) this::register,
+            (AddFlowsRpc) this::addFlowsRpc,
+            (RemoveFlowsRpc) this::removeFlowsRpc,
+            (AddFlowsDs) this::addFlowsDs,
+            (RemoveFlowsDs) this::removeFlowsDs,
+            (FlowTest) this::flowTest,
+            (ReadFlowTest) this::readFlowTest,
+            (FlowRpcAddTest) this::flowRpcAddTest,
+            (FlowRpcAddMultiple) this::flowRpcAddMultiple,
+            (TableTest) this::tableTest);
         LoggingFutures.addErrorLogging(register(new RegisterInputBuilder().build()), LOG, "register");
     }
 

diff --git a/applications/lldp-speaker/src/main/java/org/opendaylight/openflowplugin/applications/lldpspeaker/LLDPSpeaker.java b/applications/lldp-speaker/src/main/java/org/opendaylight/openflowplugin/applications/lldpspeaker/LLDPSpeaker.java
index 635fdd32a0663993a64bbf6a447f820399b8323f..51f788c938e5823ba60255f08ede0f23101f4071 100644 (file)
--- a/applications/lldp-speaker/src/main/java/org/opendaylight/openflowplugin/applications/lldpspeaker/LLDPSpeaker.java
+++ b/applications/lldp-speaker/src/main/java/org/opendaylight/openflowplugin/applications/lldpspeaker/LLDPSpeaker.java
@@ -11,7 +11,6 @@ import static java.util.Objects.requireNonNull;
 import static org.opendaylight.infrautils.utils.concurrent.LoggingFutures.addErrorLogging;
 
 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.ThreadFactoryBuilder;
 import java.util.concurrent.ConcurrentHashMap;
@@ -55,7 +54,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.applications.lldp.speaker.rev141023.SetLldpFloodIntervalOutput;
 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;
@@ -104,12 +102,11 @@ public final class LLDPSpeaker implements NodeConnectorEventsObserver, Runnable,
 
         scheduledSpeakerTask = scheduledExecutorService.scheduleAtFixedRate(this, LLDP_FLOOD_PERIOD, LLDP_FLOOD_PERIOD,
             TimeUnit.SECONDS);
-        registration = rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
-            .put(GetLldpFloodInterval.class, this::getLldpFloodInterval)
-            .put(GetOperationalStatus.class, this::getOperationalStatus)
-            .put(SetLldpFloodInterval.class, this::setLldpFloodInterval)
-            .put(ChangeOperationalStatus.class, this::changeOperationalStatus)
-            .build());
+        registration = rpcProviderService.registerRpcImplementations(
+            (GetLldpFloodInterval) this::getLldpFloodInterval,
+            (GetOperationalStatus) this::getOperationalStatus,
+            (SetLldpFloodInterval) this::setLldpFloodInterval,
+            (ChangeOperationalStatus) this::changeOperationalStatus);
         LOG.info("LLDPSpeaker started, it will send LLDP frames each {} seconds", LLDP_FLOOD_PERIOD);
     }
 

diff --git a/applications/pom.xml b/applications/pom.xml
index 1ea659bf92a595c3491296eb86545a5b343eee41..466222a385f2584f8c623e2e9d1a8ebd139bd40f 100644 (file)
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 6c700f2b24b92c646fdd5ed68883c018828f5751..e0e5ce220bad81c94b715a84934c0d89818a7ad5 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index b34aef9edfa4205c695b3f3fa72abfb918c73d5c..84c3768c40eeea9a12a08b77d8531e63abcec3a6 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>13.0.10</version>
+    <version>13.0.11</version>
   </parent>
   <groupId>org.opendaylight.openflowplugin</groupId>
   <artifactId>openflowplugin-karaf</artifactId>

diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
index 0e8da177fe8b5dbb7a1e728728d9f558ec1dfe67..3603211022c215cdd6586f528bf8b15fe0fabc5a 100644 (file)
--- a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
+++ b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
index cf3f4177dfeeac5e625a9bc58b0e2b17dbcc5f48..01b9b6c09d77de063a7eb1e27c3ff7d545ef7fb8 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
index f15ee468bdd4300473b2be57bd33d8c779732f0c..743857ed5419573957b2b08d8ddcde95751064d4 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
index ed4a34b06174e2cee18b2e348bfced4a6d2cc7cf..76e7ff2f6cc3aa842ba66941531bba0c5b3b30db 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml
index d67ab68ed1d657025d4d3941834ed0fe90da8882..471437e6dabb583fbb633f084c6ebe49b3f6388d 100644 (file)
--- a/extension/features-extension-aggregator/pom.xml
+++ b/extension/features-extension-aggregator/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/extension/pom.xml b/extension/pom.xml
index c51cb206912df178853ff26273957599f520ce24..9874299c58710731720f8733f327afc72a724917 100644 (file)
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml
index 9e485fa3575ee5edcbfdd934ad4d89eeec6e7e38..c01762d824bffd25dbd37f01fa01c9bdb85ee2cb 100644 (file)
--- a/features-aggregator/features-openflowplugin/pom.xml
+++ b/features-aggregator/features-openflowplugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
index 2e013a559083230730e0fa9a262b1dc3452ba18b..183816967b444babea205fc031e9b85acef91016 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
index daee65e428d00b397aece7bb0272693d670ec01a..7e5a4a8d7d0ffe639bca33c1e777f6218bc1c3da 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
index 869c1e1fcab78b2898d2a911bb9340cf41e42b77..856f458a36a8c5cdea35b451d48bf85cdc593ca2 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
index a38d8ce014dedb6b45e05b60ad689500f7bb2990..7c05d167fd8f42b987db06b3ae8abc49274ff830 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
index 4b3f8a3ded3aee7cb2090bea7a2664dd8a87e26d..021170cd97e7620f0b56a4833455db27f86e77e5 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
index 7dc5869da9575578c6ab8934568f64dd60a662f4..24b6cad51252fe229c504606f4b359aa11c75c4a 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
index be2d505500baeabed44fba47da283b2623f3dffa..63cc55ccfe7f3ec5bcfa2cc01eb21073dbe246c0 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
@@ -4,7 +4,7 @@
 <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
 </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
index 9af5958327ddf8d97df6034905456473be44f2b9..6fa0070b4db328e09f13cd8473453617729a6dc1 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
index c6f7e36c9e4f98190c502fd998fb401b41e202c3..b984defcb8267005d074cdd77f76962ca8508c21 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
index 59c0cfbe97fd25594d0cbf5ba79a709db17769e8..aff5d5e384e1f668364291215cd8ea16593ee509 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
index 0b8fc8b77117212ef9f3e4fddc62f18d090deeca..03e4d4f9bfda1436e6cee3b44cfc251cc45d8898 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
index 6413a9edcaecd3d75bd3d8d57fddc814cb55adb4..b9779bbbc61c0f1b2b20948a15858daa2ee9a78a 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
index 7e3e19246a0ed5a4826815ca2a762220e2775c99..09828499e343a4d9e30bcaee50b04142b89774e0 100644 (file)
--- a/features-aggregator/odl-openflowplugin-drop-test/pom.xml
+++ b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
index e09e0a055fb2868dce4740c79b6696b45555b392..d23b53bf42fb73d26b8add9e337e9ddf9a151570 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>7.0.1</version>
+                <version>7.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
index 0bf712ff3adf38e57d6850a5c7eba92ec830917d..43ff6ef0bbd4f253d16499fcb9cee82a9c38d0ad 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-libraries/pom.xml b/features-aggregator/odl-openflowplugin-libraries/pom.xml
index 764585b202609a0b84310d601a73a1094e0d10af..48e37191d9cbd46b623d62fc506e386be69a498b 100644 (file)
--- a/features-aggregator/odl-openflowplugin-libraries/pom.xml
+++ b/features-aggregator/odl-openflowplugin-libraries/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
index 064356eb0acd71b774f0ddaa5eab8337e8c95bc4..f5de27dd0f92d26fce7ce6456bdab6bdfb1d8431 100644 (file)
--- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
+++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>13.0.0</version>
+                <version>13.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>9.0.0</version>
+                <version>9.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml
index b80a764981b77d84f7c580923c783118838065ce..cfa0f9f238f7ce9402d77038b95e4f3f50399e55 100644 (file)
--- a/features-aggregator/odl-openflowplugin-southbound/pom.xml
+++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 
@@ -29,14 +29,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>9.0.0</version>
+                <version>9.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>6.0.5</version>
+                <version>6.0.6</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features-aggregator/pom.xml b/features-aggregator/pom.xml
index 22bb768063fc252cb4dff8c98c9527c91b3fb1c6..478882818a3fc3c370a597d8d4266d9c73c01d3d 100644 (file)
--- a/features-aggregator/pom.xml
+++ b/features-aggregator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/libraries/pom.xml b/libraries/pom.xml
index c206b7632f0ce71834623a46b1407bc24bcd19e6..684830c7d880cb9685dd5eeb43c91f3f0400e671 100644 (file)
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index 9fc75a21f74b11f349397e5e89298884fc86ee02..3911c43ed063851e221ac1d0cb7d67637e1d54ed 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
index 262d493873723470e64fdf9ff56e2dc502714dde..d9dc75ae89b13c57beb5b29a641a9989b40496a0 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index 84e5abfe3d4500669afefe46c8947c87967f709a..47ecff5c3e48e12e9ecd7e15c7b6be3c24a5f3f9 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>6.0.5</version>
+                <version>6.0.6</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -42,7 +42,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>13.0.1</version>
+                <version>13.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -51,7 +51,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>13.0.0</version>
+                <version>13.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml
index b914cf9cbbf759cb31dd05103c6169ed08afd0b0..9b18ea0ee9126170e0b5733982908d263711e802 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.10</version>
+    <version>13.0.11</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java
index 65ba225a4f881d1673e965d23bf42e322d8068bf..da471fe4c6f03c72ed69f4b0b09e1426967f49fa 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.impl.rpc;
 
-import com.google.common.collect.ImmutableClassToInstanceMap;
+import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Set;
@@ -90,50 +90,8 @@ import org.opendaylight.openflowplugin.impl.statistics.services.direct.singlelay
 import org.opendaylight.openflowplugin.impl.statistics.services.direct.singlelayer.SingleGetNodeConnectorStatistics;
 import org.opendaylight.openflowplugin.impl.statistics.services.direct.singlelayer.SingleGetQueueStatistics;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.async.config.service.rev170619.GetAsync;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.async.config.service.rev170619.SetAsync;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetFlowStatistics;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetGroupStatistics;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetMeterStatistics;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetNodeConnectorStatistics;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetQueueStatistics;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.echo.service.rev150305.SendEcho;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.experimenter.message.service.rev151020.SendExperimenter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.experimenter.mp.message.service.rev151020.SendExperimenterMpRequest;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatch;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlow;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.RemoveFlow;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlow;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForAllFlows;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForGivenMatch;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowStatisticsFromFlowTable;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowsStatisticsFromAllFlowTables;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowStatisticsFromFlowTable;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.GetFlowTablesStatistics;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.SendBarrier;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetAllGroupStatistics;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupDescription;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupFeatures;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.RemoveMeter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterConfigStatistics;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterFeatures;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.module.config.rev141015.SetConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.AddBundleMessages;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.ControlBundle;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacket;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.service.rev131107.UpdatePort;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetAllNodeConnectorsStatistics;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromAllPorts;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromGivenPort;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetQueueStatisticsFromGivenPort;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026.UpdateTable;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.Rpc;
@@ -269,37 +227,36 @@ final class RpcContextImpl implements RpcContext {
         // FIXME: Use multipart writer provider from device context
         final var multipartWriterProvider = MultipartWriterProviderFactory.createDefaultProvider(deviceContext);
 
-        final var builder = ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
-            .put(SendBarrier.class, sendBarrier)
+        final var builder = ImmutableList.<Rpc<?, ?>>builder()
+            .add(sendBarrier)
             // node-config.yang
-            .put(SetConfig.class, new SetConfigImpl(this, deviceContext))
+            .add(new SetConfigImpl(this, deviceContext))
             // packet-processing.yang
-            .put(TransmitPacket.class, new TransmitPacketImpl(this, deviceContext, convertorExecutor))
+            .add(new TransmitPacketImpl(this, deviceContext, convertorExecutor))
             // sal-async-config.yang
-            .put(GetAsync.class, new GetAsyncImpl(this, deviceContext))
-            .put(SetAsync.class, new SetAsyncImpl(this, deviceContext))
+            .add(new GetAsyncImpl(this, deviceContext))
+            .add(new SetAsyncImpl(this, deviceContext))
             // sal-echo.yang
-            .put(SendEcho.class, new SendEchoImpl(this, deviceContext))
-            .put(SendExperimenter.class, sendExperimenter)
+            .add(new SendEchoImpl(this, deviceContext))
+            .add(sendExperimenter)
             // sal-bundle.yang (ONF extension?)
-            .put(ControlBundle.class, new ControlBundleImpl(sendExperimenter))
-            .put(AddBundleMessages.class, new AddBundleMessagesImpl(sendExperimenter))
+            .add(new ControlBundleImpl(sendExperimenter))
+            .add(new AddBundleMessagesImpl(sendExperimenter))
             // sal-experimenter-mp-message.yang
-            .put(SendExperimenterMpRequest.class, new SendExperimenterMpRequestImpl(this, deviceContext,
-                extensionConverterProvider))
-            .put(AddFlow.class, addFlow)
-            .put(RemoveFlow.class, removeFlow)
-            .put(UpdateFlow.class, updateFlow)
-            .put(AddGroup.class, addGroup)
-            .put(RemoveGroup.class, removeGroup)
-            .put(UpdateGroup.class, updateGroup)
-            .put(AddMeter.class, addMeter)
-            .put(RemoveMeter.class, removeMeter)
-            .put(UpdateMeter.class, updateMeter)
+            .add(new SendExperimenterMpRequestImpl(this, deviceContext, extensionConverterProvider))
+            .add(addFlow)
+            .add(removeFlow)
+            .add(updateFlow)
+            .add(addGroup)
+            .add(removeGroup)
+            .add(updateGroup)
+            .add(addMeter)
+            .add(removeMeter)
+            .add(updateMeter)
             // sal-port.yang
-            .put(UpdatePort.class, new UpdatePortImpl(this, deviceContext, convertorExecutor))
+            .add(new UpdatePortImpl(this, deviceContext, convertorExecutor))
             // sal-flat-batch.yang
-            .put(ProcessFlatBatch.class, new ProcessFlatBatchImpl(
+            .add(new ProcessFlatBatchImpl(
                 // sal-flows-batch.yang
                 // FIXME: register these?
                 new AddFlowsBatchImpl(addFlow, sendBarrier),
@@ -316,25 +273,23 @@ final class RpcContextImpl implements RpcContext {
                 new RemoveMetersBatchImpl(removeMeter, sendBarrier),
                 new UpdateMetersBatchImpl(updateMeter, sendBarrier)))
             // sal-table.yang
-            .put(UpdateTable.class, new UpdateTableImpl(this, deviceContext, convertorExecutor,
-                multipartWriterProvider))
+            .add(new UpdateTableImpl(this, deviceContext, convertorExecutor, multipartWriterProvider))
             // opendaylight-flow-statistics.yang
-            .put(GetAggregateFlowStatisticsFromFlowTableForGivenMatch.class,
-                new GetAggregateFlowStatisticsFromFlowTableForGivenMatchImpl(this, deviceContext, convertorExecutor))
+            .add(new GetAggregateFlowStatisticsFromFlowTableForGivenMatchImpl(this, deviceContext, convertorExecutor))
             // opendaylight-direct-statistics.yang
-            .put(GetFlowStatistics.class, singleLayer
+            .add(singleLayer
                 ? new SingleGetFlowStatistics(this, deviceContext, convertorExecutor, multipartWriterProvider)
                 : new MultiGetFlowStatistics(this, deviceContext, convertorExecutor, multipartWriterProvider))
-            .put(GetGroupStatistics.class, singleLayer
+            .add(singleLayer
                 ? new SingleGetGroupStatistics(this, deviceContext, convertorExecutor, multipartWriterProvider)
                 : new MultiGetGroupStatistics(this, deviceContext, convertorExecutor, multipartWriterProvider))
-            .put(GetQueueStatistics.class, singleLayer
+            .add(singleLayer
                 ? new SingleGetQueueStatistics(this, deviceContext, convertorExecutor, multipartWriterProvider)
                 : new MultiGetQueueStatistics(this, deviceContext, convertorExecutor, multipartWriterProvider))
-            .put(GetMeterStatistics.class, singleLayer
+            .add(singleLayer
                 ? new SingleGetMeterStatistics(this, deviceContext, convertorExecutor, multipartWriterProvider)
                 : new MultiGetMeterStatistics(this, deviceContext, convertorExecutor, multipartWriterProvider))
-            .put(GetNodeConnectorStatistics.class, singleLayer
+            .add(singleLayer
                 ? new SingleGetNodeConnectorStatistics(this, deviceContext, convertorExecutor, multipartWriterProvider)
                 : new MultiGetNodeConnectorStatistics(this, deviceContext, convertorExecutor, multipartWriterProvider));
 
@@ -347,64 +302,44 @@ final class RpcContextImpl implements RpcContext {
 
             builder
                 // Legacy RPCs
-                .put(GetAggregateFlowStatisticsFromFlowTableForAllFlows.class,
-                    new GetAggregateFlowStatisticsFromFlowTableForAllFlowsImpl(this, deviceContext, convertorExecutor,
+                .add(new GetAggregateFlowStatisticsFromFlowTableForAllFlowsImpl(this, deviceContext, convertorExecutor,
+                    statsCompatXidSeed, notificationPublishService))
+                .add(new GetAllFlowStatisticsFromFlowTableImpl(this, deviceContext, convertorExecutor,
+                    statsCompatXidSeed, notificationPublishService))
+                .add(new GetAllFlowsStatisticsFromAllFlowTablesImpl(this, deviceContext, convertorExecutor,
                         statsCompatXidSeed, notificationPublishService))
-                .put(GetAllFlowStatisticsFromFlowTable.class,
-                    new GetAllFlowStatisticsFromFlowTableImpl(this, deviceContext, convertorExecutor,
-                        statsCompatXidSeed, notificationPublishService))
-                .put(GetAllFlowsStatisticsFromAllFlowTables.class,
-                    new GetAllFlowsStatisticsFromAllFlowTablesImpl(this, deviceContext, convertorExecutor,
-                        statsCompatXidSeed, notificationPublishService))
-                .put(GetFlowStatisticsFromFlowTable.class,
-                    new GetFlowStatisticsFromFlowTableImpl(this, deviceContext, convertorExecutor, statsCompatXidSeed,
-                        notificationPublishService))
+                .add(new GetFlowStatisticsFromFlowTableImpl(this, deviceContext, convertorExecutor, statsCompatXidSeed,
+                    notificationPublishService))
 
                 // register all statistics (deprecated) services
-                .put(GetFlowTablesStatistics.class,
-                    new GetFlowTablesStatisticsImpl(this, deviceContext, compatibilityXidSeed,
-                        notificationPublishService))
-                .put(org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupStatistics.class,
-                    new GetGroupStatisticsImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
-                        convertorExecutor))
-                .put(GetAllGroupStatistics.class,
-                    new GetAllGroupStatisticsImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
-                        convertorExecutor))
-                .put(GetGroupDescription.class,
-                    new GetGroupDescriptionImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
-                        convertorExecutor))
-                .put(GetGroupFeatures.class,
-                    new GetGroupFeaturesImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
-                        convertorExecutor))
-                .put(org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterStatistics.class,
-                    new GetMeterStatisticsImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
-                        convertorExecutor))
-                .put(org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111
-                        .GetAllMeterStatistics.class,
-                    new GetAllMeterStatisticsImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
-                        convertorExecutor))
-                .put(GetAllMeterConfigStatistics.class,
-                    new GetAllMeterConfigStatisticsImpl(this, deviceContext, compatibilityXidSeed,
-                        notificationPublishService, convertorExecutor))
-                .put(GetMeterFeatures.class,
-                    new GetMeterFeaturesImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
-                        convertorExecutor))
-                .put(GetQueueStatisticsFromGivenPort.class,
-                    new GetQueueStatisticsFromGivenPortImpl(this, deviceContext, compatibilityXidSeed,
-                        notificationPublishService))
-                .put(GetAllQueuesStatisticsFromAllPorts.class,
-                    new GetAllQueuesStatisticsFromAllPortsImpl(this, deviceContext, compatibilityXidSeed,
-                        notificationPublishService))
-                .put(GetAllQueuesStatisticsFromGivenPort.class,
-                    new GetAllQueuesStatisticsFromGivenPortImpl(this, deviceContext, compatibilityXidSeed,
-                        notificationPublishService))
-                .put(org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214
-                    .GetNodeConnectorStatistics.class,
-                    new GetNodeConnectorStatisticsImpl(this, deviceContext, compatibilityXidSeed,
-                        notificationPublishService))
-                .put(GetAllNodeConnectorsStatistics.class,
-                    new GetAllNodeConnectorsStatisticsImpl(this, deviceContext, compatibilityXidSeed,
-                        notificationPublishService));
+                .add(new GetFlowTablesStatisticsImpl(this, deviceContext, compatibilityXidSeed,
+                    notificationPublishService))
+                .add(new GetGroupStatisticsImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
+                    convertorExecutor))
+                .add(new GetAllGroupStatisticsImpl(this, deviceContext, compatibilityXidSeed,
+                    notificationPublishService, convertorExecutor))
+                .add(new GetGroupDescriptionImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
+                    convertorExecutor))
+                .add(new GetGroupFeaturesImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
+                    convertorExecutor))
+                .add(new GetMeterStatisticsImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
+                    convertorExecutor))
+                .add(new GetAllMeterStatisticsImpl(this, deviceContext, compatibilityXidSeed,
+                    notificationPublishService, convertorExecutor))
+                .add(new GetAllMeterConfigStatisticsImpl(this, deviceContext, compatibilityXidSeed,
+                    notificationPublishService, convertorExecutor))
+                .add(new GetMeterFeaturesImpl(this, deviceContext, compatibilityXidSeed, notificationPublishService,
+                    convertorExecutor))
+                .add(new GetQueueStatisticsFromGivenPortImpl(this, deviceContext, compatibilityXidSeed,
+                    notificationPublishService))
+                .add(new GetAllQueuesStatisticsFromAllPortsImpl(this, deviceContext, compatibilityXidSeed,
+                    notificationPublishService))
+                .add(new GetAllQueuesStatisticsFromGivenPortImpl(this, deviceContext, compatibilityXidSeed,
+                    notificationPublishService))
+                .add(new GetNodeConnectorStatisticsImpl(this, deviceContext, compatibilityXidSeed,
+                    notificationPublishService))
+                .add(new GetAllNodeConnectorsStatisticsImpl(this, deviceContext, compatibilityXidSeed,
+                    notificationPublishService));
         }
 
         rpcRegistration = rpcProviderRegistry.registerRpcImplementations(builder.build(),

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java
index 392f08facb5e3d2aba96731af4be1da26b05e781..299c8783be3a1d416ea5407d69077bb844eb796e 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImpl.java
@@ -8,7 +8,6 @@
 package org.opendaylight.openflowplugin.impl.statistics;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -33,7 +32,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.GetStatisticsWorkModeOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.StatisticsWorkMode;
 import org.opendaylight.yangtools.concepts.Registration;
-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;
@@ -62,10 +60,8 @@ public final class StatisticsManagerImpl implements StatisticsManager {
         this.executor = executor;
         converterExecutor = convertorExecutor;
         controlServiceRegistration = rpcProviderRegistry.registerRpcImplementations(
-            ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
-            .put(GetStatisticsWorkMode.class, this::getStatisticsWorkMode)
-            .put(ChangeStatisticsWorkMode.class, this::changeStatisticsWorkMode)
-            .build());
+            (GetStatisticsWorkMode) this::getStatisticsWorkMode,
+            (ChangeStatisticsWorkMode) this::changeStatisticsWorkMode);
     }
 
     @VisibleForTesting

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
index 796ce7da595a0d12cbf5335acdc792356514efcf..1555a22c73a0209a3d909e3017150ca8e3005d4f 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
@@ -15,7 +15,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.google.common.collect.ClassToInstanceMap;
+import java.util.Collection;
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
@@ -70,7 +70,7 @@ public class RpcContextImplTest {
     @Mock
     private DeviceFlowRegistry flowRegistry;
     @Captor
-    private ArgumentCaptor<ClassToInstanceMap<Rpc<?, ?>>> captor;
+    private ArgumentCaptor<Collection<Rpc<?, ?>>> captor;
 
     private KeyedInstanceIdentifier<Node, NodeKey> nodeInstanceIdentifier;
     private RpcContextImpl rpcContext;
@@ -161,7 +161,7 @@ public class RpcContextImplTest {
 
     @Test
     public void testInstantiateServiceInstance() {
-        when(rpcProviderRegistry.registerRpcImplementations(any(),
+        when(rpcProviderRegistry.registerRpcImplementations(any(Collection.class),
             eq(Set.of(nodeInstanceIdentifier)))).thenReturn(registration);
         when(deviceContext.getDeviceFlowRegistry()).thenReturn(flowRegistry);
 

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImplTest.java
index 8c458f8855d866eac2752dce2e94cf206aa3307a..f415b93c9e04979a9230464882eded69cd9d55c4 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImplTest.java
@@ -18,7 +18,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,10 +48,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.ChangeStatisticsWorkModeInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.ChangeStatisticsWorkModeOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.GetStatisticsWorkModeOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.StatisticsWorkMode;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.Rpc;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
@@ -100,7 +99,7 @@ public class StatisticsManagerImplTest {
                 .create(Nodes.class)
                 .child(Node.class, new NodeKey(new NodeId("openflow:10")));
 
-        when(rpcProviderRegistry.registerRpcImplementations(any())).thenReturn(serviceControlRegistration);
+        when(rpcProviderRegistry.registerRpcImplementations(any(Rpc[].class))).thenReturn(serviceControlRegistration);
 
         final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
 
@@ -116,7 +115,7 @@ public class StatisticsManagerImplTest {
 
     @Test
     public void testGetStatisticsWorkMode() throws Exception {
-        final Future<RpcResult<GetStatisticsWorkModeOutput>> workMode = statisticsManager.getStatisticsWorkMode(null);
+        final var workMode = statisticsManager.getStatisticsWorkMode(null);
         assertTrue(workMode.isDone());
         assertTrue(workMode.get().isSuccessful());
         assertNotNull(workMode.get().getResult());

diff --git a/parent/pom.xml b/parent/pom.xml
index c0ec87d43e924281140a47bcb1c8d7a2bc9f8539..03837a9d47053ae897e3f9ded95a0d52f664a6b7 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>13.0.0</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 
@@ -41,14 +41,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>9.0.0</version>
+                <version>9.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>6.0.5</version>
+                <version>6.0.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/samples/pom.xml b/samples/pom.xml
index 179cebe98a06acfb33bd8a990420a64ddb58c750..a92a82e7d165e7952fce82bc017c43e799e4fd8d 100644 (file)
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.10</version>
+        <version>13.0.11</version>
         <relativePath/>
     </parent>
 

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestRpcsProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestRpcsProvider.java
index b6cd80ba41e22f6b5005869408ceb2996a69003c..2bb776af382446dd88cdd8200fb782910a37eae7 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestRpcsProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestRpcsProvider.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.test;
 
-import com.google.common.collect.ImmutableClassToInstanceMap;
+import java.util.List;
 import java.util.Set;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
@@ -22,7 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.Rpc;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -40,21 +39,19 @@ public final class OpenflowpluginGroupTestRpcsProvider implements AutoCloseable
     @Inject
     @Activate
     public OpenflowpluginGroupTestRpcsProvider(@Reference final RpcProviderService rpcRegistry) {
-        groupRegistration = rpcRegistry.registerRpcImplementations(ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
-            .put(AddGroup.class, input -> {
+        groupRegistration = rpcRegistry.registerRpcImplementations(List.of(
+            (AddGroup) input -> {
                 LOG.info("addGroup - {}", input);
                 return null;
-            })
-            .put(RemoveGroup.class, input -> {
+            },
+            (RemoveGroup) input -> {
                 LOG.info("removeGroup - {}", input);
                 return null;
-            })
-            .put(UpdateGroup.class, input -> {
+            },
+            (UpdateGroup) input -> {
                 LOG.info("updateGroup - {}", input);
                 return null;
-            })
-            .build(),
-            Set.of(InstanceIdentifier.create(Nodes.class)
+            }), Set.of(InstanceIdentifier.create(Nodes.class)
                 .child(Node.class, new NodeKey(new NodeId(OpenflowpluginTestActivator.NODE_ID)))));
         LOG.info("SalGroupRpcsProvider Started.");
     }

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestRpcsProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestRpcsProvider.java
index ac1d839f079b234502edee1f269cc2b04480ff76..0d24648968702bf8760b1c35f485d53e8ae9ea51 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestRpcsProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestRpcsProvider.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.test;
 
-import com.google.common.collect.ImmutableClassToInstanceMap;
+import java.util.List;
 import java.util.Set;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
@@ -22,7 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.Rem
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeter;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.Rpc;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -40,21 +39,19 @@ public final class OpenflowpluginMeterTestRpcsProvider implements AutoCloseable
     @Inject
     @Activate
     public OpenflowpluginMeterTestRpcsProvider(@Reference final RpcProviderService rpcRegistry) {
-        meterRegistration = rpcRegistry.registerRpcImplementations(ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
-            .put(RemoveMeter.class, input -> {
+        meterRegistration = rpcRegistry.registerRpcImplementations(List.of(
+            (RemoveMeter) input -> {
                 LOG.info("removeMeter - {}", input);
                 return null;
-            })
-            .put(AddMeter.class, input -> {
+            },
+            (AddMeter) input -> {
                 LOG.info("addMeter - {}", input);
                 return null;
-            })
-            .put(UpdateMeter.class, input -> {
+            },
+            (UpdateMeter) input -> {
                 LOG.info("updateMeter - {}", input);
                 return null;
-            })
-            .build(),
-            Set.of(InstanceIdentifier.create(Nodes.class)
+            }), Set.of(InstanceIdentifier.create(Nodes.class)
                 .child(Node.class, new NodeKey(new NodeId(OpenflowpluginTestActivator.NODE_ID)))));
         LOG.info("SalMeterRpcsProvider Started.");
     }

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestRpcProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestRpcProvider.java
index f2307a4ebe1f2b7d6a30cb2903b44dd619887433..2725c293f112c00dbfdf3611f53baeb3fc33f6de 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestRpcProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestRpcProvider.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.openflowplugin.test;
 
-import com.google.common.collect.ImmutableClassToInstanceMap;
+import java.util.List;
 import java.util.Set;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
@@ -22,7 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.Rpc;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -40,21 +39,19 @@ public final class OpenflowpluginTestRpcProvider implements AutoCloseable {
     @Inject
     @Activate
     public OpenflowpluginTestRpcProvider(@Reference final RpcProviderService rpcRegistry) {
-        flowRegistration = rpcRegistry.registerRpcImplementations(ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
-            .put(AddFlow.class, input -> {
+        flowRegistration = rpcRegistry.registerRpcImplementations(List.of(
+            (AddFlow) input -> {
                 LOG.info("addFlow - {}", input);
                 return null;
-            })
-            .put(RemoveFlow.class, input -> {
+            },
+            (RemoveFlow) input -> {
                 LOG.info("removeFlow - {}", input);
                 return null;
-            })
-            .put(UpdateFlow.class, input -> {
+            },
+            (UpdateFlow) input -> {
                 LOG.info("updateFlow - {}", input);
                 return null;
-            })
-            .build(),
-            Set.of(InstanceIdentifier.create(Nodes.class)
+            }), Set.of(InstanceIdentifier.create(Nodes.class)
                 .child(Node.class, new NodeKey(new NodeId(OpenflowpluginTestActivator.NODE_ID)))));
     }