Migrate SchemaService references

SchemaService is deprecated in favor of DOMSchemaService, migrate
references.

Change-Id: I8ba2ff0b4f676fc47e3069a9bdb79078c17fe61f
Signed-off-by: Robert Varga <nite@hq.sk>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java
index f3bd0a7b7fb38f7d14180f6a5189445c69db5ca1..451c61b6bcac9a3d8d5425a3d70fbf3ded970253 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java
@@ -19,8 +19,8 @@ import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipS
 import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipState;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.ovsdb.hwvtepsouthbound.reconciliation.configuration.HwvtepReconciliationManager;
 import org.opendaylight.ovsdb.hwvtepsouthbound.transactions.md.TransactionInvoker;
 import org.opendaylight.ovsdb.hwvtepsouthbound.transactions.md.TransactionInvokerImpl;
@@ -59,7 +59,7 @@ public class HwvtepSouthboundProvider implements AutoCloseable {
     public HwvtepSouthboundProvider(final DataBroker dataBroker,
             final EntityOwnershipService entityOwnershipServiceDependency,
             final OvsdbConnection ovsdbConnection,
-            final SchemaService schemaService,
+            final DOMSchemaService schemaService,
             final BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer) {
         this.db = dataBroker;
         this.entityOwnershipService = entityOwnershipServiceDependency;

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/InstanceIdentifierCodec.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/InstanceIdentifierCodec.java
index 35ac6ac9650dcc7e018c9abb0c24e7d45e43131f..7cab110a2132b463d1d20ddaf8f49cca3bd1e03e 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/InstanceIdentifierCodec.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/InstanceIdentifierCodec.java
@@ -10,8 +10,8 @@ package org.opendaylight.ovsdb.hwvtepsouthbound;
 
 import java.net.URI;
 
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException;
@@ -28,7 +28,7 @@ public class InstanceIdentifierCodec extends AbstractModuleStringInstanceIdentif
     private SchemaContext context;
     private BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer;
 
-    public InstanceIdentifierCodec(SchemaService schemaService,
+    public InstanceIdentifierCodec(DOMSchemaService schemaService,
             BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer) {
         schemaService.registerSchemaContextListener(this);
         this.bindingNormalizedNodeSerializer = bindingNormalizedNodeSerializer;

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/resources/org/opendaylight/blueprint/hwvtepsouthbound.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/resources/org/opendaylight/blueprint/hwvtepsouthbound.xml
index a01833cd8d9f4ed8460ec4753fbfff520c3a320d..357b09efb26a2bdecfc7b0f11403efbd58c49fcc 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/resources/org/opendaylight/blueprint/hwvtepsouthbound.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/resources/org/opendaylight/blueprint/hwvtepsouthbound.xml
@@ -10,7 +10,7 @@
     interface="org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService" />
   <reference id="ovsdbConnection" interface="org.opendaylight.ovsdb.lib.OvsdbConnection" />
   <reference id="schemaService"
-    interface="org.opendaylight.controller.sal.core.api.model.SchemaService" />
+    interface="org.opendaylight.mdsal.dom.api.DOMSchemaService" />
   <reference id="bindingNormalizedNodeSerializer"
     interface="org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer" />
 

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java
index fce7dae43677ff240c584c1eda7f3a72b2155508..8186b46ce9d9aae11bad72930b99e709a1e27ca8 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java
@@ -10,8 +10,8 @@ package org.opendaylight.ovsdb.southbound;
 
 import java.net.URI;
 
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException;
@@ -32,7 +32,7 @@ public class InstanceIdentifierCodec extends AbstractModuleStringInstanceIdentif
     private SchemaContext context;
     private BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer;
 
-    public InstanceIdentifierCodec(SchemaService schemaService,
+    public InstanceIdentifierCodec(DOMSchemaService schemaService,
             BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer) {
         schemaService.registerSchemaContextListener(this);
         this.bindingNormalizedNodeSerializer = bindingNormalizedNodeSerializer;

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java
index b5ae74689073f76c7df9d2cb6536d76e337475c8..da4ba82edafee6c0985f6db478d2d07bbdc4aebd 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java
@@ -23,8 +23,8 @@ import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipS
 import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipState;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.ovsdb.lib.OvsdbConnection;
 import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvoker;
 import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvokerImpl;
@@ -59,7 +59,7 @@ public class SouthboundProvider implements AutoCloseable {
     public SouthboundProvider(final DataBroker dataBroker,
             final EntityOwnershipService entityOwnershipServiceDependency,
             final OvsdbConnection ovsdbConnection,
-            final SchemaService schemaService,
+            final DOMSchemaService schemaService,
             final BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer) {
         this.db = dataBroker;
         this.entityOwnershipService = entityOwnershipServiceDependency;
@@ -191,4 +191,4 @@ public class SouthboundProvider implements AutoCloseable {
             SouthboundConstants.SKIP_COLUMN_FROM_TABLE.get("Manager").remove("status");
         }
     }
-}
\ No newline at end of file
+}

diff --git a/southbound/southbound-impl/src/main/resources/org/opendaylight/blueprint/southbound.xml b/southbound/southbound-impl/src/main/resources/org/opendaylight/blueprint/southbound.xml
index 824570c96a3c89e341ac3c3038f5093b2f8e6c89..c1a510a9f1bd2f68020d42f4d329d19f424aa73a 100644 (file)
--- a/southbound/southbound-impl/src/main/resources/org/opendaylight/blueprint/southbound.xml
+++ b/southbound/southbound-impl/src/main/resources/org/opendaylight/blueprint/southbound.xml
@@ -11,7 +11,7 @@
     interface="org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService" />
   <reference id="ovsdbConnection" interface="org.opendaylight.ovsdb.lib.OvsdbConnection" />
   <reference id="schemaService"
-    interface="org.opendaylight.controller.sal.core.api.model.SchemaService" />
+    interface="org.opendaylight.mdsal.dom.api.DOMSchemaService" />
   <reference id="bindingNormalizedNodeSerializer"
     interface="org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer" />
 

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodecTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodecTest.java
index c9765266b7654e75dfa06b91ff7a7ad133434f89..3539daed1650e5c50156cc39f8ffd474f1c8631e 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodecTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodecTest.java
@@ -25,8 +25,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.util.AbstractModuleStringInstanceIdentifierCodec;
@@ -49,7 +49,7 @@ public class InstanceIdentifierCodecTest {
     @Mock
     private BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer;
     @Mock
-    private SchemaService schemaService;
+    private DOMSchemaService schemaService;
 
     @Before
     public void setUp() throws IllegalArgumentException, IllegalAccessException {

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java
index e89a7b886fa5838cd790c894490f8cd178522f7e..227ceee5d2e7f5327c1df2c15796671df31fbdef 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java
@@ -33,8 +33,8 @@ import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipS
 import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipState;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.ovsdb.lib.OvsdbConnection;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
@@ -65,7 +65,7 @@ public class SouthboundProviderTest extends AbstractDataBrokerTest {
                 getDataBroker(),
                 entityOwnershipService,
                 Mockito.mock(OvsdbConnection.class),
-                Mockito.mock(SchemaService.class),
+                Mockito.mock(DOMSchemaService.class),
                 Mockito.mock(BindingNormalizedNodeSerializer.class))) {
 
             // Initiate the session
@@ -90,7 +90,7 @@ public class SouthboundProviderTest extends AbstractDataBrokerTest {
                 getDataBroker(),
                 entityOwnershipService,
                 Mockito.mock(OvsdbConnection.class),
-                Mockito.mock(SchemaService.class),
+                Mockito.mock(DOMSchemaService.class),
                 Mockito.mock(BindingNormalizedNodeSerializer.class))) {
 
             // Initiate the session
@@ -117,7 +117,7 @@ public class SouthboundProviderTest extends AbstractDataBrokerTest {
                 getDataBroker(),
                 entityOwnershipService,
                 Mockito.mock(OvsdbConnection.class),
-                Mockito.mock(SchemaService.class),
+                Mockito.mock(DOMSchemaService.class),
                 Mockito.mock(BindingNormalizedNodeSerializer.class))) {
 
             southboundProvider.init();
@@ -139,7 +139,7 @@ public class SouthboundProviderTest extends AbstractDataBrokerTest {
                 getDataBroker(),
                 entityOwnershipService,
                 Mockito.mock(OvsdbConnection.class),
-                Mockito.mock(SchemaService.class),
+                Mockito.mock(DOMSchemaService.class),
                 Mockito.mock(BindingNormalizedNodeSerializer.class))) {
 
             southboundProvider.init();
@@ -169,4 +169,4 @@ public class SouthboundProviderTest extends AbstractDataBrokerTest {
                     topologyIid).checkedGet().isPresent());
         }
     }
-}
\ No newline at end of file
+}