diff options
| author |   Michal Cmarada <michal.cmarada@pantheon.tech> | 2018-09-25 11:15:35 +0200 |
|---|---|---|
| committer | Michal Cmarada <michal.cmarada@pantheon.tech> | 2018-09-25 11:22:18 +0200 |
| commit | 556a0f59abc9b09005d40945bc20948d69e4f98e (patch) | |
| tree | 76d795ae59aba49521fc4fdc7d65062c946147be /infra/cfg-init | |
| parent | 46bcceb927b1bce07c1c9517f45470703293eb84 (diff) | |
Bump ODL dependencies to Fluorine (HONEYCOMB-433)
Change-Id: I142ebd2899272feff00abe7d4bae708f093ee3ec
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
Diffstat (limited to 'infra/cfg-init')
| -rw-r--r-- | infra/cfg-init/src/main/java/io/fd/honeycomb/data/init/RestoringInitializer.java | 8 | ||||
| -rw-r--r-- | infra/cfg-init/src/test/java/io/fd/honeycomb/data/init/RestoringInitializerTest.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/infra/cfg-init/src/main/java/io/fd/honeycomb/data/init/RestoringInitializer.java b/infra/cfg-init/src/main/java/io/fd/honeycomb/data/init/RestoringInitializer.java index eaca0deba..4488f8342 100644 --- a/infra/cfg-init/src/main/java/io/fd/honeycomb/data/init/RestoringInitializer.java +++ b/infra/cfg-init/src/main/java/io/fd/honeycomb/data/init/RestoringInitializer.java @@ -29,7 +29,7 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.controller.sal.core.api.model.SchemaService; +import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; @@ -41,14 +41,14 @@ public class RestoringInitializer implements DataTreeInitializer { private static final Logger LOG = LoggerFactory.getLogger(RestoringInitializer.class); - private final SchemaService schemaService; + private final DOMSchemaService schemaService; private final Path path; private final DOMDataBroker dataTree; private final RestorationType restorationType; private final LogicalDatastoreType datastoreType; private final JsonReader jsonReader; - public RestoringInitializer(@Nonnull final SchemaService schemaService, + public RestoringInitializer(@Nonnull final DOMSchemaService schemaService, @Nonnull final Path path, @Nonnull final DOMDataBroker dataTree, @Nonnull final RestorationType restorationType, @@ -62,7 +62,7 @@ public class RestoringInitializer implements DataTreeInitializer { this.jsonReader = jsonReader; } - public RestoringInitializer(@Nonnull final SchemaService schemaService, + public RestoringInitializer(@Nonnull final DOMSchemaService schemaService, @Nonnull final Path path, @Nonnull final DOMDataBroker dataTree, @Nonnull final RestorationType restorationType, diff --git a/infra/cfg-init/src/test/java/io/fd/honeycomb/data/init/RestoringInitializerTest.java b/infra/cfg-init/src/test/java/io/fd/honeycomb/data/init/RestoringInitializerTest.java index 85ecc6c4e..3aeb6895b 100644 --- a/infra/cfg-init/src/test/java/io/fd/honeycomb/data/init/RestoringInitializerTest.java +++ b/infra/cfg-init/src/test/java/io/fd/honeycomb/data/init/RestoringInitializerTest.java @@ -34,7 +34,7 @@ import org.mockito.MockitoAnnotations; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.controller.sal.core.api.model.SchemaService; +import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; @@ -43,7 +43,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; public class RestoringInitializerTest { @Mock - private SchemaService schemaService; + private DOMSchemaService schemaService; @Mock private SchemaContext schemaContext; @Mock |