Add explicit getExtensions() 60/73960/1
authorRobert Varga <robert.varga@pantheon.tech>
Wed, 11 Jul 2018 22:23:11 +0000 (00:23 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Wed, 11 Jul 2018 22:24:52 +0000 (00:24 +0200)
getExtensions() will become a mandatory method, make sure we are
ready for that.

Change-Id: Idca41be7d2a14c836345ea5d4b77857f6bbeca76
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/SchemaServiceStub.java
netconf/netconf-console/src/test/java/org/opendaylight/netconf/console/impl/NetconfCommandsImplTest.java
netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceTopologyAdapterTest.java
netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java

index e1780478f18313a1a7d93e402f4f9bbd627ee555..b7bee9978423ca2835177cb8b6d772208462f85d 100644 (file)
@@ -7,7 +7,10 @@
  */
 package org.opendaylight.netconf.mdsal.connector.ops;
 
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
 import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
@@ -41,4 +44,9 @@ final class SchemaServiceStub implements DOMSchemaService {
             }
         };
     }
+
+    @Override
+    public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
+        return ImmutableClassToInstanceMap.of();
+    }
 }
index 89ce7718b52f9db6b21fce792702080774eacaab..8837088abc8259db299d41b07de0d00411d8c6fd 100644 (file)
@@ -14,6 +14,8 @@ import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.ArrayList;
@@ -45,6 +47,7 @@ import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
 import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.generator.util.JavassistUtils;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
 import org.opendaylight.netconf.console.utils.NetconfConsoleConstants;
 import org.opendaylight.netconf.console.utils.NetconfConsoleUtils;
 import org.opendaylight.netconf.console.utils.NetconfIidFactory;
@@ -314,6 +317,11 @@ public class NetconfCommandsImplTest {
                     }
                 };
             }
+
+            @Override
+            public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
+                return ImmutableClassToInstanceMap.of();
+            }
         };
     }
 }
index d5cd4af37f4cc96d4b3d27e824bcc3cff894b3cc..f442e475d50397eccfb9539c4cb0a61a392fff0a 100644 (file)
@@ -16,6 +16,8 @@ import static org.mockito.Mockito.verify;
 import static org.opendaylight.mdsal.common.api.CommitInfo.emptyFluentFuture;
 
 import com.google.common.base.Optional;
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.net.InetSocketAddress;
 import java.util.EnumMap;
@@ -47,6 +49,7 @@ import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
 import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.generator.util.JavassistUtils;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
 import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfDeviceCapabilities;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
@@ -248,6 +251,11 @@ public class NetconfDeviceTopologyAdapterTest {
                     }
                 };
             }
+
+            @Override
+            public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
+                return ImmutableClassToInstanceMap.of();
+            }
         };
     }
 
index 660f67fe80938af1899d500a777e66fb3afbdaf1..eb2f93f1ac2557344183fbebd1bb66fc4c41534c 100644 (file)
@@ -8,6 +8,8 @@
 
 package org.opendaylight.netconf.test.tool;
 
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -24,6 +26,7 @@ import org.opendaylight.controller.md.sal.dom.broker.impl.SerializedDOMDataBroke
 import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory;
 import org.opendaylight.controller.sal.core.spi.data.DOMStore;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
 import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.monitoring.CapabilityListener;
 import org.opendaylight.netconf.impl.SessionIdProvider;
@@ -250,6 +253,11 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
                         }
                     };
                 }
+
+                @Override
+                public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
+                    return ImmutableClassToInstanceMap.of();
+                }
             };
         }
     }