From 37acd81e00d4597b67aaea92bd2b413afd01d941 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 6 Jun 2015 15:53:10 +0200 Subject: [PATCH] Fix sonar warnings Declaring specific implementation class is a no-no, fix that up. Change-Id: I55f6048fc737046ffd08518eddc0419ee61b276a Signed-off-by: Robert Varga --- .../yang/data/api/StackedPathArguments.java | 6 +- .../LeafRefPathParserListenerImpl.java | 6 +- .../yang/data/impl/leafref/LeafRefUtils.java | 9 +-- .../impl/leafref/LeafRefValidatation.java | 20 +++--- .../data/impl/leafref/QNameWithPredicate.java | 6 +- .../leafref/QNameWithPredicateBuilder.java | 11 +-- .../impl/leafref/QNameWithPredicateImpl.java | 8 +-- .../base/parser/NodeParserDispatcher.java | 2 +- .../serializer/NodeSerializerDispatcher.java | 2 +- .../yang/model/api/SchemaContext.java | 2 +- .../yang/parser/impl/YangParserImpl.java | 44 ++++++------ .../impl/util/YangSourceContextResolver.java | 3 +- .../repo/SharedSchemaContextFactory.java | 37 +++++----- .../parser/spi/meta/StmtContextUtils.java | 38 +++++------ .../parser/stmt/reactor/ModifierImpl.java | 67 +++++++++---------- .../stmt/reactor/SourceSpecificContext.java | 35 +++++----- .../stmt/rfc6020/UnknownStatementImpl.java | 13 ++-- .../stmt/rfc6020/YangStatementSourceImpl.java | 24 +++---- .../ModuleEffectiveStatementImpl.java | 13 ++-- .../YangModelValidationSubModuleTest.java | 3 +- .../parser/impl/YangModelValidationTest.java | 7 +- .../yang/parser/impl/YangParserTest.java | 4 +- .../parser/repo/DependencyResolverTest.java | 3 +- .../repo/SharedSchemaRepositoryTest.java | 4 +- .../parser/util/ModuleDependencySortTest.java | 15 ++--- .../yang/parser/util/RefineHolderTest.java | 3 +- .../build/test/EffectiveBuildTest.java | 14 +--- .../build/test/EffectiveModuleTest.java | 18 +++-- .../yang/stmt/test/AugmentProcessTest.java | 12 ++-- .../yang/stmt/test/AugmentSimplestTest.java | 5 +- .../yangtools/yang/stmt/test/AugmentTest.java | 3 +- .../test/ImportBasicTestStatementSource.java | 24 +++---- .../stmt/test/ImportResolutionBasicTest.java | 3 +- .../yang/stmt/test/ImportResolutionTest.java | 3 +- .../yang/stmt/test/ImportRevisionsTest.java | 12 +--- .../yang/stmt/test/IncludeResolutionTest.java | 14 ++-- .../yang/stmt/test/IncludeRevisionsTest.java | 11 ++- .../yangtools/yang/stmt/test/KeyTest.java | 3 +- .../test/TestYangFileStatementSource.java | 23 +++---- .../yang/stmt/test/UsesResolutionTest.java | 18 +++-- .../yang/stmt/test/YangFileStmtTest.java | 4 +- 41 files changed, 248 insertions(+), 304 deletions(-) diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java index ffe52c02c1..df047a7fdf 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java @@ -36,7 +36,7 @@ final class StackedPathArguments extends PathArgumentList { } @Override - public final PathArgument get(final int index) { + public PathArgument get(final int index) { if (index < base.size()) { return base.get(index); } else { @@ -45,7 +45,7 @@ final class StackedPathArguments extends PathArgumentList { } @Override - public final int indexOf(final Object o) { + public int indexOf(final Object o) { final PathArgument srch = (PathArgument) Preconditions.checkNotNull(o); int ret = base.indexOf(srch); @@ -59,7 +59,7 @@ final class StackedPathArguments extends PathArgumentList { } @Override - public final int lastIndexOf(final Object o) { + public int lastIndexOf(final Object o) { final PathArgument srch = (PathArgument) Preconditions.checkNotNull(o); final int ret = stack.lastIndexOf(srch); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java index 4589fb452b..b1762982a7 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java @@ -42,8 +42,8 @@ final class LeafRefPathParserListenerImpl extends LeafRefPathParserBaseListener{ private QNamePredicateBuilder currentPredicate; private QNameModule currentQnameModule; private String currentQNameLocalName; - private final LinkedList leafRefPathQnameList; - private LinkedList predicatePathKeyQnameList; + private final List leafRefPathQnameList; + private List predicatePathKeyQnameList; private final SchemaNode node; //FIXME use for identifier path completion private ParsingState currentParsingState; @@ -95,7 +95,7 @@ final class LeafRefPathParserListenerImpl extends LeafRefPathParserBaseListener{ @Override public void exitRel_path_keyexpr(final Rel_path_keyexprContext ctx) { - final LeafRefPath pathKeyExpression = LeafRefPath.create(Lists.transform(predicatePathKeyQnameList,build), false); + final LeafRefPath pathKeyExpression = LeafRefPath.create(Lists.transform(predicatePathKeyQnameList, build), false); currentPredicate.setPathKeyExpression(pathKeyExpression); currentParsingState=ParsingState.PREDICATE_PATH_EQUALITY_EXPR; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java index 546d2046c6..dfba5c73d4 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefUtils.java @@ -7,6 +7,7 @@ */ package org.opendaylight.yangtools.yang.data.impl.leafref; +import java.util.Deque; import java.util.Iterator; import java.util.LinkedList; import org.opendaylight.yangtools.yang.common.QName; @@ -34,7 +35,7 @@ public class LeafRefUtils { return leafRefPath; } - final LinkedList absoluteLeafRefTargetPathList = schemaPathToXPathQNames( + final Deque absoluteLeafRefTargetPathList = schemaPathToXPathQNames( contextNodeSchemaPath, module); final Iterable leafRefTargetPathFromRoot = leafRefPath @@ -59,10 +60,10 @@ public class LeafRefUtils { * @param module * @param absoluteLeafRefTargetPathList */ - private static LinkedList schemaPathToXPathQNames( + private static Deque schemaPathToXPathQNames( final SchemaPath nodePath, final Module module) { - final LinkedList xpath = new LinkedList(); + final Deque xpath = new LinkedList<>(); final Iterator nodePathIterator = nodePath.getPathFromRoot() .iterator(); @@ -111,7 +112,7 @@ public class LeafRefUtils { public static LeafRefPath schemaPathToLeafRefPath(final SchemaPath nodePath, final Module module) { - final LinkedList xpathQNames = schemaPathToXPathQNames( + final Deque xpathQNames = schemaPathToXPathQNames( nodePath, module); return LeafRefPath.create(xpathQNames, true); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java index c8bf9ccc99..53f5aca897 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java @@ -46,8 +46,8 @@ public class LeafRefValidatation { private static final String NEW_LINE = System.getProperty("line.separator"); private final DataTreeCandidate tree; - private final LinkedList errorsMessages = new LinkedList(); - private final HashSet validatedLeafRefCtx = new HashSet(); + private final List errorsMessages = new LinkedList<>(); + private final Set validatedLeafRefCtx = new HashSet<>(); private LeafRefValidatation(final DataTreeCandidate tree) { this.tree = tree; @@ -373,12 +373,12 @@ public class LeafRefValidatation { final Map allReferencedByLeafRefCtxs = referencedByCtx .getAllReferencedByLeafRefCtxs(); - final HashMap leafRefsValues = new HashMap(); + final Map leafRefsValues = new HashMap<>(); final Collection leafrefs = allReferencedByLeafRefCtxs .values(); for (final LeafRefContext leafRefContext : leafrefs) { if (leafRefContext.isReferencing()) { - final HashSet values = new HashSet<>(); + final Set values = new HashSet<>(); final SchemaPath leafRefNodeSchemaPath = leafRefContext .getCurrentNodePath(); @@ -393,7 +393,7 @@ public class LeafRefValidatation { } } - final HashSet leafRefTargetNodeValues = new HashSet<>(); + final Set leafRefTargetNodeValues = new HashSet<>(); final SchemaPath nodeSchemaPath = referencedByCtx.getCurrentNodePath(); final LeafRefPath nodePath = LeafRefUtils.schemaPathToLeafRefPath( nodeSchemaPath, referencedByCtx.getLeafRefContextModule()); @@ -401,11 +401,11 @@ public class LeafRefValidatation { nodePath.getPathFromRoot(), null, QNameWithPredicate.ROOT); boolean valid = true; - final Set> entrySet = leafRefsValues + final Set> entrySet = leafRefsValues .entrySet(); - for (final Entry entry : entrySet) { + for (final Entry entry : entrySet) { final LeafRefContext leafRefContext = entry.getKey(); - final HashSet leafRefValuesSet = entry.getValue(); + final Set leafRefValuesSet = entry.getValue(); for (final Object leafRefsValue : leafRefValuesSet) { if (!leafRefTargetNodeValues.contains(leafRefsValue)) { @@ -437,7 +437,7 @@ public class LeafRefValidatation { } private static StringBuilder createInvalidTargetMessage(final NormalizedNode leaf, - final HashSet leafRefTargetNodeValues, final LeafRefContext leafRefContext, + final Set leafRefTargetNodeValues, final LeafRefContext leafRefContext, final Object leafRefsValue) { final StringBuilder sb = new StringBuilder(); sb.append("Invalid leafref value ["); @@ -578,7 +578,7 @@ public class LeafRefValidatation { } } } else { - final Map> keyValues = new HashMap>(); + final Map> keyValues = new HashMap<>(); final Iterator predicates = qNamePredicates .iterator(); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicate.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicate.java index 85cd3608fa..1c421c31fb 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicate.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicate.java @@ -13,11 +13,9 @@ import org.opendaylight.yangtools.yang.common.QNameModule; public interface QNameWithPredicate { - final QNameWithPredicate UP_PARENT = new QNameWithPredicateBuilder( - null, "..").build(); + QNameWithPredicate UP_PARENT = new QNameWithPredicateBuilder(null, "..").build(); - final QNameWithPredicate ROOT = new QNameWithPredicateBuilder( - null, "").build(); + QNameWithPredicate ROOT = new QNameWithPredicateBuilder(null, "").build(); List getQNamePredicates(); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateBuilder.java index daa8dbd4c4..0fe0d443e1 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateBuilder.java @@ -8,15 +8,16 @@ package org.opendaylight.yangtools.yang.data.impl.leafref; import java.util.LinkedList; +import java.util.List; import org.opendaylight.yangtools.yang.common.QNameModule; class QNameWithPredicateBuilder { - private LinkedList qnamePredicates; + private List qnamePredicates; private QNameModule moduleQname; private String localName; - public static QNameWithPredicateBuilder UP_PARENT_BUILDER = new QNameWithPredicateBuilder( + public static final QNameWithPredicateBuilder UP_PARENT_BUILDER = new QNameWithPredicateBuilder( null, "..") { @Override public QNameWithPredicate build() { @@ -27,19 +28,19 @@ class QNameWithPredicateBuilder { public QNameWithPredicateBuilder(final QNameModule moduleQname, final String localName) { this.moduleQname = moduleQname; this.localName = localName; - this.qnamePredicates = new LinkedList(); + this.qnamePredicates = new LinkedList<>(); } public QNameWithPredicate build() { final QNameWithPredicateImpl qNameWithPredicateImpl = new QNameWithPredicateImpl( moduleQname, localName, qnamePredicates); - this.qnamePredicates = new LinkedList(); + this.qnamePredicates = new LinkedList<>(); return qNameWithPredicateImpl; } - public LinkedList getQNamePredicates() { + public List getQNamePredicates() { return qnamePredicates; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateImpl.java index 1661d9bb98..757e349090 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateImpl.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/QNameWithPredicateImpl.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.impl.leafref; import java.io.Serializable; -import java.util.LinkedList; +import java.util.List; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -18,19 +18,19 @@ final class QNameWithPredicateImpl implements Immutable, Serializable, private static final long serialVersionUID = 1L; - private final LinkedList qnamePredicates; + private final List qnamePredicates; private final QNameModule moduleQname; private final String localName; public QNameWithPredicateImpl(final QNameModule moduleQname, final String localName, - final LinkedList qnamePredicates) { + final List qnamePredicates) { this.moduleQname = moduleQname; this.localName = localName; this.qnamePredicates = qnamePredicates; } @Override - public LinkedList getQNamePredicates() { + public List getQNamePredicates() { return qnamePredicates; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/NodeParserDispatcher.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/NodeParserDispatcher.java index 242a414368..1b250a9256 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/NodeParserDispatcher.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/NodeParserDispatcher.java @@ -33,7 +33,7 @@ public interface NodeParserDispatcher { * Abstract implementation that implements the dispatch conditions. Only requires parsers to be provided. * The same instance of parser can be provided in case it is immutable. */ - public abstract static class BaseNodeParserDispatcher implements NodeParserDispatcher { + abstract class BaseNodeParserDispatcher implements NodeParserDispatcher { private final ToNormalizedNodeParserFactory factory; protected BaseNodeParserDispatcher(final ToNormalizedNodeParserFactory factory) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/serializer/NodeSerializerDispatcher.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/serializer/NodeSerializerDispatcher.java index 6c71015552..2aa989a714 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/serializer/NodeSerializerDispatcher.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/serializer/NodeSerializerDispatcher.java @@ -47,7 +47,7 @@ public interface NodeSerializerDispatcher { * requires serializers to be provided. The same instance of serializer can * be provided in case it is immutable. */ - public abstract static class BaseNodeSerializerDispatcher implements NodeSerializerDispatcher { + abstract class BaseNodeSerializerDispatcher implements NodeSerializerDispatcher { private final FromNormalizedNodeSerializerFactory factory; protected BaseNodeSerializerDispatcher(final FromNormalizedNodeSerializerFactory factory) { diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java index dec334dc7f..5773bff43a 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java @@ -27,7 +27,7 @@ public interface SchemaContext extends ContainerSchemaNode { /** * QName of NETCONF top-level data node. */ - public static final QName NAME = QName.create(URI.create("urn:ietf:params:xml:ns:netconf:base:1.0"), null, "data"); + QName NAME = QName.create(URI.create("urn:ietf:params:xml:ns:netconf:base:1.0"), null, "data"); /** * Returns data schema node instances which represents direct subnodes (like 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 fdc8369f4a..df0e7d303e 100644 --- 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 @@ -383,7 +383,7 @@ public final class YangParserImpl implements YangContextParser { return resolveSubmodules(builders); } - private Map parseSourcesToBuilders(final Collection sources, + private static Map parseSourcesToBuilders(final Collection sources, final SchemaContext context) throws IOException, YangSyntaxErrorException { final ParseTreeWalker walker = new ParseTreeWalker(); final Map sourceToTree = parseYangSources(sources); @@ -506,7 +506,7 @@ public final class YangParserImpl implements YangContextParser { } } - private void addSubmoduleToModule(final ModuleBuilder submodule, final ModuleBuilder module) { + private static void addSubmoduleToModule(final ModuleBuilder submodule, final ModuleBuilder module) { module.addSubmodule(submodule); submodule.setParent(module); module.getDirtyNodes().addAll(submodule.getDirtyNodes()); @@ -636,7 +636,7 @@ public final class YangParserImpl implements YangContextParser { } } - private Map parseYangSources(final Collection sources) throws IOException, YangSyntaxErrorException { + private static Map parseYangSources(final Collection sources) throws IOException, YangSyntaxErrorException { final Map trees = new HashMap<>(); for (ByteSource source : sources) { try (InputStream stream = source.openStream()) { @@ -731,7 +731,7 @@ public final class YangParserImpl implements YangContextParser { * @param modules * all loaded modules */ - private void resolveDirtyNodes(final Map> modules) { + private static void resolveDirtyNodes(final Map> modules) { for (Map.Entry> entry : modules.entrySet()) { for (Map.Entry childEntry : entry.getValue().entrySet()) { final ModuleBuilder module = childEntry.getValue(); @@ -750,7 +750,7 @@ public final class YangParserImpl implements YangContextParser { * @param module * current module */ - private void resolveDirtyNodes(final Map> modules, final ModuleBuilder module) { + private static void resolveDirtyNodes(final Map> modules, final ModuleBuilder module) { final Set dirtyNodes = module.getDirtyNodes(); if (!dirtyNodes.isEmpty()) { for (TypeAwareBuilder nodeToResolve : dirtyNodes) { @@ -816,8 +816,8 @@ public final class YangParserImpl implements YangContextParser { } } - private SchemaPath findUsesAugmentTargetNodePath(DataNodeContainerBuilder usesParent, - AugmentationSchemaBuilder augment) { + private static SchemaPath findUsesAugmentTargetNodePath(final DataNodeContainerBuilder usesParent, + final AugmentationSchemaBuilder augment) { QName parentQName = usesParent.getQName(); final QNameModule qnm; if (parentQName == null) { @@ -867,7 +867,7 @@ public final class YangParserImpl implements YangContextParser { * @param augments * augments to check */ - private void checkAugmentMandatoryNodes(final Collection augments) { + private static void checkAugmentMandatoryNodes(final Collection augments) { for (AugmentationSchemaBuilder augment : augments) { URI augmentTargetNs = augment.getTargetPath().getPathFromRoot().iterator().next().getNamespace(); Date augmentTargetRev = augment.getTargetPath().getPathFromRoot().iterator().next().getRevision(); @@ -894,7 +894,7 @@ public final class YangParserImpl implements YangContextParser { * all loaded modules topologically sorted (based on dependencies * between each other) */ - private void resolveAugments(final Map> modules) { + private static void resolveAugments(final Map> modules) { List all = new ArrayList<>(); for (Map.Entry> entry : modules.entrySet()) { for (Map.Entry inner : entry.getValue().entrySet()) { @@ -931,7 +931,7 @@ public final class YangParserImpl implements YangContextParser { * all loaded modules * @return true if augment process succeed */ - private boolean resolveUsesAugment(final AugmentationSchemaBuilder augment, final ModuleBuilder module, + private static boolean resolveUsesAugment(final AugmentationSchemaBuilder augment, final ModuleBuilder module, final Map> modules) { if (augment.isResolved()) { return true; @@ -991,7 +991,7 @@ public final class YangParserImpl implements YangContextParser { * all loaded modules * @return true if augment process succeed */ - private boolean resolveAugment(final AugmentationSchemaBuilder augment, final ModuleBuilder module, + private static boolean resolveAugment(final AugmentationSchemaBuilder augment, final ModuleBuilder module, final Map> modules) { if (augment.isResolved()) { return true; @@ -1014,7 +1014,7 @@ public final class YangParserImpl implements YangContextParser { * @param modules * all loaded modules */ - private void resolveIdentities(final Map> modules) { + private static void resolveIdentities(final Map> modules) { for (Map.Entry> entry : modules.entrySet()) { for (Map.Entry inner : entry.getValue().entrySet()) { ModuleBuilder module = inner.getValue(); @@ -1026,7 +1026,7 @@ public final class YangParserImpl implements YangContextParser { } } - private void resolveIdentity(final ModuleBuilder module, + private static void resolveIdentity(final ModuleBuilder module, final IdentitySchemaNodeBuilder identity) { final String baseIdentityName = identity.getBaseIdentityName(); if (baseIdentityName != null) { @@ -1074,7 +1074,7 @@ public final class YangParserImpl implements YangContextParser { * @param modules * all loaded modules */ - private void resolveUsesTargetGrouping(final Map> modules) { + private static void resolveUsesTargetGrouping(final Map> modules) { final List allUses = new ArrayList<>(); for (Map.Entry> entry : modules.entrySet()) { for (Map.Entry inner : entry.getValue().entrySet()) { @@ -1095,7 +1095,7 @@ public final class YangParserImpl implements YangContextParser { * @param modules * all loaded modules */ - private void resolveUsesForGroupings(final Map> modules) { + private static void resolveUsesForGroupings(final Map> modules) { final Set allGroupings = new HashSet<>(); for (Map.Entry> entry : modules.entrySet()) { for (Map.Entry inner : entry.getValue().entrySet()) { @@ -1119,7 +1119,7 @@ public final class YangParserImpl implements YangContextParser { * @param modules * all loaded modules */ - private void resolveUsesForNodes(final Map> modules) { + private static void resolveUsesForNodes(final Map> modules) { for (Map.Entry> entry : modules.entrySet()) { for (Map.Entry inner : entry.getValue().entrySet()) { ModuleBuilder module = inner.getValue(); @@ -1141,7 +1141,7 @@ public final class YangParserImpl implements YangContextParser { * @param modules * all loaded modules */ - private void resolveUses(final UsesNodeBuilder usesNode, final Map> modules) { + private static void resolveUses(final UsesNodeBuilder usesNode, final Map> modules) { if (!usesNode.isResolved()) { DataNodeContainerBuilder parent = usesNode.getParent(); ModuleBuilder module = BuilderUtils.getParentModule(parent); @@ -1164,7 +1164,7 @@ public final class YangParserImpl implements YangContextParser { } } - private int nodeAfterUsesIndex(final UsesNodeBuilder usesNode) { + private static int nodeAfterUsesIndex(final UsesNodeBuilder usesNode) { DataNodeContainerBuilder parent = usesNode.getParent(); int usesLine = usesNode.getLine(); @@ -1198,7 +1198,7 @@ public final class YangParserImpl implements YangContextParser { * @param module * current module */ - private void resolveUnknownNodes(final Map> modules, final ModuleBuilder module) { + private static void resolveUnknownNodes(final Map> modules, final ModuleBuilder module) { for (UnknownSchemaNodeBuilder usnb : module.getAllUnknownNodes()) { QName nodeType = usnb.getNodeType(); String localName = usnb.getNodeType().getLocalName(); @@ -1227,7 +1227,7 @@ public final class YangParserImpl implements YangContextParser { } } - private ExtensionBuilder findExtBuilder(final String name, final Collection extensions) { + private static ExtensionBuilder findExtBuilder(final String name, final Collection extensions) { for (ExtensionBuilder extension : extensions) { if (extension.getQName().getLocalName().equals(name)) { return extension; @@ -1236,7 +1236,7 @@ public final class YangParserImpl implements YangContextParser { return null; } - private ExtensionDefinition findExtDef(final String name, final Collection extensions) { + private static ExtensionDefinition findExtDef(final String name, final Collection extensions) { for (ExtensionDefinition extension : extensions) { if (extension.getQName().getLocalName().equals(name)) { return extension; @@ -1267,7 +1267,7 @@ public final class YangParserImpl implements YangContextParser { } } - private void findDuplicityNodesIn(final ChoiceSchemaNode choiceNode, final Module module, final ModuleBuilder moduleBuilder, + private static void findDuplicityNodesIn(final ChoiceSchemaNode choiceNode, final Module module, final ModuleBuilder moduleBuilder, final Map> modules) { final Set duplicityTestSet = new HashSet<>(); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContextResolver.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContextResolver.java index 4ce5fbda49..988acd00d8 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContextResolver.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContextResolver.java @@ -7,7 +7,6 @@ package org.opendaylight.yangtools.yang.parser.impl.util; import static com.google.common.base.Preconditions.checkNotNull; - import com.google.common.base.Optional; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; @@ -252,7 +251,7 @@ public abstract class YangSourceContextResolver { return potentialState; } - private boolean checkValidSource(final SourceIdentifier identifier, final YangModelDependencyInfo info) { + private static boolean checkValidSource(final SourceIdentifier identifier, final YangModelDependencyInfo info) { if (!identifier.getName().equals(info.getName())) { LOG.warn("Incorrect model returned. Identifier name was: {}, source contained: {}", identifier.getName(), info.getName()); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java index f8fc1770b8..3c2968de57 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java @@ -7,6 +7,22 @@ */ package org.opendaylight.yangtools.yang.parser.repo; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.base.Predicate; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import com.google.common.collect.Collections2; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import java.net.URI; import java.util.Collection; import java.util.Collections; @@ -17,9 +33,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.NavigableMap; import java.util.Set; - import javax.annotation.Nullable; - import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.opendaylight.yangtools.util.concurrent.ExceptionMapper; @@ -39,23 +53,6 @@ import org.opendaylight.yangtools.yang.parser.util.ASTSchemaSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import com.google.common.collect.Collections2; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import com.google.common.util.concurrent.AsyncFunction; -import com.google.common.util.concurrent.CheckedFuture; -import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; - final class SharedSchemaContextFactory implements SchemaContextFactory { private static final ExceptionMapper MAPPER = ReflectiveExceptionMapper.create("resolve sources", SchemaResolutionException.class); private static final Logger LOG = LoggerFactory.getLogger(SharedSchemaContextFactory.class); @@ -163,7 +160,7 @@ final class SharedSchemaContextFactory implements SchemaContextFactory { /** * @return set (preserving ordering) from the input collection */ - private List deDuplicateSources(final Collection requiredSources) { + private static List deDuplicateSources(final Collection requiredSources) { final Set uniqueSourceIdentifiers = Collections.unmodifiableSet(Sets.newLinkedHashSet(requiredSources)); if(uniqueSourceIdentifiers.size() != requiredSources.size()) { LOG.warn("Duplicate sources requested for schema context, removed duplicate sources: {}", Collections2.filter(uniqueSourceIdentifiers, new Predicate() { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java index 1388ef161d..a410c197d9 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java @@ -7,8 +7,8 @@ */ package org.opendaylight.yangtools.yang.parser.spi.meta; -import java.util.Collection; import com.google.common.base.Function; +import java.util.Collection; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; @@ -16,14 +16,14 @@ public final class StmtContextUtils { private static final Function, DeclaredStatement> BUILD_DECLARED = new Function, DeclaredStatement>() { @Override - public DeclaredStatement apply(StmtContext input) { + public DeclaredStatement apply(final StmtContext input) { return input.buildDeclared(); } }; private static final Function, EffectiveStatement> BUILD_EFFECTIVE = new Function, EffectiveStatement>() { @Override - public EffectiveStatement apply(StmtContext input) { + public EffectiveStatement apply(final StmtContext input) { return input.buildEffective(); } }; @@ -38,14 +38,14 @@ public final class StmtContextUtils { } @SuppressWarnings("unchecked") - public static final > Function, E> buildEffective() { + public static > Function, E> buildEffective() { return Function.class.cast(BUILD_EFFECTIVE); } @SuppressWarnings("unchecked") - public static final > AT firstAttributeOf( - Iterable> contexts, - Class
declaredType) { + public static > AT firstAttributeOf( + final Iterable> contexts, + final Class
declaredType) { for (StmtContext ctx : contexts) { if (producesDeclared(ctx, declaredType)) { return (AT) ctx.getStatementArgument(); @@ -55,8 +55,8 @@ public final class StmtContextUtils { } @SuppressWarnings("unchecked") - public static final > AT firstAttributeOf( - StmtContext ctx, Class
declaredType) { + public static > AT firstAttributeOf( + final StmtContext ctx, final Class
declaredType) { if (producesDeclared(ctx, declaredType)) { return (AT) ctx.getStatementArgument(); @@ -65,8 +65,8 @@ public final class StmtContextUtils { return null; } - public static final
> StmtContext findFirstDeclaredSubstatement( - StmtContext stmtContext, Class
declaredType) { + public static
> StmtContext findFirstDeclaredSubstatement( + final StmtContext stmtContext, final Class
declaredType) { Collection> declaredSubstatements = stmtContext .declaredSubstatements(); for (StmtContext subStmtContext : declaredSubstatements) { @@ -77,8 +77,8 @@ public final class StmtContextUtils { return null; } - public static final StmtContext findFirstDeclaredSubstatement( - StmtContext stmtContext, int startIndex, Class>... types) { + public static StmtContext findFirstDeclaredSubstatement( + final StmtContext stmtContext, int startIndex, final Class>... types) { if (startIndex >= types.length) { return null; @@ -99,8 +99,8 @@ public final class StmtContextUtils { return null; } - public static final
> StmtContext findFirstDeclaredSubstatementOnSublevel( - StmtContext stmtContext, Class
declaredType, + public static
> StmtContext findFirstDeclaredSubstatementOnSublevel( + final StmtContext stmtContext, final Class
declaredType, int sublevel) { Collection> declaredSubstatements = stmtContext .declaredSubstatements(); @@ -120,8 +120,8 @@ public final class StmtContextUtils { return null; } - public static final
> StmtContext findDeepFirstDeclaredSubstatement( - StmtContext stmtContext, Class
declaredType) { + public static
> StmtContext findDeepFirstDeclaredSubstatement( + final StmtContext stmtContext, final Class
declaredType) { Collection> declaredSubstatements = stmtContext .declaredSubstatements(); @@ -141,8 +141,8 @@ public final class StmtContextUtils { return null; } - public static final boolean producesDeclared(StmtContext ctx, - Class> type) { + public static boolean producesDeclared(final StmtContext ctx, + final Class> type) { return type.isAssignableFrom(ctx.getPublicDefinition() .getDeclaredRepresentationClass()); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java index 75879a54a0..1c71972237 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.parser.stmt.reactor; import static org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase.EFFECTIVE_MODEL; import static org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase.FULL_DECLARATION; - import com.google.common.base.Function; import com.google.common.base.Preconditions; import java.util.HashSet; @@ -39,16 +38,16 @@ class ModifierImpl implements ModelActionBuilder { private InferenceAction action; private boolean actionApplied = false; - ModifierImpl(ModelProcessingPhase phase) { + ModifierImpl(final ModelProcessingPhase phase) { this.phase = Preconditions.checkNotNull(phase); } - private AbstractPrerequisite addReq(AbstractPrerequisite prereq) { + private AbstractPrerequisite addReq(final AbstractPrerequisite prereq) { unsatisfied.add(prereq); return prereq; } - private AbstractPrerequisite addMutation(AbstractPrerequisite mutation) { + private AbstractPrerequisite addMutation(final AbstractPrerequisite mutation) { mutations.add(mutation); return mutation; } @@ -59,7 +58,7 @@ class ModifierImpl implements ModelActionBuilder { Preconditions.checkState(action == null, "Action was already registered."); } - private IllegalStateException shouldNotHappenProbablyBug(SourceException e) { + private static IllegalStateException shouldNotHappenProbablyBug(final SourceException e) { return new IllegalStateException("Source exception during registering prerequisite. This is probably bug.",e); } @@ -115,7 +114,7 @@ class ModifierImpl implements ModelActionBuilder { } @SuppressWarnings({ "unchecked", "rawtypes" }) - private , N extends StatementNamespace> AbstractPrerequisite requiresCtxImpl(StmtContext context, Class namespace, K key,ModelProcessingPhase phase) { + private , N extends StatementNamespace> AbstractPrerequisite requiresCtxImpl(final StmtContext context, final Class namespace, final K key,final ModelProcessingPhase phase) { checkNotRegistered(); try { AddedToNamespace addedToNs = new AddedToNamespace(phase); @@ -127,7 +126,7 @@ class ModifierImpl implements ModelActionBuilder { } } - private > AbstractPrerequisite requiresCtxImpl(C context, ModelProcessingPhase phase) { + private > AbstractPrerequisite requiresCtxImpl(final C context, final ModelProcessingPhase phase) { Preconditions.checkState(action == null, "Action was already registered."); try { PhaseFinished phaseFin = new PhaseFinished(); @@ -141,7 +140,7 @@ class ModifierImpl implements ModelActionBuilder { @SuppressWarnings({ "rawtypes", "unchecked" }) private , N extends StatementNamespace> AbstractPrerequisite mutatesCtxImpl( - StmtContext context, Class namespace, K key, ModelProcessingPhase phase) { + final StmtContext context, final Class namespace, final K key, final ModelProcessingPhase phase) { try { PhaseModificationInNamespace mod = new PhaseModificationInNamespace(phase); addMutation(mod); @@ -152,13 +151,13 @@ class ModifierImpl implements ModelActionBuilder { } } - private static StatementContextBase contextImpl(StmtContext context) { + private static StatementContextBase contextImpl(final StmtContext context) { Preconditions.checkArgument(context instanceof StatementContextBase,"Supplied context was not provided by this reactor."); return StatementContextBase.class.cast(context); } @Override - public , CT extends C> Prerequisite mutatesCtx(CT context, ModelProcessingPhase phase) { + public , CT extends C> Prerequisite mutatesCtx(final CT context, final ModelProcessingPhase phase) { try { return addMutation(new PhaseMutation(contextImpl(context),phase)); } catch (InferenceException e) { @@ -167,56 +166,56 @@ class ModifierImpl implements ModelActionBuilder { } @Override - public ,E extends EffectiveStatement> AbstractPrerequisite> requiresCtx(StmtContext context, ModelProcessingPhase phase) { + public ,E extends EffectiveStatement> AbstractPrerequisite> requiresCtx(final StmtContext context, final ModelProcessingPhase phase) { return requiresCtxImpl(context, phase); } @Override - public > Prerequisite> requiresCtx(StmtContext context, Class namespace, K key, ModelProcessingPhase phase) { + public > Prerequisite> requiresCtx(final StmtContext context, final Class namespace, final K key, final ModelProcessingPhase phase) { return requiresCtxImpl(context, namespace, key, phase); } @Override - public > Prerequisite requiresDeclared(StmtContext context) { + public > Prerequisite requiresDeclared(final StmtContext context) { return requiresCtxImpl(context, FULL_DECLARATION).transform(StmtContextUtils.buildDeclared()); } @Override public , N extends StatementNamespace> AbstractPrerequisite> requiresDeclaredCtx( - StmtContext context, Class namespace, K key) { + final StmtContext context, final Class namespace, final K key) { return requiresCtxImpl(context, namespace, key, FULL_DECLARATION); } @Override public , N extends StatementNamespace> Prerequisite requiresDeclared( - StmtContext context, Class namespace, K key) { + final StmtContext context, final Class namespace, final K key) { final AbstractPrerequisite> rawContext = requiresCtxImpl(context, namespace, key, FULL_DECLARATION); return rawContext.transform(StmtContextUtils.buildDeclared()); } @Override - public > Prerequisite requiresEffective(StmtContext stmt) { + public > Prerequisite requiresEffective(final StmtContext stmt) { return requiresCtxImpl(stmt, EFFECTIVE_MODEL).transform(StmtContextUtils.buildEffective()); } @Override public , N extends StatementNamespace> AbstractPrerequisite> requiresEffectiveCtx( - StmtContext context, Class namespace, K key) { + final StmtContext context, final Class namespace, final K key) { return requiresCtxImpl(contextImpl(context),namespace,key, EFFECTIVE_MODEL); } @Override public , N extends StatementNamespace> Prerequisite requiresEffective( - StmtContext context, Class namespace, K key) { + final StmtContext context, final Class namespace, final K key) { final AbstractPrerequisite> rawContext = requiresCtxImpl(context, namespace, key, EFFECTIVE_MODEL); return rawContext.transform(StmtContextUtils.buildEffective()); } @Override - public > Prerequisite> mutatesNs(Mutable context, - Class namespace) { + public > Prerequisite> mutatesNs(final Mutable context, + final Class namespace) { try { return addMutation(new NamespaceMutation(contextImpl(context),namespace)); } catch (SourceException e) { @@ -225,21 +224,21 @@ class ModifierImpl implements ModelActionBuilder { } @Override - public > Prerequisite mutatesEffectiveCtx(T stmt) { + public > Prerequisite mutatesEffectiveCtx(final T stmt) { return mutatesCtx(stmt, EFFECTIVE_MODEL); } @Override public , N extends StatementNamespace> AbstractPrerequisite> mutatesEffectiveCtx( - StmtContext context, Class namespace, K key) { + final StmtContext context, final Class namespace, final K key) { return mutatesCtxImpl(context, namespace, key, EFFECTIVE_MODEL); } @Override - public void apply(InferenceAction action) throws InferenceException { + public void apply(final InferenceAction action) throws InferenceException { this.action = Preconditions.checkNotNull(action); tryToResolve(); } @@ -260,7 +259,7 @@ class ModifierImpl implements ModelActionBuilder { return done; } - protected boolean resolvePrereq(T value) throws InferenceException { + protected boolean resolvePrereq(final T value) throws InferenceException { this.value = value; this.done = true; tryToResolve(); @@ -289,7 +288,7 @@ class ModifierImpl implements ModelActionBuilder { private class PhaseMutation extends AbstractPrerequisite implements ContextMutation { @SuppressWarnings("unchecked") - public PhaseMutation(StatementContextBase context, ModelProcessingPhase phase) throws InferenceException { + public PhaseMutation(final StatementContextBase context, final ModelProcessingPhase phase) throws InferenceException { context.addMutation(phase, this); resolvePrereq((C) context); } @@ -305,14 +304,14 @@ class ModifierImpl implements ModelActionBuilder { @SuppressWarnings("unchecked") @Override - public boolean phaseFinished(StatementContextBase context, ModelProcessingPhase phase) throws SourceException { + public boolean phaseFinished(final StatementContextBase context, final ModelProcessingPhase phase) throws SourceException { return resolvePrereq((C) (context)); } } private class NamespaceMutation> extends AbstractPrerequisite> { - public NamespaceMutation(StatementContextBase ctx, Class namespace) throws InferenceException { + public NamespaceMutation(final StatementContextBase ctx, final Class namespace) throws InferenceException { resolvePrereq(ctx); } @@ -322,20 +321,20 @@ class ModifierImpl implements ModelActionBuilder { private final ModelProcessingPhase phase; - public > AddedToNamespace(ModelProcessingPhase phase) { + public > AddedToNamespace(final ModelProcessingPhase phase) { this.phase = phase; } @Override - public void namespaceItemAdded(StatementContextBase context, Class namespace, Object key, - Object value) throws SourceException { + public void namespaceItemAdded(final StatementContextBase context, final Class namespace, final Object key, + final Object value) throws SourceException { StatementContextBase targetContext = (StatementContextBase) value; targetContext.addPhaseCompletedListener(phase, this); } @SuppressWarnings("unchecked") @Override - public boolean phaseFinished(StatementContextBase context, ModelProcessingPhase phase) throws SourceException { + public boolean phaseFinished(final StatementContextBase context, final ModelProcessingPhase phase) throws SourceException { return resolvePrereq((C) context); } @@ -345,15 +344,15 @@ class ModifierImpl implements ModelActionBuilder { private final ModelProcessingPhase modPhase; - public > PhaseModificationInNamespace(ModelProcessingPhase phase) throws SourceException { + public > PhaseModificationInNamespace(final ModelProcessingPhase phase) throws SourceException { Preconditions.checkArgument(phase != null, "Model processing phase must not be null"); this.modPhase = phase; } @SuppressWarnings("unchecked") @Override - public void namespaceItemAdded(StatementContextBase context, Class namespace, Object key, - Object value) throws SourceException { + public void namespaceItemAdded(final StatementContextBase context, final Class namespace, final Object key, + final Object value) throws SourceException { context.addMutation(modPhase,this); resolvePrereq((C) context); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java index 4f2be08a4d..ce245436ad 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java @@ -7,10 +7,6 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.reactor; -import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.common.YangConstants; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; - import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; @@ -23,7 +19,10 @@ import java.util.Objects; import javax.annotation.Nullable; import org.opendaylight.yangtools.concepts.Mutable; import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.common.QNameModule; +import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.parser.spi.ExtensionNamespace; @@ -63,20 +62,20 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh private ModelProcessingPhase inProgressPhase; private ModelProcessingPhase finishedPhase; - private QNameToStatementDefinitionMap qNameToStmtDefMap = new QNameToStatementDefinitionMap(); - private PrefixToModuleMap prefixToModuleMap = new PrefixToModuleMap(); + private final QNameToStatementDefinitionMap qNameToStmtDefMap = new QNameToStatementDefinitionMap(); + private final PrefixToModuleMap prefixToModuleMap = new PrefixToModuleMap(); - SourceSpecificContext(BuildGlobalContext currentContext,StatementStreamSource source) { + SourceSpecificContext(final BuildGlobalContext currentContext,final StatementStreamSource source) { this.source = source; this.currentContext = currentContext; } - StatementDefinitionContext getDefinition(QName name) { + StatementDefinitionContext getDefinition(final QName name) { return currentContext.getStatementDefinition(name); } - ContextBuilder createDeclaredChild(StatementContextBase current, QName name, StatementSourceReference ref) { + ContextBuilder createDeclaredChild(final StatementContextBase current, final QName name, final StatementSourceReference ref) { StatementDefinitionContext def = getDefinition(name); //extensions @@ -94,7 +93,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh } @SuppressWarnings({ "rawtypes", "unchecked" }) - private ContextBuilder createDeclaredRoot(StatementDefinitionContext def, StatementSourceReference ref) { + private ContextBuilder createDeclaredRoot(final StatementDefinitionContext def, final StatementSourceReference ref) { return new ContextBuilder(def,ref) { @Override @@ -123,7 +122,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh return root.buildEffective(); } - void startPhase(ModelProcessingPhase phase) { + void startPhase(final ModelProcessingPhase phase) { @Nullable ModelProcessingPhase previousPhase = phase.getPreviousPhase(); Preconditions.checkState(Objects.equals(previousPhase, finishedPhase)); Preconditions.checkState(modifiers.get(previousPhase).isEmpty()); @@ -131,7 +130,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh } @Override - public > void addToLocalStorage(Class type, K key, V value) { + public > void addToLocalStorage(final Class type, final K key, final V value) { if(ImportedNamespaceContext.class.isAssignableFrom(type)) { importedNamespaces.add((NamespaceStorageNode) value); } @@ -144,7 +143,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh } @Override - public > V getFromLocalStorage(Class type, K key) { + public > V getFromLocalStorage(final Class type, final K key) { final V potentialLocal = getRoot().getFromLocalStorage(type, key); if(potentialLocal != null) { return potentialLocal; @@ -159,7 +158,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh } @Override - public > NamespaceBehaviour getNamespaceBehaviour(Class type) { + public > NamespaceBehaviour getNamespaceBehaviour(final Class type) { return currentContext.getNamespaceBehaviour(type); } @@ -168,7 +167,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh return currentContext; } - PhaseCompletionProgress tryToCompletePhase(ModelProcessingPhase phase) throws SourceException { + PhaseCompletionProgress tryToCompletePhase(final ModelProcessingPhase phase) throws SourceException { Collection currentPhaseModifiers = modifiers.get(phase); boolean hasProgressed = hasProgress(currentPhaseModifiers); @@ -189,7 +188,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh } - private boolean hasProgress(Collection currentPhaseModifiers) { + private static boolean hasProgress(final Collection currentPhaseModifiers) { Iterator modifier = currentPhaseModifiers.iterator(); boolean hasProgressed = false; @@ -204,7 +203,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh } - ModelActionBuilder newInferenceAction(ModelProcessingPhase phase) { + ModelActionBuilder newInferenceAction(final ModelProcessingPhase phase) { ModifierImpl action = new ModifierImpl(phase); modifiers.put(phase, action); return action; @@ -216,7 +215,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh + finishedPhase + "]"; } - SourceException failModifiers(ModelProcessingPhase identifier) { + SourceException failModifiers(final ModelProcessingPhase identifier) { InferenceException sourceEx = new InferenceException("Fail to infer source relationships", root.getStatementSourceReference()); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java index 1dbb030e50..86f24219ec 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java @@ -7,6 +7,7 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; +import javax.annotation.Nullable; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement; @@ -15,33 +16,31 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; -import javax.annotation.Nullable; - public class UnknownStatementImpl extends AbstractDeclaredStatement implements UnknownStatement { - protected UnknownStatementImpl(StmtContext context) { + protected UnknownStatementImpl(final StmtContext context) { super(context); } public static class Definition extends AbstractStatementSupport, EffectiveStatement>> { - public Definition(StatementDefinition publicDefinition) { + public Definition(final StatementDefinition publicDefinition) { super(publicDefinition); } @Override - public String parseArgumentValue(StmtContext ctx, String value) throws SourceException { + public String parseArgumentValue(final StmtContext ctx, final String value) throws SourceException { return value; } @Override - public UnknownStatement createDeclared(StmtContext, ?> ctx) { + public UnknownStatement createDeclared(final StmtContext, ?> ctx) { return new UnknownStatementImpl(ctx); } @Override - public EffectiveStatement> createEffective(StmtContext, EffectiveStatement>> ctx) { + public EffectiveStatement> createEffective(final StmtContext, EffectiveStatement>> ctx) { throw new UnsupportedOperationException(); } } 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 2b6c97f8a8..85b9df00b2 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 @@ -7,6 +7,12 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.net.URISyntaxException; import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.tree.ParseTreeWalker; @@ -23,12 +29,6 @@ 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; /** * @@ -52,7 +52,7 @@ public final class YangStatementSourceImpl implements StatementStreamSource { } }; - public YangStatementSourceImpl(String fileName) { + public YangStatementSourceImpl(final String fileName) { try { statementContext = parseYangSource(loadFile(fileName)); walker = new ParseTreeWalker(); @@ -63,28 +63,28 @@ public final class YangStatementSourceImpl implements StatementStreamSource { } @Override - public void writeLinkage(StatementWriter writer, QNameToStatementDefinition stmtDef) throws SourceException { + public void writeLinkage(final StatementWriter writer, final QNameToStatementDefinition stmtDef) throws SourceException { yangStatementModelParser.setAttributes(writer, stmtDef); walker.walk(yangStatementModelParser, statementContext); } @Override - public void writeLinkageAndStatementDefinitions(StatementWriter writer, QNameToStatementDefinition stmtDef, PrefixToModule prefixes) throws SourceException { + public void writeLinkageAndStatementDefinitions(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) throws SourceException { yangStatementModelParser.setAttributes(writer, stmtDef, prefixes); walker.walk(yangStatementModelParser, statementContext); } @Override - public void writeFull(StatementWriter writer, QNameToStatementDefinition stmtDef, PrefixToModule prefixes) throws SourceException { + public void writeFull(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) throws SourceException { yangStatementModelParser.setAttributes(writer, stmtDef, prefixes); walker.walk(yangStatementModelParser, statementContext); } - private FileInputStream loadFile(String fileName) throws URISyntaxException, FileNotFoundException { + private FileInputStream loadFile(final String fileName) throws URISyntaxException, FileNotFoundException { return new FileInputStream(new File(getClass().getResource(fileName).toURI())); } - private YangStatementParser.StatementContext parseYangSource(final InputStream stream) throws IOException, YangSyntaxErrorException { + private static YangStatementParser.StatementContext parseYangSource(final InputStream stream) throws IOException, YangSyntaxErrorException { final YangStatementLexer lexer = new YangStatementLexer(new ANTLRInputStream(stream)); final CommonTokenStream tokens = new CommonTokenStream(lexer); final YangStatementParser parser = new YangStatementParser(tokens); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java index a514971e28..9fdeae77a4 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java @@ -7,6 +7,8 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import java.net.URI; import java.util.Collection; import java.util.Date; @@ -14,7 +16,6 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; - import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; @@ -28,17 +29,11 @@ import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.IncludeStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.SubmoduleStatement; import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleImpl; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNameToModuleQName; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.IncludedModuleContext; - public class ModuleEffectiveStatementImpl extends AbstractEffectiveDocumentedDataNodeContainer implements Module, Immutable { @@ -59,9 +54,9 @@ public class ModuleEffectiveStatementImpl extends AbstractEffectiveDocumentedDat private ImmutableList extensionNodes; private ImmutableSet identities; private ImmutableList unknownNodes; - private String source; + private final String source; - public ModuleEffectiveStatementImpl(StmtContext ctx) { + public ModuleEffectiveStatementImpl(final StmtContext ctx) { super(ctx); name = argument(); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationSubModuleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationSubModuleTest.java index f8ce226ab3..9d5bb19e09 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationSubModuleTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationSubModuleTest.java @@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.parser.impl; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; - import org.antlr.v4.runtime.tree.ParseTree; import org.junit.Before; import org.junit.Test; @@ -76,7 +75,7 @@ public class YangModelValidationSubModuleTest { } } - private Submodule_stmtContext mockSubmoduleParent(final ParseTree child, + private static Submodule_stmtContext mockSubmoduleParent(final ParseTree child, final String moduleName) { Submodule_stmtContext ctx = YangModelValidationTest.mockStatement( Submodule_stmtContext.class, moduleName); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationTest.java index 1ed60643bc..05d7a64853 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationTest.java @@ -14,16 +14,13 @@ import static org.junit.Assert.fail; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import com.google.common.collect.Sets; - import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.HashSet; import java.util.List; - import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.TerminalNode; @@ -216,7 +213,7 @@ public class YangModelValidationTest { } } - private Import_stmtContext mockImport(final String name, final String prefixName) { + private static Import_stmtContext mockImport(final String name, final String prefixName) { Import_stmtContext impor = mockStatement(Import_stmtContext.class, name); Prefix_stmtContext prefix = mockStatement(Prefix_stmtContext.class, prefixName); @@ -231,7 +228,7 @@ public class YangModelValidationTest { return new SimpleDateFormat("yyyy-MM-dd").format(new Date()); } - private Include_stmtContext mockInclude(final String name) { + private static Include_stmtContext mockInclude(final String name) { Include_stmtContext incl = mockStatement(Include_stmtContext.class, name); Revision_date_stmtContext revDate = mockStatement(Revision_date_stmtContext.class, getFormattedDate()); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java index 826a0ba959..31bf09927d 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java @@ -884,7 +884,7 @@ public class YangParserTest { assertSetEquals(newModules, ctx.getModules()); } - private void checkOrder(final Collection modules) { + private static void checkOrder(final Collection modules) { Iterator it = modules.iterator(); Module m = it.next(); assertEquals("m2", m.getName()); @@ -904,7 +904,7 @@ public class YangParserTest { assertEquals("m1", m.getName()); } - private void assertSetEquals(final Set s1, final Set s2) { + private static void assertSetEquals(final Set s1, final Set s2) { assertEquals(s1, s2); Iterator it = s1.iterator(); for (Module m : s2) { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java index d2ff63d031..b18b31e7fb 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.parser.repo; import static org.junit.Assert.assertEquals; - import com.google.common.base.Optional; import java.util.HashMap; import java.util.Map; @@ -66,7 +65,7 @@ public class DependencyResolverTest { assertEquals(0, resolved.getUnsatisfiedImports().size()); } - private void addToMap(final Map map, final YangModelDependencyInfo yangModelDependencyInfo) { + private static void addToMap(final Map map, final YangModelDependencyInfo yangModelDependencyInfo) { map.put(getSourceId(yangModelDependencyInfo), yangModelDependencyInfo); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java index 0a94e342cf..7e2ca26508 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java @@ -69,7 +69,7 @@ public class SharedSchemaRepositoryTest { assertEquals(id2, source.checkedGet().getIdentifier()); } - private SourceIdentifier loadAndRegisterSource(final SharedSchemaRepository sharedSchemaRepository, final String resourceName) throws Exception { + private static SourceIdentifier loadAndRegisterSource(final SharedSchemaRepository sharedSchemaRepository, final String resourceName) throws Exception { final SettableSchemaProvider sourceProvider = getImmediateYangSourceProviderFromResource(resourceName); sourceProvider.setResult(); final SourceIdentifier idNoRevision = sourceProvider.getId(); @@ -313,7 +313,7 @@ public class SharedSchemaRepositoryTest { fail("Creation of schema context should fail from non-regular sources"); } - private void assertSchemaContext(final SchemaContext schemaContext, final int moduleSize) { + private static void assertSchemaContext(final SchemaContext schemaContext, final int moduleSize) { assertNotNull(schemaContext); assertEquals(moduleSize, schemaContext.getModules().size()); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java index 3cea371366..96d81e6157 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java @@ -14,9 +14,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; - import com.google.common.collect.Sets; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -27,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; - import org.hamcrest.Matcher; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.Module; @@ -145,7 +142,7 @@ public class ModuleDependencySortTest { } } - private void assertDependencyGraph(final Map> moduleGraph) { + private static void assertDependencyGraph(final Map> moduleGraph) { for (Entry> node : moduleGraph.entrySet()) { String name = node.getKey(); @@ -164,12 +161,12 @@ public class ModuleDependencySortTest { } } - private void assertEdgeCount(final Set inEdges, final int i, final Set outEdges, final int j) { + private static void assertEdgeCount(final Set inEdges, final int i, final Set outEdges, final int j) { assertEquals(i, inEdges.size()); assertEquals(j, outEdges.size()); } - private void mockDependency(final ModuleBuilder a, final ModuleBuilder b) { + private static void mockDependency(final ModuleBuilder a, final ModuleBuilder b) { ModuleImport imprt = mock(ModuleImport.class); doReturn(b.getName()).when(imprt).getModuleName(); doReturn(b.getName()).when(imprt).getPrefix(); @@ -177,14 +174,14 @@ public class ModuleDependencySortTest { a.getImports().put(b.getName(), imprt); } - private void mockDependency(final Module a, final Module b) { + private static void mockDependency(final Module a, final Module b) { ModuleImport imprt = mock(ModuleImport.class); doReturn(b.getName()).when(imprt).getModuleName(); doReturn(b.getRevision()).when(imprt).getRevision(); a.getImports().add(imprt); } - private ModuleBuilder mockModuleBuilder(final String name, final Date rev) { + private static ModuleBuilder mockModuleBuilder(final String name, final Date rev) { ModuleBuilder a = mock(ModuleBuilder.class); doReturn(name).when(a).getName(); Map map = new HashMap<>(); @@ -195,7 +192,7 @@ public class ModuleDependencySortTest { return a; } - private Module mockModule(final String name, final Date rev) { + private static Module mockModule(final String name, final Date rev) { Module a = mock(Module.class); doReturn(name).when(a).getName(); Set set = Sets.newHashSet(); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/RefineHolderTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/RefineHolderTest.java index ea33db06c1..01f4c6662f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/RefineHolderTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/RefineHolderTest.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - import com.google.common.base.Optional; import java.net.URI; import java.net.URISyntaxException; @@ -168,7 +167,7 @@ public class RefineHolderTest { rh1.setReference("reference"); } - private URI getUri(final String uri) { + private static URI getUri(final String uri) { URI simpleUri = null; boolean instantionated = false; try { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveBuildTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveBuildTest.java index 3e6db7d971..f16b13936f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveBuildTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveBuildTest.java @@ -2,9 +2,7 @@ package org.opendaylight.yangtools.yang.stmt.effective.build.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; - import java.net.URI; - import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -78,17 +76,7 @@ public class EffectiveBuildTest { } - private void log(Throwable e, String indent) { - System.out.println(indent + e.getMessage()); - - Throwable[] suppressed = e.getSuppressed(); - for (Throwable throwable : suppressed) { - log(throwable, indent + " "); - } - - } - - private void addSources(BuildAction reactor, YangStatementSourceImpl... sources) { + private static void addSources(final BuildAction reactor, final YangStatementSourceImpl... sources) { for (YangStatementSourceImpl source : sources) { reactor.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveModuleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveModuleTest.java index c7ce9e4d78..b412f69b94 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveModuleTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveModuleTest.java @@ -1,6 +1,13 @@ package org.opendaylight.yangtools.yang.stmt.effective.build.test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import java.net.URI; +import java.text.ParseException; +import java.util.Date; +import java.util.List; +import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -22,15 +29,6 @@ import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; -import java.net.URI; -import java.text.ParseException; -import java.util.Date; -import java.util.List; -import java.util.Set; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - public class EffectiveModuleTest { private static final YangStatementSourceImpl ROOT_MODULE = new YangStatementSourceImpl( @@ -119,7 +117,7 @@ public class EffectiveModuleTest { assertEquals("ext1", extensionSchemaNodes.iterator().next().getQName().getLocalName()); } - private void addSources(CrossSourceStatementReactor.BuildAction reactor, YangStatementSourceImpl... sources) { + private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final YangStatementSourceImpl... sources) { for (YangStatementSourceImpl source : sources) { reactor.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentProcessTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentProcessTest.java index 10cba77b1a..64d4b63edb 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentProcessTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentProcessTest.java @@ -3,6 +3,7 @@ package org.opendaylight.yangtools.yang.stmt.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import com.google.common.collect.ImmutableList; import java.net.URI; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -20,7 +21,6 @@ import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementR import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; -import com.google.common.collect.ImmutableList; public class AugmentProcessTest { @@ -145,7 +145,7 @@ public class AugmentProcessTest { assertNull(result); } - private void log(Throwable e, String indent) { + private void log(final Throwable e, final String indent) { System.out.println(indent + e.getMessage()); Throwable[] suppressed = e.getSuppressed(); @@ -217,8 +217,8 @@ public class AugmentProcessTest { assertNotNull(grpAddNode); } - private T findInStatements(QName target, - ImmutableList statements) { + private static > T findInStatements(final QName target, + final ImmutableList statements) { for (final T statement : statements) { if (target @@ -230,8 +230,8 @@ public class AugmentProcessTest { return null; } - private void addSources(CrossSourceStatementReactor.BuildAction reactor, - StatementStreamSource... sources) { + private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, + final StatementStreamSource... sources) { for (StatementStreamSource source : sources) { reactor.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentSimplestTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentSimplestTest.java index 4c02208ba3..c4c0ea4231 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentSimplestTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentSimplestTest.java @@ -1,5 +1,6 @@ package org.opendaylight.yangtools.yang.stmt.test; +import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; @@ -8,8 +9,6 @@ import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementR import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import static org.junit.Assert.assertNotNull; - public class AugmentSimplestTest { private static final TestYangFileStatementSource AUGMENTED = new TestYangFileStatementSource("/semantic-statement-parser/augmented.yang"); @@ -24,7 +23,7 @@ public class AugmentSimplestTest { assertNotNull(result); } - private void addSources(CrossSourceStatementReactor.BuildAction reactor, StatementStreamSource... sources) { + private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final StatementStreamSource... sources) { for (StatementStreamSource source : sources) { reactor.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentTest.java index 8e9399d443..ff5c2b5395 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/AugmentTest.java @@ -11,7 +11,6 @@ package org.opendaylight.yangtools.yang.stmt.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; - import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; @@ -134,7 +133,7 @@ public class AugmentTest { } } - private void addSources(BuildAction reactor, YangStatementSourceImpl... sources) { + private static void addSources(final BuildAction reactor, final YangStatementSourceImpl... sources) { for (YangStatementSourceImpl source : sources) { reactor.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportBasicTestStatementSource.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportBasicTestStatementSource.java index a301f322fc..33a458cb8f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportBasicTestStatementSource.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportBasicTestStatementSource.java @@ -7,11 +7,13 @@ */ package org.opendaylight.yangtools.yang.stmt.test; +import static org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping.CONTAINER; import static org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping.IMPORT; import static org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping.MODULE; import static org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping.NAMESPACE; -import static org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping.*; - +import static org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping.PREFIX; +import static org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping.REVISION; +import static org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping.REVISION_DATE; import java.util.Arrays; import java.util.List; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; @@ -22,8 +24,6 @@ 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.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; class ImportBasicTestStatementSource implements StatementStreamSource { @@ -32,7 +32,7 @@ class ImportBasicTestStatementSource implements StatementStreamSource { private final String name; private final List imports; private StatementWriter writer; - private StatementSourceReference REF = new StatementSourceReference() { + private final StatementSourceReference REF = new StatementSourceReference() { @Override public StatementSource getStatementSource() { @@ -41,13 +41,13 @@ class ImportBasicTestStatementSource implements StatementStreamSource { }; - public ImportBasicTestStatementSource(String name, String... imports) { + public ImportBasicTestStatementSource(final String name, final String... imports) { this.name = name; this.imports = Arrays.asList(imports); } @Override - public void writeFull(StatementWriter writer, QNameToStatementDefinition stmtDef, PrefixToModule prefixes) + public void writeFull(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) throws SourceException { this.writer = writer; header(); @@ -60,14 +60,14 @@ class ImportBasicTestStatementSource implements StatementStreamSource { @Override - public void writeLinkage(StatementWriter writer, QNameToStatementDefinition stmtDef) throws SourceException { + public void writeLinkage(final StatementWriter writer, final QNameToStatementDefinition stmtDef) throws SourceException { this.writer = writer; header().end(); } @Override - public void writeLinkageAndStatementDefinitions(StatementWriter writer, QNameToStatementDefinition stmtDef, - PrefixToModule prefixes) throws SourceException { + public void writeLinkageAndStatementDefinitions(final StatementWriter writer, final QNameToStatementDefinition stmtDef, + final PrefixToModule prefixes) throws SourceException { this.writer = writer; header(); extensions(); @@ -145,12 +145,12 @@ class ImportBasicTestStatementSource implements StatementStreamSource { return NS_PREFIX + name; } - protected ImportBasicTestStatementSource arg(String arg) throws SourceException { + protected ImportBasicTestStatementSource arg(final String arg) throws SourceException { writer.argumentValue(arg, REF); return this; } - protected ImportBasicTestStatementSource stmt(Rfc6020Mapping stmt) throws SourceException { + protected ImportBasicTestStatementSource stmt(final Rfc6020Mapping stmt) throws SourceException { writer.startStatement(stmt.getStatementName(), REF); return this; } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportResolutionBasicTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportResolutionBasicTest.java index 6f08b944c2..1ee23a4daa 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportResolutionBasicTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportResolutionBasicTest.java @@ -12,7 +12,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; @@ -89,7 +88,7 @@ public class ImportResolutionBasicTest { } - private void addSources(BuildAction reactor, ImportBasicTestStatementSource... sources) { + private static void addSources(final BuildAction reactor, final ImportBasicTestStatementSource... sources) { for(ImportBasicTestStatementSource source : sources) { reactor.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportResolutionTest.java index 1c4b2dc9af..e763ad9ad2 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportResolutionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportResolutionTest.java @@ -12,7 +12,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; @@ -94,7 +93,7 @@ public class ImportResolutionTest { } } - private void addSources(BuildAction reactor, TestStatementSource... sources) { + private static void addSources(final BuildAction reactor, final TestStatementSource... sources) { for (TestStatementSource source : sources) { reactor.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportRevisionsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportRevisionsTest.java index c70e2d5c4e..578fd6df6b 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportRevisionsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/ImportRevisionsTest.java @@ -4,7 +4,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; @@ -102,16 +101,7 @@ public class ImportRevisionsTest { assertNotNull(result); } - private void log(Throwable e, String indent) { - System.out.println(indent + e.getMessage()); - - Throwable[] suppressed = e.getSuppressed(); - for (Throwable throwable : suppressed) { - log(throwable, indent + " "); - } - } - - private void addSources(BuildAction reactor, TestStatementSource... sources) { + private static void addSources(final BuildAction reactor, final TestStatementSource... sources) { for (TestStatementSource source : sources) { reactor.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/IncludeResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/IncludeResolutionTest.java index 17dcaaa9fa..f44189fb7f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/IncludeResolutionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/IncludeResolutionTest.java @@ -4,17 +4,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import java.util.logging.Logger; - -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; +import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction; +import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; public class IncludeResolutionTest { @@ -80,7 +78,7 @@ public class IncludeResolutionTest { } - private void addSources(BuildAction reactor, IncludeTestStatementSource... sources) { + private static void addSources(final BuildAction reactor, final IncludeTestStatementSource... sources) { for(IncludeTestStatementSource source : sources) { reactor.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/IncludeRevisionsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/IncludeRevisionsTest.java index 9a72f73faf..2b3f49754e 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/IncludeRevisionsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/IncludeRevisionsTest.java @@ -1,5 +1,9 @@ package org.opendaylight.yangtools.yang.stmt.test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; @@ -11,11 +15,6 @@ import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - public class IncludeRevisionsTest { private static final YangStatementSourceImpl EQUAL_ROOT = new YangStatementSourceImpl("/revisions/equal-root.yang"); @@ -103,7 +102,7 @@ public class IncludeRevisionsTest { assertNotNull(result); } - private void addSources(CrossSourceStatementReactor.BuildAction reactor, StatementStreamSource... sources) { + private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final StatementStreamSource... sources) { for (StatementStreamSource source : sources) { reactor.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/KeyTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/KeyTest.java index d0ef8c2fe3..0b9b490ce0 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/KeyTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/KeyTest.java @@ -11,7 +11,6 @@ package org.opendaylight.yangtools.yang.stmt.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; - import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; @@ -51,7 +50,7 @@ public class KeyTest { } } - private void addSources(BuildAction reactor, YangStatementSourceImpl... sources) { + private static void addSources(final BuildAction reactor, final YangStatementSourceImpl... sources) { for (YangStatementSourceImpl source : sources) { reactor.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/TestYangFileStatementSource.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/TestYangFileStatementSource.java index cb4d32d94f..b92eb0c611 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/TestYangFileStatementSource.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/TestYangFileStatementSource.java @@ -1,5 +1,9 @@ package org.opendaylight.yangtools.yang.stmt.test; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.tree.ParseTreeWalker; @@ -14,18 +18,13 @@ import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReferenc import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.spi.source.StatementWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; - public class TestYangFileStatementSource implements StatementStreamSource { private YangStatementParserListenerImpl yangStatementModelParser; private YangStatementParser.StatementContext statementContext; private ParseTreeWalker walker; - public TestYangFileStatementSource(String fileName) { + public TestYangFileStatementSource(final String fileName) { try { statementContext = parseYangSource(loadFile(fileName)); walker = new ParseTreeWalker(); @@ -35,7 +34,7 @@ public class TestYangFileStatementSource implements StatementStreamSource { } } - private StatementSourceReference REF = new StatementSourceReference() { + private final StatementSourceReference REF = new StatementSourceReference() { @Override public StatementSource getStatementSource() { @@ -44,28 +43,28 @@ public class TestYangFileStatementSource implements StatementStreamSource { }; @Override - public void writeLinkage(StatementWriter writer, QNameToStatementDefinition stmtDef) throws SourceException { + public void writeLinkage(final StatementWriter writer, final QNameToStatementDefinition stmtDef) throws SourceException { yangStatementModelParser.setAttributes(writer, stmtDef); walker.walk(yangStatementModelParser, statementContext); } @Override - public void writeLinkageAndStatementDefinitions(StatementWriter writer, QNameToStatementDefinition stmtDef, PrefixToModule prefixes) throws SourceException { + public void writeLinkageAndStatementDefinitions(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) throws SourceException { yangStatementModelParser.setAttributes(writer, stmtDef, prefixes); walker.walk(yangStatementModelParser, statementContext); } @Override - public void writeFull(StatementWriter writer, QNameToStatementDefinition stmtDef, PrefixToModule prefixes) throws SourceException { + public void writeFull(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) throws SourceException { yangStatementModelParser.setAttributes(writer, stmtDef, prefixes); walker.walk(yangStatementModelParser, statementContext); } - private FileInputStream loadFile(String fileName) throws Exception { + private FileInputStream loadFile(final String fileName) throws Exception { return new FileInputStream(new File(getClass().getResource(fileName).toURI())); } - private YangStatementParser.StatementContext parseYangSource(final InputStream stream) throws IOException { + private static YangStatementParser.StatementContext parseYangSource(final InputStream stream) throws IOException { final YangStatementLexer lexer = new YangStatementLexer(new ANTLRInputStream(stream)); final CommonTokenStream tokens = new CommonTokenStream(lexer); final YangStatementParser parser = new YangStatementParser(tokens); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/UsesResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/UsesResolutionTest.java index 790e17c916..ba365c4167 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/UsesResolutionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/UsesResolutionTest.java @@ -4,15 +4,14 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - +import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; -import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.junit.Test; +import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; +import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction; +import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; public class UsesResolutionTest { @@ -107,7 +106,7 @@ public class UsesResolutionTest { } } - private void log(Throwable e, String indent) { + private void log(final Throwable e, final String indent) { System.out.println(indent + e.getMessage()); Throwable[] suppressed = e.getSuppressed(); @@ -117,11 +116,10 @@ public class UsesResolutionTest { } - private void addSources(BuildAction reactor, - UsesTestStatementSource... sources) { + private static void addSources(final BuildAction reactor, + final UsesTestStatementSource... sources) { for (UsesTestStatementSource source : sources) { reactor.addSource(source); } } - } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/YangFileStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/YangFileStmtTest.java index 967ec3f180..a46ffe9404 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/YangFileStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/YangFileStmtTest.java @@ -7,6 +7,7 @@ */ package org.opendaylight.yangtools.yang.stmt.test; +import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; @@ -15,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementR import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; -import static org.junit.Assert.assertNotNull; public class YangFileStmtTest { //basic statements to parse and write @@ -51,7 +51,7 @@ public class YangFileStmtTest { assertNotNull(result); } - private void addSources(CrossSourceStatementReactor.BuildAction reactor, StatementStreamSource... sources) { + private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final StatementStreamSource... sources) { for (StatementStreamSource source : sources) { reactor.addSource(source); } -- 2.36.6