X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fblueprint%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fblueprint%2Fext%2FDataStoreAppConfigDefaultXMLReader.java;fp=opendaylight%2Fblueprint%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fblueprint%2Fext%2FDataStoreAppConfigDefaultXMLReader.java;h=4f8140eaa657b5a2ae64926ca25fc355b2e2ed65;hp=9b55b360d66bab09a531e0174c3ad5fa7166d2d2;hb=777369cef6668a427d27ddad1797728417ea4fd2;hpb=21b4ad7390d58ce9b88fa0a61779cfffc39e62fa diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java index 9b55b360d6..4f8140eaa6 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java @@ -24,6 +24,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.slf4j.Logger; @@ -52,7 +53,7 @@ public class DataStoreAppConfigDefaultXMLReader { @FunctionalInterface public interface FallbackConfigProvider { - NormalizedNode get(SchemaContext schemaContext, DataSchemaNode dataSchema) throws IOException, + NormalizedNode get(EffectiveModelContext schemaContext, DataSchemaNode dataSchema) throws IOException, XMLStreamException, ParserConfigurationException, SAXException, URISyntaxException; } @@ -110,7 +111,7 @@ public class DataStoreAppConfigDefaultXMLReader { checkNotNull(schemaService, "%s: Could not obtain the SchemaService OSGi service", logName); - SchemaContext schemaContext = schemaService.getGlobalContext(); + EffectiveModelContext schemaContext = schemaService.getGlobalContext(); Module module = schemaContext.findModule(bindingContext.bindingQName.getModule()).orElse(null); checkNotNull(module, "%s: Could not obtain the module schema for namespace %s, revision %s", @@ -149,7 +150,7 @@ public class DataStoreAppConfigDefaultXMLReader { } } - private NormalizedNode parsePossibleDefaultAppConfigXMLFile(final SchemaContext schemaContext, + private NormalizedNode parsePossibleDefaultAppConfigXMLFile(final EffectiveModelContext schemaContext, final DataSchemaNode dataSchema) throws ConfigXMLReaderException { String appConfigFileName = defaultAppConfigFileName;