Update yang-parser-api

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / impl / YangParserImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
index 96cf732733a7c3559d84672d56e72390a0fbd038..ce720b814857fdfcd777bdb01beb35c4494c78f0 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
@@ -9,13 +9,11 @@ package org.opendaylight.yangtools.yang.parser.impl;
 
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.SetMultimap;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-import javax.xml.transform.TransformerException;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
@@ -25,33 +23,13 @@ import org.opendaylight.yangtools.yang.model.parser.api.YangParser;
 import org.opendaylight.yangtools.yang.model.parser.api.YangParserException;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
 import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation;
-import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
-import org.opendaylight.yangtools.yang.model.repo.api.YinDomSchemaSource;
-import org.opendaylight.yangtools.yang.model.repo.api.YinTextSchemaSource;
-import org.opendaylight.yangtools.yang.model.repo.api.YinXmlSchemaSource;
-import org.opendaylight.yangtools.yang.parser.rfc7950.ir.IRSchemaSource;
-import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangStatementStreamSource;
-import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YinStatementStreamSource;
-import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YinTextToDomTransformer;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
-import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
-import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction;
-import org.xml.sax.SAXException;
 
+@Deprecated(since = "7.0.0", forRemoval = true)
 final class YangParserImpl implements YangParser {
-    private static final @NonNull Collection<Class<? extends SchemaSourceRepresentation>> REPRESENTATIONS =
-            ImmutableList.of(IRSchemaSource.class, YangTextSchemaSource.class, YinDomSchemaSource.class,
-                YinXmlSchemaSource.class, YinTextSchemaSource.class);
+    private final org.opendaylight.yangtools.yang.parser.api.YangParser delegate;
 
-    private final BuildAction buildAction;
-
-    YangParserImpl(final BuildAction buildAction) {
-        this.buildAction = requireNonNull(buildAction);
-    }
-
-    @Override
-    public @NonNull Collection<Class<? extends SchemaSourceRepresentation>> supportedSourceRepresentations() {
-        return REPRESENTATIONS;
+    YangParserImpl(final org.opendaylight.yangtools.yang.parser.api.YangParser yangParser) {
+        this.delegate = requireNonNull(yangParser);
     }
 
     @Override
@@ -60,81 +38,72 @@ final class YangParserImpl implements YangParser {
         return null;
     }
 
+    @Override
+    public @NonNull Collection<Class<? extends SchemaSourceRepresentation>> supportedSourceRepresentations() {
+        return delegate.supportedSourceRepresentations();
+    }
+
     @Override
     public @NonNull YangParser addSource(final SchemaSourceRepresentation source) throws IOException,
             YangSyntaxErrorException {
-        buildAction.addSource(sourceToStatementStream(source));
+        try {
+            delegate.addSource(source);
+        } catch (org.opendaylight.yangtools.yang.parser.api.YangSyntaxErrorException e) {
+            throw mapException(e);
+        }
         return this;
     }
 
     @Override
     public @NonNull YangParser addLibSource(final SchemaSourceRepresentation source) throws IOException,
             YangSyntaxErrorException {
-        buildAction.addLibSource(sourceToStatementStream(source));
+        try {
+            delegate.addLibSource(source);
+        } catch (org.opendaylight.yangtools.yang.parser.api.YangSyntaxErrorException e) {
+            throw mapException(e);
+        }
         return this;
     }
 
     @Override
     public @NonNull YangParser setSupportedFeatures(final Set<QName> supportedFeatures) {
-        buildAction.setSupportedFeatures(supportedFeatures);
+        delegate.setSupportedFeatures(supportedFeatures);
         return this;
     }
 
     @Override
     public @NonNull YangParser setModulesWithSupportedDeviations(
             final SetMultimap<QNameModule, QNameModule> modulesDeviatedByModules) {
-        buildAction.setModulesWithSupportedDeviations(modulesDeviatedByModules);
+        delegate.setModulesWithSupportedDeviations(modulesDeviatedByModules);
         return this;
     }
 
     @Override
     public @NonNull List<DeclaredStatement<?>> buildDeclaredModel() throws YangParserException {
         try {
-            return buildAction.build().getRootStatements();
-        } catch (ReactorException e) {
-            throw decodeReactorException(e);
+            return delegate.buildDeclaredModel();
+        } catch (org.opendaylight.yangtools.yang.parser.api.YangParserException e) {
+            throw mapException(e);
         }
     }
 
     @Override
     public @NonNull EffectiveModelContext buildEffectiveModel() throws YangParserException {
         try {
-            return buildAction.buildEffective();
-        } catch (ReactorException e) {
-            throw decodeReactorException(e);
+            return delegate.buildEffectiveModel();
+        } catch (org.opendaylight.yangtools.yang.parser.api.YangParserException e) {
+            throw mapException(e);
         }
     }
 
-    private static YangParserException decodeReactorException(final ReactorException reported) {
-        // FIXME: map exception in some reasonable manner
-        return new YangParserException("Failed to assemble sources", reported);
+    private static YangParserException mapException(
+            final org.opendaylight.yangtools.yang.parser.api.YangParserException ex) {
+        return new YangParserException(ex.getMessage(), ex);
     }
 
-    private static StatementStreamSource sourceToStatementStream(final SchemaSourceRepresentation source)
-            throws IOException, YangSyntaxErrorException {
-        requireNonNull(source);
-        if (source instanceof IRSchemaSource) {
-            return YangStatementStreamSource.create((IRSchemaSource) source);
-        } else if (source instanceof YangTextSchemaSource) {
-            return YangStatementStreamSource.create((YangTextSchemaSource) source);
-        } else if (source instanceof YinDomSchemaSource) {
-            return YinStatementStreamSource.create((YinDomSchemaSource) source);
-        } else if (source instanceof YinTextSchemaSource) {
-            try {
-                return YinStatementStreamSource.create(YinTextToDomTransformer.transformSource(
-                    (YinTextSchemaSource) source));
-            } catch (SAXException e) {
-                throw new YangSyntaxErrorException(source.getIdentifier(), 0, 0, "Failed to parse XML text", e);
-            }
-        } else if (source instanceof YinXmlSchemaSource) {
-            try {
-                return YinStatementStreamSource.create((YinXmlSchemaSource) source);
-            } catch (TransformerException e) {
-                throw new YangSyntaxErrorException(source.getIdentifier(), 0, 0,
-                    "Failed to assemble in-memory representation", e);
-            }
-        } else {
-            throw new IllegalArgumentException("Unsupported source " + source);
-        }
+    private static YangSyntaxErrorException mapException(
+            final org.opendaylight.yangtools.yang.parser.api.YangSyntaxErrorException ex) {
+        return new YangSyntaxErrorException(ex.getSource().orElse(null), ex.getLine(), ex.getCharPositionInLine(),
+            ex.getMessage(), ex);
     }
 }