From 4048ef98e8c5a115307f53c7f314d945f2c76653 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 12 Jun 2017 15:12:52 +0200 Subject: [PATCH] Adjust to EffectiveSchemaContext movement This code depends directly on parser internals. Adjust the import, but really this should be fixed by subclassing AbstractSchemaContext from yang-model-util. Change-Id: I57c84ec7e721bf0bd1e6a6eef1d8ccd0562f8b74 Signed-off-by: Robert Varga --- .../opendaylight/netconf/sal/restconf/impl/RestconfImpl.java | 3 ++- .../base/services/impl/RestconfOperationsServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java index 7e2c173703..7c4a7d5084 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java @@ -106,7 +106,7 @@ import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; +import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveSchemaContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -383,6 +383,7 @@ public class RestconfImpl implements RestconfService { neededModules.forEach(imp -> fakeModules.add(new FakeImportedModule(imp))); fakeModules.add(new FakeRestconfModule(neededModules, fakeCont)); + // FIXME: use a separate sublcass of AbstractSchemaContext final SchemaContext fakeSchemaCtx = EffectiveSchemaContext.resolveSchemaContext(ImmutableSet.copyOf(fakeModules)); final InstanceIdentifierContext instanceIdentifierContext = diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceImpl.java index 5e9f088867..62fc11e92b 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceImpl.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceImpl.java @@ -35,7 +35,7 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; +import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveSchemaContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -129,6 +129,7 @@ public class RestconfOperationsServiceImpl implements RestconfOperationsService neededModules.forEach(imp -> fakeModules.add(new FakeImportedModule(imp))); fakeModules.add(new FakeRestconfModule(neededModules, fakeCont)); + // FIXME: use a separate sublcass of AbstractSchemaContext final SchemaContext fakeSchemaCtx = EffectiveSchemaContext.resolveSchemaContext(ImmutableSet.copyOf(fakeModules)); final InstanceIdentifierContext instanceIdentifierContext = -- 2.36.6