X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fblueprint%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fblueprint%2Fext%2FDataStoreAppConfigDefaultXMLReader.java;h=c1474929551c25e64f4998f926ee0b4e0407b29d;hb=e84f63ee098fff5b02cbce1281ca0d1208f966fa;hp=ece690112a0d2b519f789dfd6bdd968cf5a04899;hpb=12e42f62ff55faf841cc4f18759b5e08a26f104f;p=controller.git 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 ece690112a..c147492955 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 @@ -7,25 +7,26 @@ */ package org.opendaylight.controller.blueprint.ext; -import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.io.Resources; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; import java.net.URL; +import java.util.Optional; import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamException; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.binding.DataObject; -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.opendaylight.yangtools.yang.model.api.SchemaTreeInference; +import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement; +import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; @@ -52,8 +53,8 @@ public class DataStoreAppConfigDefaultXMLReader { @FunctionalInterface public interface FallbackConfigProvider { - NormalizedNode get(SchemaContext schemaContext, DataSchemaNode dataSchema) throws IOException, - XMLStreamException, ParserConfigurationException, SAXException, URISyntaxException; + NormalizedNode get(SchemaTreeInference dataSchema) + throws IOException, XMLStreamException, ParserConfigurationException, SAXException, URISyntaxException; } @FunctionalInterface @@ -94,9 +95,9 @@ public class DataStoreAppConfigDefaultXMLReader { public T createDefaultInstance() throws ConfigXMLReaderException, ParserConfigurationException, XMLStreamException, IOException, SAXException, URISyntaxException { - return createDefaultInstance((schemaContext, dataSchema) -> { - throw new IllegalArgumentException("Failed to read XML " - + "(not creating model from defaults as runtime would, for better clarity in tests)"); + return createDefaultInstance(dataSchema -> { + throw new IllegalArgumentException( + "Failed to read XML (not creating model from defaults as runtime would, for better clarity in tests)"); }); } @@ -110,23 +111,28 @@ 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.findModuleByNamespaceAndRevision(bindingContext.bindingQName.getNamespace(), - bindingContext.bindingQName.getRevision()); + Module module = schemaContext.findModule(bindingContext.bindingQName.getModule()).orElse(null); checkNotNull(module, "%s: Could not obtain the module schema for namespace %s, revision %s", logName, bindingContext.bindingQName.getNamespace(), bindingContext.bindingQName.getRevision()); - DataSchemaNode dataSchema = module.getDataChildByName(bindingContext.bindingQName); - checkNotNull(dataSchema, "%s: Could not obtain the schema for %s", logName, bindingContext.bindingQName); + final SchemaInferenceStack schemaStack = SchemaInferenceStack.of(schemaContext); + final SchemaTreeEffectiveStatement dataSchema; + try { + dataSchema = schemaStack.enterSchemaTree(bindingContext.bindingQName); + } catch (IllegalArgumentException e) { + throw new ConfigXMLReaderException( + logName + ": Could not obtain the schema for " + bindingContext.bindingQName, e); + } - checkCondition(bindingContext.schemaType.isAssignableFrom(dataSchema.getClass()), + checkCondition(bindingContext.schemaType.isInstance(dataSchema), "%s: Expected schema type %s for %s but actual type is %s", logName, bindingContext.schemaType, bindingContext.bindingQName, dataSchema.getClass()); - NormalizedNode dataNode = parsePossibleDefaultAppConfigXMLFile(schemaContext, dataSchema); + NormalizedNode dataNode = parsePossibleDefaultAppConfigXMLFile(schemaStack); if (dataNode == null) { - dataNode = fallback.get(schemaService.getGlobalContext(), dataSchema); + dataNode = fallback.get(schemaStack.toSchemaTreeInference()); } DataObject appConfig = bindingSerializer.fromNormalizedNode(yangPath, dataNode).getValue(); @@ -138,24 +144,24 @@ public class DataStoreAppConfigDefaultXMLReader { return (T) appConfig; } - private static void checkNotNull(Object reference, String errorMessageFormat, Object... formatArgs) - throws ConfigXMLReaderException { + private static void checkNotNull(final Object reference, final String errorMessageFormat, + final Object... formatArgs) throws ConfigXMLReaderException { checkCondition(reference != null, errorMessageFormat, formatArgs); } - private static void checkCondition(boolean expression, String errorMessageFormat, Object... formatArgs) - throws ConfigXMLReaderException { + private static void checkCondition(final boolean expression, final String errorMessageFormat, + final Object... formatArgs) throws ConfigXMLReaderException { if (!expression) { throw new ConfigXMLReaderException(String.format(errorMessageFormat, formatArgs)); } } - private NormalizedNode parsePossibleDefaultAppConfigXMLFile(final SchemaContext schemaContext, - final DataSchemaNode dataSchema) throws ConfigXMLReaderException { - + private NormalizedNode parsePossibleDefaultAppConfigXMLFile(final SchemaInferenceStack schemaStack) + throws ConfigXMLReaderException { String appConfigFileName = defaultAppConfigFileName; if (Strings.isNullOrEmpty(appConfigFileName)) { - String moduleName = findYangModuleName(bindingContext.bindingQName, schemaContext); + String moduleName = schemaStack.currentModule().argument().getLocalName(); + appConfigFileName = moduleName + "_" + bindingContext.bindingQName.getLocalName() + ".xml"; } @@ -173,8 +179,8 @@ public class DataStoreAppConfigDefaultXMLReader { URL url = optionalURL.get(); try (InputStream is = url.openStream()) { Document root = UntrustedXML.newDocumentBuilder().parse(is); - NormalizedNode dataNode = bindingContext.parseDataElement(root.getDocumentElement(), dataSchema, - schemaContext); + NormalizedNode dataNode = bindingContext.parseDataElement(root.getDocumentElement(), + schemaStack.toSchemaTreeInference()); LOG.debug("{}: Parsed data node: {}", logName, dataNode); @@ -186,16 +192,4 @@ public class DataStoreAppConfigDefaultXMLReader { throw new ConfigXMLReaderException(msg, e); } } - - private String findYangModuleName(final QName qname, final SchemaContext schemaContext) - throws ConfigXMLReaderException { - for (Module m : schemaContext.getModules()) { - if (qname.getModule().equals(m.getQNameModule())) { - return m.getName(); - } - } - throw new ConfigXMLReaderException( - String.format("%s: Could not find yang module for QName %s", logName, qname)); - } - }