From: Martin Ciglan Date: Mon, 20 Apr 2015 12:13:23 +0000 (+0200) Subject: Sonar issues clean-up X-Git-Tag: release/lithium~121^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=beaf8f16074af36d2e822bbd3fc60d7a5ca66b98;p=yangtools.git Sonar issues clean-up Change-Id: Ic1b3a836efc17f6f589238be26ece2bd08ebcc0a Signed-off-by: Martin Ciglan --- diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java index cfc3546472..6a0d38e244 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java @@ -9,6 +9,8 @@ package org.opendaylight.yangtools.yang.parser.impl; import java.util.ArrayList; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.antlr.v4.runtime.tree.ParseTree; import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser; @@ -29,6 +31,7 @@ public class YangStatementParserListenerImpl extends YangStatementParserBaseList private QNameToStatementDefinition stmtDef; private PrefixToModule prefixes; private List toBeSkipped = new ArrayList<>(); + private static final Logger LOG = LoggerFactory.getLogger(YangStatementParserListenerImpl.class); public YangStatementParserListenerImpl(StatementSourceReference ref) { this.ref = ref; @@ -61,7 +64,7 @@ public class YangStatementParserListenerImpl extends YangStatementParserBaseList toBeSkipped.add(((YangStatementParser.KeywordContext) child).children.get(0).getText()); } } catch (SourceException e) { - e.printStackTrace(); + LOG.warn(e.getMessage(), e); } } else if (child instanceof YangStatementParser.ArgumentContext) { try { @@ -71,7 +74,7 @@ public class YangStatementParserListenerImpl extends YangStatementParserBaseList else action = true; } catch (SourceException e) { - e.printStackTrace(); + LOG.warn(e.getMessage(), e); } } @@ -94,7 +97,7 @@ public class YangStatementParserListenerImpl extends YangStatementParserBaseList toBeSkipped.remove(statementName); } } catch (SourceException e) { - e.printStackTrace(); + LOG.warn(e.getMessage(), e); } } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java index 8eabcb68eb..54dd02353d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java @@ -10,7 +10,8 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; import static org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase.EFFECTIVE_MODEL; import java.util.Collection; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; @@ -30,13 +31,13 @@ import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.AugmentEffe public class AugmentStatementImpl extends AbstractDeclaredStatement implements AugmentStatement { + private static final Logger LOG = LoggerFactory.getLogger(AugmentStatementImpl.class); + protected AugmentStatementImpl(StmtContext context) { super(context); } - public static class Definition - extends - AbstractStatementSupport> { + public static class Definition extends AbstractStatementSupport> { public Definition() { super(Rfc6020Mapping.AUGMENT); @@ -72,15 +73,13 @@ public class AugmentStatementImpl extends AbstractDeclaredStatement augmentTargetCtx = AugmentUtils - .getAugmentTargetCtx(augmentNode); - StatementContextBase augmentSourceCtx = (StatementContextBase) sourceCtxPrereq - .get(); + final StatementContextBase augmentTargetCtx = AugmentUtils.getAugmentTargetCtx(augmentNode); + final StatementContextBase augmentSourceCtx = (StatementContextBase) sourceCtxPrereq.get(); try { AugmentUtils.copyFromSourceToTarget(augmentSourceCtx, augmentTargetCtx); } catch (SourceException e) { - e.printStackTrace(); + LOG.warn(e.getMessage(), e); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java index 66cfd1d51e..3b9c18c033 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; import java.util.Collection; import java.util.HashSet; +import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -24,7 +25,10 @@ import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNameToModuleQName import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase; -public class AugmentUtils { +public final class AugmentUtils { + + private AugmentUtils() { + } private static final String REGEX_PATH_REL1 = "\\.\\.?\\s*/(.+)"; private static final String REGEX_PATH_REL2 = "//.*"; @@ -86,24 +90,23 @@ public class AugmentUtils { QName targetQName = (QName) targetStmtArgument; QNameModule targetQNameModule = targetQName.getModule(); - if (targetQNameModule.equals(sourceQNameModule)) + if (targetQNameModule.equals(sourceQNameModule)) { return null; - else + } else { return targetQNameModule; - } else + } + } else { return null; + } } public static boolean needToCopyByAugment(StmtContext stmtContext) { - HashSet noCopyDefSet = new HashSet<>(); + Set noCopyDefSet = new HashSet<>(); noCopyDefSet.add(Rfc6020Mapping.USES); StatementDefinition def = stmtContext.getPublicDefinition(); - if (noCopyDefSet.contains(def)) - return false; - else - return true; + return (!noCopyDefSet.contains(def)); } public static boolean isReusedByAugment(StmtContext stmtContext) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java index 69f839bb96..f940f026d3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java @@ -30,11 +30,9 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; public class ContainerStatementImpl extends AbstractDeclaredStatement implements ContainerStatement { - //private QName qname; protected ContainerStatementImpl(StmtContext context) { super(context); - //this.qname = } public static class Definition extends AbstractStatementSupport> { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java index 06ebd38929..4f2a7ce735 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java @@ -62,10 +62,8 @@ public class GroupingStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared( - Mutable> stmt) - throws InferenceException, SourceException { + Mutable> stmt) throws SourceException { stmt.getParentContext().addContext(GroupingNamespace.class, stmt.getStatementArgument(),stmt); - // } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java index 44f91489ab..f5a996dbe0 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java @@ -9,6 +9,8 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; import java.util.Collection; import java.util.HashSet; +import java.util.Set; + import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; @@ -24,7 +26,10 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase; -public class GroupingUtils { +public final class GroupingUtils { + + private GroupingUtils() { + } /** * @param sourceGrpStmtCtx @@ -90,14 +95,18 @@ public class GroupingUtils { QName sourceQName = (QName) sourceStmtArgument; QNameModule sourceQNameModule = sourceQName.getModule(); - if (targetQNameModule.equals(sourceQNameModule)) + if (targetQNameModule.equals(sourceQNameModule)) { return null; - else + } + else { return targetQNameModule; - } else + } + } else { return null; - } else + } + } else { return null; + } } public static boolean needToCreateNewQName( @@ -107,26 +116,20 @@ public class GroupingUtils { public static boolean needToCopyByUses(StmtContext stmtContext) { - HashSet noCopyDefSet = new HashSet(); + Set noCopyDefSet = new HashSet(); noCopyDefSet.add(Rfc6020Mapping.USES); StatementDefinition def = stmtContext.getPublicDefinition(); - if (noCopyDefSet.contains(def)) - return false; - else - return true; + return (!noCopyDefSet.contains(def)); } public static boolean isReusedByUses(StmtContext stmtContext) { - HashSet reusedDefSet = new HashSet(); + Set reusedDefSet = new HashSet(); reusedDefSet.add(Rfc6020Mapping.TYPEDEF); StatementDefinition def = stmtContext.getPublicDefinition(); - if (reusedDefSet.contains(def)) - return true; - else - return false; + return (reusedDefSet.contains(def)); } public static void resolveUsesNode( diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java index 01451c92d4..6863486d68 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java @@ -62,7 +62,7 @@ public class ImportStatementDefinition extends @Override public void onLinkageDeclared( final Mutable> stmt) - throws InferenceException, SourceException { + throws SourceException { final ModuleIdentifier impIdentifier = getImportedModuleIdentifier(stmt); ModelActionBuilder importAction = stmt.newInferenceAction(SOURCE_LINKAGE); final Prerequisite> imported; @@ -78,13 +78,7 @@ public class ImportStatementDefinition extends @Override public void apply() throws InferenceException { StmtContext importedModule = imported.get(); - // URI importedNs = - // importedModule.firstSubstatement(NamespaceStatement.class).argument(); - // String prefix = - // stmt.firstSubstatement(PrefixStatement.class).argument(); linkageTarget.get().addToNs(ImportedModuleContext.class, impIdentifier, importedModule); - // prefixTarget.get().addToNs(PrefixToModule.class, prefix, - // QNameModule.create(importedNs, null)); } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java index 4b425c33e1..70effef390 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java @@ -68,7 +68,7 @@ public class IncludeStatementImpl extends AbstractDeclaredStatement impl @Override public void onLinkageDeclared( final Mutable> stmt) - throws InferenceException, SourceException { + throws SourceException { final ModuleIdentifier includeSubmoduleIdentifier = getIncludeSubmoduleIdentifier(stmt); ModelActionBuilder includeAction = stmt.newInferenceAction(SOURCE_LINKAGE); @@ -89,7 +89,6 @@ public class IncludeStatementImpl extends AbstractDeclaredStatement impl @Override public void prerequisiteFailed(Collection> failed) throws InferenceException { - System.out.println(""); if (failed.contains(requiresCtxPrerequisite)) { throw new InferenceException("Included submodule was not found.", stmt .getStatementSourceReference()); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java index e0b7189a3f..8f970c0c24 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java @@ -40,8 +40,7 @@ public class InputStatementImpl extends AbstractDeclaredStatement @Override public QName parseArgumentValue(StmtContext ctx, String value) throws SourceException { - value = "input"; - return Utils.qNameFromArgument(ctx, value); + return Utils.qNameFromArgument(ctx, "input"); } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java index 3324b876e2..e2c6b531db 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java @@ -63,7 +63,7 @@ public class ModuleStatementSupport extends @Override public void onLinkageDeclared(Mutable> stmt) - throws InferenceException, SourceException { + throws SourceException { Optional moduleNs = Optional.fromNullable(firstAttributeOf(stmt.declaredSubstatements(), NamespaceStatement.class)); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java index f362fbf4ab..86734f7208 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java @@ -41,8 +41,7 @@ public class OutputStatementImpl extends AbstractDeclaredStatement @Override public QName parseArgumentValue(StmtContext ctx, String value) throws SourceException { - value = "output"; - return Utils.qNameFromArgument(ctx, value); + return Utils.qNameFromArgument(ctx, "output"); } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java index 66f1c712a5..7349082ec5 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java @@ -67,7 +67,7 @@ public class SubmoduleStatementImpl extends @Override public void onLinkageDeclared( Mutable> stmt) - throws InferenceException, SourceException { + throws SourceException { Optional revisionDate = Optional .fromNullable(firstAttributeOf( diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java index 631fb31795..326e92a807 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java @@ -10,6 +10,8 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; import static org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase.FULL_DECLARATION; import java.util.Collection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; @@ -37,8 +39,11 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UsesEffectiveStatementImpl; + public class UsesStatementImpl extends AbstractDeclaredStatement implements UsesStatement { + private static final Logger LOG = LoggerFactory.getLogger(UsesStatementImpl.class); + protected UsesStatementImpl(StmtContext context) { super(context); } @@ -58,7 +63,7 @@ public class UsesStatementImpl extends AbstractDeclaredStatement implemen @Override public void onFullDefinitionDeclared( final StmtContext.Mutable> usesNode) - throws InferenceException, SourceException { + throws SourceException { ModelActionBuilder usesAction = usesNode.newInferenceAction(FULL_DECLARATION); final QName groupingName = usesNode.getStatementArgument(); @@ -72,31 +77,25 @@ public class UsesStatementImpl extends AbstractDeclaredStatement implemen @Override public void apply() throws InferenceException { - StatementContextBase targetNodeStmtCtx = (StatementContextBase) targetNodePre - .get(); - StatementContextBase sourceGrpStmtCtx = (StatementContextBase) sourceGroupingPre - .get(); + StatementContextBase targetNodeStmtCtx = (StatementContextBase) targetNodePre.get(); + StatementContextBase sourceGrpStmtCtx = (StatementContextBase) sourceGroupingPre.get(); try { GroupingUtils.copyFromSourceToTarget(sourceGrpStmtCtx, targetNodeStmtCtx); GroupingUtils.resolveUsesNode(usesNode, targetNodeStmtCtx); } catch (SourceException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LOG.warn(e.getMessage(), e); } } @Override public void prerequisiteFailed(Collection> failed) throws InferenceException { if (failed.contains(sourceGroupingPre)) { - throw new InferenceException("Grouping " + groupingName + " was not resovled.", usesNode - .getStatementSourceReference()); + throw new InferenceException("Grouping " + groupingName + " was not resovled.", usesNode.getStatementSourceReference()); } throw new InferenceException("Unknown error occurred.", usesNode.getStatementSourceReference()); } - }); - } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java index 456d124a5d..48131623a1 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java @@ -29,7 +29,6 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -import org.opendaylight.yangtools.yang.model.api.meta.StatementSource; import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; @@ -42,14 +41,19 @@ import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToModuleIdenti import org.opendaylight.yangtools.yang.parser.spi.source.ModuleIdentifierToModuleQName; import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNameToModuleQName; import org.opendaylight.yangtools.yang.parser.spi.source.PrefixToModule; -import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference; import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase; import com.google.common.base.CharMatcher; import com.google.common.base.Splitter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -public class Utils { +public final class Utils { + private Utils() { + } + + private static final Logger LOG = LoggerFactory.getLogger(Utils.class); private static final CharMatcher DOUBLE_QUOTE_MATCHER = CharMatcher.is('"'); private static final CharMatcher SINGLE_QUOTE_MATCHER = CharMatcher.is('\''); @@ -57,14 +61,6 @@ public class Utils { private static final String REGEX_PATH_ABS = "/[^/].+"; - public static final StatementSourceReference CONTEXT_REF = new StatementSourceReference() { - - @Override - public StatementSource getStatementSource() { - return StatementSource.CONTEXT; - } - }; - public static List splitPathToNodeNames(String path) { Splitter keySplitter = Splitter.on(SEPARATOR_NODENAME).omitEmptyStrings().trimResults(); @@ -78,7 +74,7 @@ public class Utils { try { xPath.compile(path); } catch (XPathExpressionException e) { - throw new IllegalArgumentException("An argument is not valid XPath string"); + throw new IllegalArgumentException("Argument is not valid XPath string", e); } } @@ -138,7 +134,7 @@ public class Utils { try { qNameModule = QNameModule.create(new URI(""), new Date(0)); } catch (URISyntaxException e) { - e.printStackTrace(); + LOG.warn(e.getMessage(), e); } String localName = null; @@ -227,8 +223,9 @@ public class Utils { if (argument instanceof QName) { QName qname = (QName) argument; qNamesFromRoot.add(qname); - } else + } else { return SchemaPath.SAME; + } } return SchemaPath.create(qNamesFromRoot, true); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java index 7e2841452c..210a837f81 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java @@ -14,11 +14,14 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.spi.source.StatementWriter; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.net.URISyntaxException; /** * @@ -27,11 +30,20 @@ import java.io.InputStream; * */ -public class YangStatementSourceImpl implements StatementStreamSource { +public final class YangStatementSourceImpl implements StatementStreamSource { private YangStatementParserListenerImpl yangStatementModelParser; private YangStatementParser.StatementContext statementContext; private ParseTreeWalker walker; + private static final Logger LOG = LoggerFactory.getLogger(YangStatementSourceImpl.class); + + private static final StatementSourceReference REF = new StatementSourceReference() { + + @Override + public StatementSource getStatementSource() { + return StatementSource.DECLARATION; + } + }; public YangStatementSourceImpl(String fileName) { try { @@ -39,18 +51,10 @@ public class YangStatementSourceImpl implements StatementStreamSource { walker = new ParseTreeWalker(); yangStatementModelParser = new YangStatementParserListenerImpl(REF); } catch (Exception e) { - e.printStackTrace(); + LOG.warn(e.getMessage(), e); } } - private StatementSourceReference REF = new StatementSourceReference() { - - @Override - public StatementSource getStatementSource() { - return StatementSource.DECLARATION; - } - }; - @Override public void writeLinkage(StatementWriter writer, QNameToStatementDefinition stmtDef) throws SourceException { yangStatementModelParser.setAttributes(writer, stmtDef); @@ -69,7 +73,7 @@ public class YangStatementSourceImpl implements StatementStreamSource { walker.walk(yangStatementModelParser, statementContext); } - private FileInputStream loadFile(String fileName) throws Exception { + private FileInputStream loadFile(String fileName) throws URISyntaxException, FileNotFoundException { return new FileInputStream(new File(getClass().getResource(fileName).toURI())); } @@ -77,7 +81,6 @@ public class YangStatementSourceImpl implements StatementStreamSource { final YangStatementLexer lexer = new YangStatementLexer(new ANTLRInputStream(stream)); final CommonTokenStream tokens = new CommonTokenStream(lexer); final YangStatementParser parser = new YangStatementParser(tokens); - final YangStatementParser.StatementContext result = parser.statement(); - return result; + return parser.statement(); } }