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;h=9b55b360d66bab09a531e0174c3ad5fa7166d2d2;hp=2d24c2146394b4d2421ef8687a6e58426090c03b;hb=6f3281a884977f857217b0d2b40a84fb70483fec;hpb=d8be13e36b4a5fca3155e7ab3e840ba9ab5a75b1 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 2d24c21463..9b55b360d6 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,21 +7,22 @@ */ 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 org.opendaylight.controller.sal.core.api.model.SchemaService; +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.data.impl.codec.xml.XmlUtils; -import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.parser.DomToNormalizedNodeParserFactory; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -44,14 +45,15 @@ public class DataStoreAppConfigDefaultXMLReader { private final String logName; private final String defaultAppConfigFileName; - private final SchemaService schemaService; + private final DOMSchemaService schemaService; private final BindingNormalizedNodeSerializer bindingSerializer; private final BindingContext bindingContext; private final ConfigURLProvider inputStreamProvider; @FunctionalInterface public interface FallbackConfigProvider { - NormalizedNode get(SchemaContext schemaContext, DataSchemaNode dataSchema); + NormalizedNode get(SchemaContext schemaContext, DataSchemaNode dataSchema) throws IOException, + XMLStreamException, ParserConfigurationException, SAXException, URISyntaxException; } @FunctionalInterface @@ -62,7 +64,7 @@ public class DataStoreAppConfigDefaultXMLReader { public DataStoreAppConfigDefaultXMLReader( final String logName, final String defaultAppConfigFileName, - final SchemaService schemaService, + final DOMSchemaService schemaService, final BindingNormalizedNodeSerializer bindingSerializer, final BindingContext bindingContext, final ConfigURLProvider inputStreamProvider) { @@ -78,7 +80,7 @@ public class DataStoreAppConfigDefaultXMLReader { public DataStoreAppConfigDefaultXMLReader( final Class testClass, final String defaultAppConfigFileName, - final SchemaService schemaService, + final DOMSchemaService schemaService, final BindingNormalizedNodeSerializer bindingSerializer, final Class klass) { this(testClass.getName(), defaultAppConfigFileName, schemaService, bindingSerializer, @@ -90,7 +92,8 @@ public class DataStoreAppConfigDefaultXMLReader { return Resources.getResource(testClass, defaultAppConfigFileName); } - public T createDefaultInstance() throws ConfigXMLReaderException { + 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)"); @@ -98,39 +101,27 @@ public class DataStoreAppConfigDefaultXMLReader { } @SuppressWarnings("unchecked") - public T createDefaultInstance(final FallbackConfigProvider fallback) throws ConfigXMLReaderException { + public T createDefaultInstance(final FallbackConfigProvider fallback) throws ConfigXMLReaderException, + URISyntaxException, ParserConfigurationException, XMLStreamException, SAXException, IOException { YangInstanceIdentifier yangPath = bindingSerializer.toYangInstanceIdentifier(bindingContext.appConfigPath); LOG.debug("{}: Creating app config instance from path {}, Qname: {}", logName, yangPath, bindingContext.bindingQName); - if (schemaService == null) { - throw new ConfigXMLReaderException( - String.format("%s: Could not obtain the SchemaService OSGi service", logName)); - } + checkNotNull(schemaService, "%s: Could not obtain the SchemaService OSGi service", logName); SchemaContext schemaContext = schemaService.getGlobalContext(); - Module module = schemaContext.findModuleByNamespaceAndRevision(bindingContext.bindingQName.getNamespace(), - bindingContext.bindingQName.getRevision()); - if (module == null) { - throw new ConfigXMLReaderException( - String.format("%s: Could not obtain the module schema for namespace %s, revision %s", - logName, 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); - if (dataSchema == null) { - throw new ConfigXMLReaderException( - String.format("%s: Could not obtain the schema for %s", logName, - bindingContext.bindingQName)); - } + checkNotNull(dataSchema, "%s: Could not obtain the schema for %s", logName, bindingContext.bindingQName); - if (!bindingContext.schemaType.isAssignableFrom(dataSchema.getClass())) { - throw new ConfigXMLReaderException( - String.format("%s: Expected schema type %s for %s but actual type is %s", logName, - bindingContext.schemaType, bindingContext.bindingQName, dataSchema.getClass())); - } + checkCondition(bindingContext.schemaType.isAssignableFrom(dataSchema.getClass()), + "%s: Expected schema type %s for %s but actual type is %s", logName, + bindingContext.schemaType, bindingContext.bindingQName, dataSchema.getClass()); NormalizedNode dataNode = parsePossibleDefaultAppConfigXMLFile(schemaContext, dataSchema); if (dataNode == null) { @@ -138,13 +129,23 @@ public class DataStoreAppConfigDefaultXMLReader { } DataObject appConfig = bindingSerializer.fromNormalizedNode(yangPath, dataNode).getValue(); - if (appConfig == null) { - // This shouldn't happen but need to handle it in case... - throw new ConfigXMLReaderException( - String.format("%s: Could not create instance for app config binding %s", - logName, bindingContext.appConfigBindingClass)); - } else { - return (T) appConfig; + + // This shouldn't happen but need to handle it in case... + checkNotNull(appConfig, "%s: Could not create instance for app config binding %s", logName, + bindingContext.appConfigBindingClass); + + return (T) appConfig; + } + + private static void checkNotNull(final Object reference, final String errorMessageFormat, + final Object... formatArgs) throws ConfigXMLReaderException { + checkCondition(reference != null, errorMessageFormat, formatArgs); + } + + private static void checkCondition(final boolean expression, final String errorMessageFormat, + final Object... formatArgs) throws ConfigXMLReaderException { + if (!expression) { + throw new ConfigXMLReaderException(String.format(errorMessageFormat, formatArgs)); } } @@ -157,9 +158,6 @@ public class DataStoreAppConfigDefaultXMLReader { appConfigFileName = moduleName + "_" + bindingContext.bindingQName.getLocalName() + ".xml"; } - final DomToNormalizedNodeParserFactory parserFactory = DomToNormalizedNodeParserFactory.getInstance( - XmlUtils.DEFAULT_XML_CODEC_PROVIDER, schemaContext); - Optional optionalURL; try { optionalURL = inputStreamProvider.getURL(appConfigFileName); @@ -175,12 +173,13 @@ public class DataStoreAppConfigDefaultXMLReader { try (InputStream is = url.openStream()) { Document root = UntrustedXML.newDocumentBuilder().parse(is); NormalizedNode dataNode = bindingContext.parseDataElement(root.getDocumentElement(), dataSchema, - parserFactory); + schemaContext); LOG.debug("{}: Parsed data node: {}", logName, dataNode); return dataNode; - } catch (SAXException | IOException e) { + } catch (final IOException | SAXException | XMLStreamException | ParserConfigurationException + | URISyntaxException e) { String msg = String.format("%s: Could not read/parse app config %s", logName, url); LOG.error(msg, e); throw new ConfigXMLReaderException(msg, e);