X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fimpl%2FYangModelBasicValidationListener.java;h=3cb3f078bc91e1a8ed60a024a3caf6e96f9c991d;hb=8bd5bd285d4ad7d8621875bf2290f2bebe09cd8c;hp=b9cadc7f6564a77cb8d0a1f139a616bc9402442d;hpb=ae36823e05e6afe15fe6b43d65ae453599c59b41;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangModelBasicValidationListener.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangModelBasicValidationListener.java index b9cadc7f65..3cb3f078bc 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangModelBasicValidationListener.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangModelBasicValidationListener.java @@ -7,6 +7,8 @@ */ package org.opendaylight.yangtools.yang.parser.impl; +import com.google.common.collect.Sets; + import java.net.URI; import java.net.URISyntaxException; import java.util.HashSet; @@ -61,14 +63,12 @@ import org.opendaylight.yangtools.antlrv4.code.gen.YangParserBaseListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Sets; - /** * Validation listener that validates yang statements according to RFC-6020. * This validator expects only one module or submodule per file and performs * only basic validation where context from all yang models is not present. */ -final class YangModelBasicValidationListener extends YangParserBaseListener { +public final class YangModelBasicValidationListener extends YangParserBaseListener { private static final Logger LOGGER = LoggerFactory.getLogger(YangModelBasicValidationListener.class); private final Set uniquePrefixes = new HashSet<>(); private final Set uniqueImports = new HashSet<>(); @@ -93,7 +93,7 @@ final class YangModelBasicValidationListener extends YangParserBaseListener { BasicValidations.checkPresentChildOfType(ctx, Module_header_stmtsContext.class, true); String moduleName = ValidationUtil.getName(ctx); - BasicValidations.checkOnlyOneModulePresent(moduleName, globalModuleId); + BasicValidations.checkIsModuleIdNull(globalModuleId); globalModuleId = moduleName; } @@ -114,7 +114,7 @@ final class YangModelBasicValidationListener extends YangParserBaseListener { BasicValidations.checkPresentChildOfType(ctx, Submodule_header_stmtsContext.class, true); String submoduleName = ValidationUtil.getName(ctx); - BasicValidations.checkOnlyOneModulePresent(submoduleName, globalModuleId); + BasicValidations.checkIsModuleIdNull(globalModuleId); globalModuleId = submoduleName; } @@ -392,7 +392,7 @@ final class YangModelBasicValidationListener extends YangParserBaseListener { /** * Constraints: *
    - * + *
  1. No duplicate uniques
  2. *
*/ @Override