Fix enum members' name

Enumeration members are supposed to be capitalized as normal constants.
Fix that before the API is widely used.

Change-Id: I1d0632e9491bd79047d1f71f2a906c498cdd0ad6
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java
index 6b8681d2321aad796f45dd75031013eaf6a99a19..fca62d4850b4a702126c52cba75b38efdb184260 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java
@@ -83,78 +83,77 @@ import org.opendaylight.yangtools.yang.model.api.stmt.YinElementStatement;
 
 @Beta
 public enum Rfc6020Mapping implements StatementDefinition {
-    Anyxml(AnyxmlStatement.class, "anyxml", "name"),
-    Argument(ArgumentStatement.class, "argument", "name"),
-    Augment(AugmentStatement.class, "augment", "target-node"),
-    Base(BaseStatement.class, "base", "name"),
-    BelongsTo(BelongsToStatement.class, "belongs-to", "module"),
-    Bit(BitStatement.class, "bit", "name"),
-    Case(CaseStatement.class, "case", "name"),
-    Choice(ChoiceStatement.class, "choice", "name"),
-    Config(ConfigStatement.class, "config", "value"),
-    Contact(ContactStatement.class, "contact", "text", true),
-    Container(ContainerStatement.class, "container", "name"),
-    Default(DefaultStatement.class, "default", "value"),
-    Description(DescriptionStatement.class, "description", "text", true),
-    Deviate(DeviateStatement.class, "deviate", "value"),
-    Deviation(DeviationStatement.class, "deviation", "target-node"),
-    Enum(EnumStatement.class, "enum", "name"),
-    ErrorAppTag(ErrorAppTagStatement.class, "error-app-tag", "value"),
-    ErrorMessage(ErrorMessageStatement.class, "error-message", "value", true),
-    Extension(ExtensionStatement.class, "extension", "name"),
-    Feature(FeatureStatement.class, "feature", "name"),
-    FractionDigits(FractionDigitsStatement.class, "fraction-digits", "value"),
-    Grouping(GroupingStatement.class, "grouping", "name"),
-    Identity(IdentityStatement.class, "identity", "name"),
-    IfFeature(IfFeatureStatement.class, "if-feature", "name"),
-    Import(ImportStatement.class, "import", "module"),
-    Include(IncludeStatement.class, "include", "module"),
-    Input(InputStatement.class, "input"),
-    Key(KeyStatement.class, "key", "value"),
-    Leaf(LeafStatement.class, "leaf", "name"),
-    LeafList(LeafListStatement.class, "leaf-list", "name"),
-    Length(LengthStatement.class, "length", "value"),
-    List(ListStatement.class, "list", "name"),
-    Mandatory(MandatoryStatement.class, "mandatory", "value"),
-    MaxElements(MaxElementsStatement.class, "max-elements", "value"),
-    MinElements(MinElementsStatement.class, "min-elements", "value"),
-    Module(ModuleStatement.class, "module", "name"),
-    Must(MustStatement.class, "must", "condition"),
-    Namespace(NamespaceStatement.class, "namespace", "uri"),
-    Notification(NotificationStatement.class, "notification", "name"),
-    OrderedBy(OrderedByStatement.class, "ordered-by", "value"),
-    Organization(OrganizationStatement.class, "organization", "text", true),
-    Output(OutputStatement.class, "output"),
-    Path(PathStatement.class, "path", "value"),
-    Pattern(PatternStatement.class, "pattern", "value"),
-    Position(PositionStatement.class, "position", "value"),
-    Prefix(PrefixStatement.class, "prefix", "value"),
-    Presence(PresenceStatement.class, "presence", "value"),
-    Range(RangeStatement.class, "range", "value"),
-    Reference(ReferenceStatement.class, "reference", "text", true),
-    Refine(RefineStatement.class, "refine", "target-node"),
-    RequireInstance(RequireInstanceStatement.class, "require-instance", "value"),
-    Revision(RevisionStatement.class, "revision", "date"),
-    RevisionDate(RevisionDateStatement.class, "revision-date", "date"),
-    Rpc(RpcStatement.class, "rpc", "name"),
-    Status(StatusStatement.class, "status", "value"),
-    Submodule(SubmoduleStatement.class, "submodule", "name"),
-    Type(TypeStatement.class, "type", "name"),
-    Typedef(TypedefStatement.class, "typedef", "name"),
-    Unique(UniqueStatement.class, "unique", "tag"),
-    Units(UnitsStatement.class, "units", "name"),
-    Uses(UsesStatement.class, "uses", "name"),
-    Value(ValueStatement.class, "value", "value"),
-    When(WhenStatement.class, "when", "condition"),
-    YangVersion(YangVersionStatement.class, "yang-version", "value"),
-    YinElement(YinElementStatement.class, "yin-element", "value");
+    ANYXML(AnyxmlStatement.class, "anyxml", "name"),
+    ARGUMENT(ArgumentStatement.class, "argument", "name"),
+    AUGMENT(AugmentStatement.class, "augment", "target-node"),
+    BASE(BaseStatement.class, "base", "name"),
+    BELONGS_TO(BelongsToStatement.class, "belongs-to", "module"),
+    BIT(BitStatement.class, "bit", "name"),
+    CASE(CaseStatement.class, "case", "name"),
+    CHOICE(ChoiceStatement.class, "choice", "name"),
+    CONFIG(ConfigStatement.class, "config", "value"),
+    CONTACT(ContactStatement.class, "contact", "text", true),
+    CONTAINER(ContainerStatement.class, "container", "name"),
+    DEFAULT(DefaultStatement.class, "default", "value"),
+    DESCRIPTION(DescriptionStatement.class, "description", "text", true),
+    DEVIATE(DeviateStatement.class, "deviate", "value"),
+    DEVIATION(DeviationStatement.class, "deviation", "target-node"),
+    ENUM(EnumStatement.class, "enum", "name"),
+    ERROR_APP_TAG(ErrorAppTagStatement.class, "error-app-tag", "value"),
+    ERROR_MESSAGE(ErrorMessageStatement.class, "error-message", "value", true),
+    EXTENSION(ExtensionStatement.class, "extension", "name"),
+    FEATURE(FeatureStatement.class, "feature", "name"),
+    FRACTION_DIGITS(FractionDigitsStatement.class, "fraction-digits", "value"),
+    GROUPING(GroupingStatement.class, "grouping", "name"),
+    IDENTITY(IdentityStatement.class, "identity", "name"),
+    IF_FEATURE(IfFeatureStatement.class, "if-feature", "name"),
+    IMPORT(ImportStatement.class, "import", "module"),
+    INCLUDE(IncludeStatement.class, "include", "module"),
+    INPUT(InputStatement.class, "input"),
+    KEY(KeyStatement.class, "key", "value"),
+    LEAF(LeafStatement.class, "leaf", "name"),
+    LEAF_LIST(LeafListStatement.class, "leaf-list", "name"),
+    LENGTH(LengthStatement.class, "length", "value"),
+    LIST(ListStatement.class, "list", "name"),
+    MANDATORY(MandatoryStatement.class, "mandatory", "value"),
+    MAX_ELEMENTS(MaxElementsStatement.class, "max-elements", "value"),
+    MIN_ELEMENTS(MinElementsStatement.class, "min-elements", "value"),
+    MODULE(ModuleStatement.class, "module", "name"),
+    MUST(MustStatement.class, "must", "condition"),
+    NAMESPACE(NamespaceStatement.class, "namespace", "uri"),
+    NOTIFICATION(NotificationStatement.class, "notification", "name"),
+    ORDERED_BY(OrderedByStatement.class, "ordered-by", "value"),
+    ORGANIZATION(OrganizationStatement.class, "organization", "text", true),
+    OUTPUT(OutputStatement.class, "output"),
+    PATH(PathStatement.class, "path", "value"),
+    PATTERN(PatternStatement.class, "pattern", "value"),
+    POSITION(PositionStatement.class, "position", "value"),
+    PREFIX(PrefixStatement.class, "prefix", "value"),
+    PRESENCE(PresenceStatement.class, "presence", "value"),
+    RANGE(RangeStatement.class, "range", "value"),
+    REFERENCE(ReferenceStatement.class, "reference", "text", true),
+    REFINE(RefineStatement.class, "refine", "target-node"),
+    REQUIRE_INSTANCE(RequireInstanceStatement.class, "require-instance", "value"),
+    REVISION(RevisionStatement.class, "revision", "date"),
+    REVISION_DATE(RevisionDateStatement.class, "revision-date", "date"),
+    RPC(RpcStatement.class, "rpc", "name"),
+    STATUS(StatusStatement.class, "status", "value"),
+    SUBMODULE(SubmoduleStatement.class, "submodule", "name"),
+    TYPE(TypeStatement.class, "type", "name"),
+    TYPEDEF(TypedefStatement.class, "typedef", "name"),
+    UNIQUE(UniqueStatement.class, "unique", "tag"),
+    UNITS(UnitsStatement.class, "units", "name"),
+    USES(UsesStatement.class, "uses", "name"),
+    VALUE(ValueStatement.class, "value", "value"),
+    WHEN(WhenStatement.class, "when", "condition"),
+    YANG_VERSION(YangVersionStatement.class, "yang-version", "value"),
+    YIN_ELEMENT(YinElementStatement.class, "yin-element", "value");
 
     private final Class<? extends DeclaredStatement<?>> type;
     private final QName name;
     private final QName argument;
     private final boolean yinElement;
 
-
     private Rfc6020Mapping(Class<? extends DeclaredStatement<?>> clz, final String nameStr) {
         type = Preconditions.checkNotNull(clz);
         name = yinQName(nameStr);

diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaToStatementWriterAdaptor.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaToStatementWriterAdaptor.java
index 8dbe7f4b4a315ccdbb720ead8d55cf91b6dc1a6c..4712dbd745530b0df3c2c2378bdae0e8b17ed9d2 100644 (file)
--- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaToStatementWriterAdaptor.java
+++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaToStatementWriterAdaptor.java
@@ -43,55 +43,55 @@ final class SchemaToStatementWriterAdaptor implements Rfc6020ModuleWriter {
 
     @Override
     public void startModuleNode(final String identifier) {
-        writer.startStatement(Rfc6020Mapping.Module);
+        writer.startStatement(Rfc6020Mapping.MODULE);
         writer.writeArgument(identifier);
     }
 
     @Override
     public void startOrganizationNode(final String input) {
-        writer.startStatement(Rfc6020Mapping.Organization);
+        writer.startStatement(Rfc6020Mapping.ORGANIZATION);
         writer.writeArgument(input);
     }
 
     @Override
     public void startContactNode(final String input) {
-        writer.startStatement(Rfc6020Mapping.Contact);
+        writer.startStatement(Rfc6020Mapping.CONTACT);
         writer.writeArgument(input);
     }
 
     @Override
     public void startDescriptionNode(final String input) {
-        writer.startStatement(Rfc6020Mapping.Description);
+        writer.startStatement(Rfc6020Mapping.DESCRIPTION);
         writer.writeArgument(input);
     }
 
     @Override
     public void startReferenceNode(final String input) {
-        writer.startStatement(Rfc6020Mapping.Reference);
+        writer.startStatement(Rfc6020Mapping.REFERENCE);
         writer.writeArgument(input);
     }
 
     @Override
     public void startUnitsNode(final String input) {
-        writer.startStatement(Rfc6020Mapping.Units);
+        writer.startStatement(Rfc6020Mapping.UNITS);
         writer.writeArgument(input);
     }
 
     @Override
     public void startYangVersionNode(final String input) {
-        writer.startStatement(Rfc6020Mapping.YangVersion);
+        writer.startStatement(Rfc6020Mapping.YANG_VERSION);
         writer.writeArgument(input);
     }
 
     @Override
     public void startNamespaceNode(final URI uri) {
-        writer.startStatement(Rfc6020Mapping.Namespace);
+        writer.startStatement(Rfc6020Mapping.NAMESPACE);
         writer.writeArgument(uri.toString());
     }
 
     @Override
     public void startKeyNode(final List<QName> keyList) {
-        writer.startStatement(Rfc6020Mapping.Key);
+        writer.startStatement(Rfc6020Mapping.KEY);
         final StringBuilder keyStr = new StringBuilder();
         for (final QName item : keyList) {
             keyStr.append(item.getLocalName());
@@ -101,281 +101,281 @@ final class SchemaToStatementWriterAdaptor implements Rfc6020ModuleWriter {
 
     @Override
     public void startPrefixNode(final String input) {
-        writer.startStatement(Rfc6020Mapping.Prefix);
+        writer.startStatement(Rfc6020Mapping.PREFIX);
         writer.writeArgument(input);
     }
 
     @Override
     public void startFeatureNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Feature);
+        writer.startStatement(Rfc6020Mapping.FEATURE);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startExtensionNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Extension);
+        writer.startStatement(Rfc6020Mapping.EXTENSION);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startArgumentNode(final String input) {
-        writer.startStatement(Rfc6020Mapping.Argument);
+        writer.startStatement(Rfc6020Mapping.ARGUMENT);
         writer.writeArgument(input);
     }
 
     @Override
     public void startStatusNode(final Status status) {
-        writer.startStatement(Rfc6020Mapping.Status);
+        writer.startStatement(Rfc6020Mapping.STATUS);
         writer.writeArgument(status.toString().toLowerCase());
     }
 
     @Override
     public void startTypeNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Type);
+        writer.startStatement(Rfc6020Mapping.TYPE);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startLeafNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Leaf);
+        writer.startStatement(Rfc6020Mapping.LEAF);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startContainerNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Container);
+        writer.startStatement(Rfc6020Mapping.CONTAINER);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startGroupingNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Grouping);
+        writer.startStatement(Rfc6020Mapping.GROUPING);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startRpcNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Rpc);
+        writer.startStatement(Rfc6020Mapping.RPC);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startInputNode() {
-        writer.startStatement(Rfc6020Mapping.Input);
+        writer.startStatement(Rfc6020Mapping.INPUT);
     }
 
     @Override
     public void startOutputNode() {
-        writer.startStatement(Rfc6020Mapping.Output);
+        writer.startStatement(Rfc6020Mapping.OUTPUT);
     }
 
     @Override
     public void startLeafListNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.LeafList);
+        writer.startStatement(Rfc6020Mapping.LEAF_LIST);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startListNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.List);
+        writer.startStatement(Rfc6020Mapping.LIST);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startChoiceNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Choice);
+        writer.startStatement(Rfc6020Mapping.CHOICE);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startCaseNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Case);
+        writer.startStatement(Rfc6020Mapping.CASE);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startNotificationNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Notification);
+        writer.startStatement(Rfc6020Mapping.NOTIFICATION);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startIdentityNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Identity);
+        writer.startStatement(Rfc6020Mapping.IDENTITY);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startBaseNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Base);
+        writer.startStatement(Rfc6020Mapping.BASE);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startTypedefNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Typedef);
+        writer.startStatement(Rfc6020Mapping.TYPEDEF);
         writer.writeArgument(qName);
     }
 
     @Override
     public void startRevisionNode(final Date date) {
-        writer.startStatement(Rfc6020Mapping.Revision);
+        writer.startStatement(Rfc6020Mapping.REVISION);
         writer.writeArgument(SimpleDateFormatUtil.getRevisionFormat().format(date));
     }
 
     @Override
     public void startDefaultNode(final String string) {
-        writer.startStatement(Rfc6020Mapping.Default);
+        writer.startStatement(Rfc6020Mapping.DEFAULT);
         writer.writeArgument(string);
     }
 
     @Override
     public void startMustNode(final RevisionAwareXPath xpath) {
-        writer.startStatement(Rfc6020Mapping.Must);
+        writer.startStatement(Rfc6020Mapping.MUST);
         writer.writeArgument(xpath);
     }
 
     @Override
     public void startErrorMessageNode(final String input) {
-        writer.startStatement(Rfc6020Mapping.ErrorMessage);
+        writer.startStatement(Rfc6020Mapping.ERROR_MESSAGE);
         writer.writeArgument(input);
     }
 
     @Override
     public void startErrorAppTagNode(final String input) {
-        writer.startStatement(Rfc6020Mapping.ErrorAppTag);
+        writer.startStatement(Rfc6020Mapping.ERROR_APP_TAG);
         writer.writeArgument(input);
     }
 
     @Override
     public void startPatternNode(final String regularExpression) {
-        writer.startStatement(Rfc6020Mapping.Pattern);
+        writer.startStatement(Rfc6020Mapping.PATTERN);
         writer.writeArgument(regularExpression);
     }
 
     @Override
     public void startValueNode(final Integer integer) {
-        writer.startStatement(Rfc6020Mapping.Value);
+        writer.startStatement(Rfc6020Mapping.VALUE);
         writer.writeArgument(integer.toString());
     }
 
     @Override
     public void startEnumNode(final String name) {
-        writer.startStatement(Rfc6020Mapping.Enum);
+        writer.startStatement(Rfc6020Mapping.ENUM);
         writer.writeArgument(name);
     }
 
     @Override
     public void startRequireInstanceNode(final boolean require) {
-        writer.startStatement(Rfc6020Mapping.RequireInstance);
+        writer.startStatement(Rfc6020Mapping.REQUIRE_INSTANCE);
         writer.writeArgument(Boolean.toString(require));
     }
 
     @Override
     public void startPathNode(final RevisionAwareXPath revisionAwareXPath) {
-        writer.startStatement(Rfc6020Mapping.Path);
+        writer.startStatement(Rfc6020Mapping.PATH);
         writer.writeArgument(revisionAwareXPath);
     }
 
     @Override
     public void startBitNode(final String name) {
-        writer.startStatement(Rfc6020Mapping.Bit);
+        writer.startStatement(Rfc6020Mapping.BIT);
         writer.writeArgument(name);
     }
 
     @Override
     public void startPositionNode(final UnsignedInteger position) {
-        writer.startStatement(Rfc6020Mapping.Position);
+        writer.startStatement(Rfc6020Mapping.POSITION);
         writer.writeArgument(position.toString());
     }
 
     @Override
     public void startImportNode(final String moduleName) {
-        writer.startStatement(Rfc6020Mapping.Import);
+        writer.startStatement(Rfc6020Mapping.IMPORT);
         writer.writeArgument(moduleName);
     }
 
     @Override
     public void startRevisionDateNode(final Date date) {
-        writer.startStatement(Rfc6020Mapping.RevisionDate);
+        writer.startStatement(Rfc6020Mapping.REVISION_DATE);
         writer.writeArgument(SimpleDateFormatUtil.getRevisionFormat().format(date));
     }
 
     @Override
     public void startUsesNode(final QName groupingName) {
-        writer.startStatement(Rfc6020Mapping.Uses);
+        writer.startStatement(Rfc6020Mapping.USES);
         writer.writeArgument(groupingName);
     }
 
     @Override
     public void startAugmentNode(final SchemaPath targetPath) {
-        writer.startStatement(Rfc6020Mapping.Augment);
+        writer.startStatement(Rfc6020Mapping.AUGMENT);
         writer.writeArgument(targetPath);
     }
 
     @Override
     public void startConfigNode(final boolean config) {
-        writer.startStatement(Rfc6020Mapping.Config);
+        writer.startStatement(Rfc6020Mapping.CONFIG);
         writer.writeArgument(Boolean.toString(config));
     }
 
     @Override
     public void startLengthNode(final String lengthString) {
-        writer.startStatement(Rfc6020Mapping.Length);
+        writer.startStatement(Rfc6020Mapping.LENGTH);
         writer.writeArgument(lengthString);
     }
 
     @Override
     public void startMaxElementsNode(final Integer max) {
-        writer.startStatement(Rfc6020Mapping.MaxElements);
+        writer.startStatement(Rfc6020Mapping.MAX_ELEMENTS);
         writer.writeArgument(max.toString());
     }
 
     @Override
     public void startMinElementsNode(final Integer min) {
-        writer.startStatement(Rfc6020Mapping.MinElements);
+        writer.startStatement(Rfc6020Mapping.MIN_ELEMENTS);
         writer.writeArgument(min.toString());
     }
 
     @Override
     public void startPresenceNode(final boolean presence) {
-        writer.startStatement(Rfc6020Mapping.Presence);
+        writer.startStatement(Rfc6020Mapping.PRESENCE);
         writer.writeArgument(Boolean.toString(presence));
     }
 
     @Override
     public void startOrderedByNode(final String ordering) {
-        writer.startStatement(Rfc6020Mapping.OrderedBy);
+        writer.startStatement(Rfc6020Mapping.ORDERED_BY);
         writer.writeArgument(ordering);
     }
 
     @Override
     public void startRangeNode(final String rangeString) {
-        writer.startStatement(Rfc6020Mapping.Range);
+        writer.startStatement(Rfc6020Mapping.RANGE);
         writer.writeArgument(rangeString);
     }
 
     @Override
     public void startFractionDigitsNode(final Integer fractionDigits) {
-        writer.startStatement(Rfc6020Mapping.FractionDigits);
+        writer.startStatement(Rfc6020Mapping.FRACTION_DIGITS);
         writer.writeArgument(fractionDigits.toString());
     }
 
     @Override
     public void startRefineNode(final SchemaPath path) {
-        writer.startStatement(Rfc6020Mapping.Refine);
+        writer.startStatement(Rfc6020Mapping.REFINE);
         writer.writeArgument(path);
     }
 
     @Override
     public void startMandatoryNode(final boolean mandatory) {
-        writer.startStatement(Rfc6020Mapping.Mandatory);
+        writer.startStatement(Rfc6020Mapping.MANDATORY);
         writer.writeArgument(Boolean.toString(mandatory));
     }
 
     @Override
     public void startAnyxmlNode(final QName qName) {
-        writer.startStatement(Rfc6020Mapping.Anyxml);
+        writer.startStatement(Rfc6020Mapping.ANYXML);
         writer.writeArgument(qName);
     }
 
@@ -392,13 +392,13 @@ final class SchemaToStatementWriterAdaptor implements Rfc6020ModuleWriter {
 
     @Override
     public void startYinElementNode(final boolean yinElement) {
-        writer.startStatement(Rfc6020Mapping.YinElement);
+        writer.startStatement(Rfc6020Mapping.YIN_ELEMENT);
         writer.writeArgument(Boolean.toString(yinElement));
     }
 
     @Override
     public void startWhenNode(final RevisionAwareXPath revisionAwareXPath) {
-        writer.startStatement(Rfc6020Mapping.When);
+        writer.startStatement(Rfc6020Mapping.WHEN);
         writer.writeArgument(revisionAwareXPath);
     }
 }

diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java
index d44e2252be0a665f7783469e21177c57b2433cbd..572e9c7635ed42f8067c472071d0591fab87a6a7 100644 (file)
--- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java
+++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java
@@ -69,7 +69,7 @@ class SingleModuleYinStatementWriter implements StatementTextWriter {
         currentStatement = Preconditions.checkNotNull(statement);
         try {
             writeStartXmlElement(statement.getStatementName());
-            if (Rfc6020Mapping.Module.equals(statement) || Rfc6020Mapping.Submodule.equals(statement)) {
+            if (Rfc6020Mapping.MODULE.equals(statement) || Rfc6020Mapping.SUBMODULE.equals(statement)) {
                 declareXmlNamespaces(prefixToNamespace);
             }
         } catch (final XMLStreamException e) {

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java
index 1bb6d825e6ad128370712dd0bd51b939cdb3c7d9..a559e48474bc1a02081443e392478d88092ff351 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.parser.spi.meta;
 import javax.annotation.Nullable;
 
 public enum ModelProcessingPhase {
-
     /**
      *
      * Cross-source relationship resolution phase.
@@ -24,11 +23,10 @@ public enum ModelProcessingPhase {
      * visibility of custom defined statements in following
      * phases.
      */
-    SourceLinkage(null),
-    StatementDefinition(SourceLinkage),
-    FullDeclaration(StatementDefinition),
-    EffectiveModel(FullDeclaration);
-
+    SOURCE_LINKAGE(null),
+    STATEMENT_DEFINITION(SOURCE_LINKAGE),
+    FULL_DECLARATION(STATEMENT_DEFINITION),
+    EFFECTIVE_MODEL(FULL_DECLARATION);
 
     private final ModelProcessingPhase previousPhase;
 
@@ -39,5 +37,4 @@ public enum ModelProcessingPhase {
     public ModelProcessingPhase getPreviousPhase() {
         return previousPhase;
     }
-
 }

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java
index 0f795cc1710c81df39b79c44458d0a0ec8c2b92e..cdff074d675638e0b9eaef3f3d236a865e166850 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java
@@ -29,15 +29,13 @@ import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
 public abstract class NamespaceBehaviour<K,V, N extends IdentifierNamespace<K, V>> implements Identifiable<Class<N>>{
 
     public enum StorageNodeType {
-        Global,
-        SourceLocalSpecial,
-        StatementLocal
+        GLOBAL,
+        SOURCE_LOCAL_SPECIAL,
+        STATEMENT_LOCAL,
     }
 
     public interface Registry {
-
-        abstract <K, V, N extends IdentifierNamespace<K, V>> NamespaceBehaviour<K, V, N> getNamespaceBehaviour(Class<N> type);
-
+        <K, V, N extends IdentifierNamespace<K, V>> NamespaceBehaviour<K, V, N> getNamespaceBehaviour(Class<N> type);
     }
 
     public interface NamespaceStorageNode {
@@ -54,7 +52,6 @@ public abstract class NamespaceBehaviour<K,V, N extends IdentifierNamespace<K, V
 
     private final Class<N> identifier;
 
-
     protected NamespaceBehaviour(Class<N> identifier) {
         this.identifier = Preconditions.checkNotNull(identifier);
     }
@@ -64,13 +61,13 @@ public abstract class NamespaceBehaviour<K,V, N extends IdentifierNamespace<K, V
      * Creates global namespace behaviour for supplied namespace type.
      *
      * Global behaviour stores and loads all values from root {@link NamespaceStorageNode}
-     * with type of {@link StorageNodeType#Global}.
+     * with type of {@link StorageNodeType#GLOBAL}.
      *
      * @param identifier Namespace identifier.
      * @return global namespace behaviour for supplied namespace type.
      */
     public static @Nonnull <K,V, N extends IdentifierNamespace<K, V>>  NamespaceBehaviour<K,V,N> global(Class<N> identifier) {
-        return new StorageSpecific<>(identifier, StorageNodeType.Global);
+        return new StorageSpecific<>(identifier, StorageNodeType.GLOBAL);
     }
 
     /**
@@ -79,13 +76,13 @@ public abstract class NamespaceBehaviour<K,V, N extends IdentifierNamespace<K, V
      *
      * Source-local namespace behaviour stores and loads all values from closest
      * {@link NamespaceStorageNode} ancestor with type of
-     * {@link StorageNodeType#SourceLocalSpecial}.
+     * {@link StorageNodeType#SOURCE_LOCAL_SPECIAL}.
      *
      * @param identifier Namespace identifier.
      * @return source-local namespace behaviour for supplied namespace type.
      */
     public static <K,V, N extends IdentifierNamespace<K, V>> NamespaceBehaviour<K,V,N> sourceLocal(Class<N> identifier) {
-        return new StorageSpecific<>(identifier, StorageNodeType.SourceLocalSpecial);
+        return new StorageSpecific<>(identifier, StorageNodeType.SOURCE_LOCAL_SPECIAL);
     }
 
     /**
@@ -105,7 +102,6 @@ public abstract class NamespaceBehaviour<K,V, N extends IdentifierNamespace<K, V
     public abstract V getFrom(NamespaceStorageNode storage, K key);
     public abstract void addTo(NamespaceStorageNode storage,K key,V value);
 
-
     @Override
     public Class<N> getIdentifier() {
         return identifier;
@@ -173,5 +169,4 @@ public abstract class NamespaceBehaviour<K,V, N extends IdentifierNamespace<K, V
         }
 
     }
-
 }

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java
index 321c3e910e1c871b51e0a7a591eedfc69190bc4a..e270f806a91f93812d13dab32d8cd4c36c10732a 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java
@@ -56,10 +56,10 @@ public interface StatementSupport<A, D extends DeclaredStatement<A>, E extends E
     /**
      *
      * Invoked when statement is closed during
-     * {@link ModelProcessingPhase#StatementDefinition} phase.
+     * {@link ModelProcessingPhase#STATEMENT_DEFINITION} phase.
      *
      * Invoked when statement is closed during
-     * {@link ModelProcessingPhase#StatementDefinition} phase, only substatements from
+     * {@link ModelProcessingPhase#STATEMENT_DEFINITION} phase, only substatements from
      * this and previous phase are available.
      *
      * Implementation may use method to perform actions on this event or
@@ -75,10 +75,10 @@ public interface StatementSupport<A, D extends DeclaredStatement<A>, E extends E
     /**
      *
      * Invoked when statement is closed during
-     * {@link ModelProcessingPhase#StatementDefinition} phase.
+     * {@link ModelProcessingPhase#STATEMENT_DEFINITION} phase.
      *
      * Invoked when statement is closed during
-     * {@link ModelProcessingPhase#StatementDefinition} phase, only substatements from
+     * {@link ModelProcessingPhase#STATEMENT_DEFINITION} phase, only substatements from
      * this phase are available.
      *
      * Implementation may use method to perform actions on this event or
@@ -95,10 +95,10 @@ public interface StatementSupport<A, D extends DeclaredStatement<A>, E extends E
     /**
      *
      * Invoked when statement is closed during
-     * {@link ModelProcessingPhase#FullDeclaration} phase.
+     * {@link ModelProcessingPhase#FULL_DECLARATION} phase.
      *
      * Invoked when statement is closed during
-     * {@link ModelProcessingPhase#FullDeclaration} phase, only substatements
+     * {@link ModelProcessingPhase#FULL_DECLARATION} phase, only substatements
      * from this phase are available.
      *
      * Implementation may use method to perform actions on this event or

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java
index b5380224047a81674756715b0d2fed91b35349b8..7bfee3471b203a750190448748300b2269dcc31b 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java
@@ -39,10 +39,10 @@ import org.opendaylight.yangtools.yang.parser.stmt.reactor.SourceSpecificContext
 class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBehaviour.Registry {
 
     private static final List<ModelProcessingPhase> PHASE_EXECUTION_ORDER = ImmutableList.<ModelProcessingPhase>builder()
-            .add(ModelProcessingPhase.SourceLinkage)
-            .add(ModelProcessingPhase.StatementDefinition)
-            .add(ModelProcessingPhase.FullDeclaration)
-            .add(ModelProcessingPhase.EffectiveModel)
+            .add(ModelProcessingPhase.SOURCE_LINKAGE)
+            .add(ModelProcessingPhase.STATEMENT_DEFINITION)
+            .add(ModelProcessingPhase.FULL_DECLARATION)
+            .add(ModelProcessingPhase.EFFECTIVE_MODEL)
             .build();
 
     private final Map<QName,StatementDefinitionContext<?,?,?>> definitions = new HashMap<>();
@@ -66,7 +66,7 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh
 
     @Override
     public StorageNodeType getStorageNodeType() {
-        return StorageNodeType.Global;
+        return StorageNodeType.GLOBAL;
     }
 
     @Override
@@ -126,7 +126,7 @@ class BuildGlobalContext extends NamespaceStorageSupport implements NamespaceBeh
     }
 
     private EffectiveModelContext transform() {
-        Preconditions.checkState(finishedPhase == ModelProcessingPhase.EffectiveModel);
+        Preconditions.checkState(finishedPhase == ModelProcessingPhase.EFFECTIVE_MODEL);
         List<DeclaredStatement<?>> rootStatements = new ArrayList<>();
         for(SourceSpecificContext source : sources) {
             DeclaredStatement<?> root = source.getRoot().buildDeclared();

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 fba7bb997c78b0330558e8091a3e5e3f080945ba..c8d205409a5ed808abf6894bb7e8e7313363464a 100644 (file)
--- 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
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.reactor;
 
-import static org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase.EffectiveModel;
-import static org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase.FullDeclaration;
+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;
@@ -125,7 +125,7 @@ class ModifierImpl implements ModelActionBuilder {
         try {
             PhaseFinished<C> phaseFin = new PhaseFinished<C>();
             addReq(phaseFin);
-            contextImpl(context).addPhaseCompletedListener(FullDeclaration,phaseFin);
+            contextImpl(context).addPhaseCompletedListener(FULL_DECLARATION,phaseFin);
             return phaseFin;
         } catch (SourceException e) {
             throw shouldNotHappenProbablyBug(e);
@@ -172,37 +172,37 @@ class ModifierImpl implements ModelActionBuilder {
 
     @Override
     public <D extends DeclaredStatement<?>> Prerequisite<D> requiresDeclared(StmtContext<?, ? extends D, ?> context) {
-        return requiresCtxImpl(context,FullDeclaration).transform(StmtContextUtils.<D>buildDeclared());
+        return requiresCtxImpl(context,FULL_DECLARATION).transform(StmtContextUtils.<D>buildDeclared());
     }
 
     @Override
     public <K, D extends DeclaredStatement<?>, N extends StatementNamespace<K, ? extends D, ?>> AbstractPrerequisite<StmtContext<?, D, ?>> requiresDeclaredCtx(
             StmtContext<?, ?, ?> context, Class<N> namespace, K key) {
-        return requiresCtxImpl(context, namespace, key,FullDeclaration);
+        return requiresCtxImpl(context, namespace, key,FULL_DECLARATION);
     }
 
     @Override
     public <K, D extends DeclaredStatement<?>, N extends StatementNamespace<K, ? extends D, ?>> Prerequisite<D> requiresDeclared(
             StmtContext<?, ?, ?> context, Class<N> namespace, K key) {
-        final AbstractPrerequisite<StmtContext<?,D,?>> rawContext = requiresCtxImpl(context, namespace, key,FullDeclaration);
+        final AbstractPrerequisite<StmtContext<?,D,?>> rawContext = requiresCtxImpl(context, namespace, key,FULL_DECLARATION);
         return rawContext.transform(StmtContextUtils.<D>buildDeclared());
     }
 
     @Override
     public <E extends EffectiveStatement<?, ?>> Prerequisite<E> requiresEffective(StmtContext<?, ?, ? extends E> stmt) {
-        return requiresCtxImpl(stmt,EffectiveModel).transform(StmtContextUtils.<E>buildEffective());
+        return requiresCtxImpl(stmt,EFFECTIVE_MODEL).transform(StmtContextUtils.<E>buildEffective());
     }
 
     @Override
     public <K, E extends EffectiveStatement<?, ?>, N extends StatementNamespace<K, ?, ? extends E>> AbstractPrerequisite<StmtContext<?, ?, E>> requiresEffectiveCtx(
             StmtContext<?, ?, ?> context, Class<N> namespace, K key) {
-        return requiresCtxImpl(contextImpl(context),namespace,key,EffectiveModel);
+        return requiresCtxImpl(contextImpl(context),namespace,key,EFFECTIVE_MODEL);
     }
 
     @Override
     public <K, E extends EffectiveStatement<?, ?>, N extends StatementNamespace<K, ?, ? extends E>> Prerequisite<E> requiresEffective(
             StmtContext<?, ?, ?> context, Class<N> namespace, K key) {
-        final AbstractPrerequisite<StmtContext<?,?,E>> rawContext = requiresCtxImpl(context, namespace, key,EffectiveModel);
+        final AbstractPrerequisite<StmtContext<?,?,E>> rawContext = requiresCtxImpl(context, namespace, key,EFFECTIVE_MODEL);
         return rawContext.transform(StmtContextUtils.<E>buildEffective());
     }
 
@@ -219,14 +219,14 @@ class ModifierImpl implements ModelActionBuilder {
 
     @Override
     public <T extends Mutable<?, ?, ?>> Prerequisite<T> mutatesEffectiveCtx(T stmt) {
-        return mutatesCtx(stmt, EffectiveModel);
+        return mutatesCtx(stmt, EFFECTIVE_MODEL);
     }
 
 
    @Override
     public <K, E extends EffectiveStatement<?, ?>, N extends StatementNamespace<K, ?, ? extends E>> AbstractPrerequisite<Mutable<?, ?, E>> mutatesEffectiveCtx(
             StmtContext<?, ?, ?> context, Class<N> namespace, K key) {
-        return mutatesCtxImpl(context, namespace, key, EffectiveModel);
+        return mutatesCtxImpl(context, namespace, key, EFFECTIVE_MODEL);
     }
 
 

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 7cdcfb0ab5117663cf8c886e96539e1aabe7d6b1..b2d56f8f77e145b7c0834e7507258e0d0d74f5a2 100644 (file)
--- 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
@@ -118,7 +118,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh
 
     @Override
     public StorageNodeType getStorageNodeType() {
-        return StorageNodeType.SourceLocalSpecial;
+        return StorageNodeType.SOURCE_LOCAL_SPECIAL;
     }
 
     @Override
@@ -195,12 +195,12 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh
 
     void loadStatements() throws SourceException {
         switch (inProgressPhase) {
-        case SourceLinkage:
+        case SOURCE_LINKAGE:
             source.writeLinkage(new StatementContextWriter(this, inProgressPhase),stmtDef());
             break;
-        case StatementDefinition:
+        case STATEMENT_DEFINITION:
             source.writeLinkageAndStatementDefinitions(new StatementContextWriter(this, inProgressPhase), stmtDef(), prefixes());
-        case FullDeclaration:
+        case FULL_DECLARATION:
             source.writeFull(new StatementContextWriter(this, inProgressPhase), stmtDef(), prefixes());
 
         default:

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
index 035e192abaabcea6a4c0b4da2625ada20265ec43..0068ee47cbb133d2cd9a46429245847e10524859 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
@@ -189,12 +189,12 @@ abstract class StatementContextBase<A, D extends DeclaredStatement<A>, E extends
 
     @Override
     public StorageNodeType getStorageNodeType() {
-        return StorageNodeType.StatementLocal;
+        return StorageNodeType.STATEMENT_LOCAL;
     }
 
     @Override
     public D buildDeclared() {
-        Preconditions.checkArgument(completedPhase == ModelProcessingPhase.FullDeclaration || completedPhase == ModelProcessingPhase.EffectiveModel);
+        Preconditions.checkArgument(completedPhase == ModelProcessingPhase.FULL_DECLARATION || completedPhase == ModelProcessingPhase.EFFECTIVE_MODEL);
         if (declaredInstance == null) {
             declaredInstance = definition().getFactory().createDeclared(this);
         }
@@ -203,7 +203,7 @@ abstract class StatementContextBase<A, D extends DeclaredStatement<A>, E extends
 
     @Override
     public E buildEffective() {
-        Preconditions.checkArgument(completedPhase == ModelProcessingPhase.EffectiveModel);
+        Preconditions.checkArgument(completedPhase == ModelProcessingPhase.EFFECTIVE_MODEL);
         if (effectiveInstance == null) {
             effectiveInstance = definition().getFactory().createEffective(this);
         }

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java
index bf99398bd80c3639124686eeab6236d92139d7b1..fba236cd5e7bcfe1c3c38617d774d3879e3cd992 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java
@@ -51,12 +51,12 @@ class StatementDefinitionContext<A,D extends DeclaredStatement<A>,E extends Effe
 
     public void onDeclarationFinished(Mutable<A,D,E> statement, ModelProcessingPhase phase) throws SourceException {
         switch (phase) {
-        case SourceLinkage:
+        case SOURCE_LINKAGE:
             support.onLinkageDeclared(statement);
             break;
-        case StatementDefinition:
+        case STATEMENT_DEFINITION:
             support.onStatementDefinitionDeclared(statement);
-        case FullDeclaration:
+        case FULL_DECLARATION:
             support.onFullDefinitionDeclared(statement);
         default:
             break;

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java
index da3d8bc3ee3fba6f9775da2cc3a96e17eadfc559..360aee41e3ed5599563382708fad26836834c90f 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java
@@ -36,7 +36,7 @@ public class ContainerStatementImpl extends AbstractDeclaredStatement<QName> imp
     public static class Definition extends AbstractStatementSupport<QName,ContainerStatement,EffectiveStatement<QName,ContainerStatement>> {
 
         public Definition() {
-            super(Rfc6020Mapping.Container);
+            super(Rfc6020Mapping.CONTAINER);
         }
 
         @Override

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java
index 221dfec097aa9fc50832f6986e4231a8fbac2764..df2ee7aa0f9ff9147f227c981da2f625a4e91210 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
 
-import static org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase.SourceLinkage;
+import static org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase.SOURCE_LINKAGE;
 import static org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils.firstAttributeOf;
 
 import com.google.common.base.Optional;
@@ -37,7 +37,7 @@ public class ImportStatementDefinition extends
         AbstractStatementSupport<String, ImportStatement, EffectiveStatement<String, ImportStatement>> {
 
     public ImportStatementDefinition() {
-        super(Rfc6020Mapping.Import);
+        super(Rfc6020Mapping.IMPORT);
     }
 
     @Override
@@ -60,11 +60,11 @@ public class ImportStatementDefinition extends
     public void onLinkageDeclared(final Mutable<String, ImportStatement, EffectiveStatement<String, ImportStatement>> stmt)
             throws InferenceException, SourceException {
         final ModuleIdentifier impIdentifier = getImportedModuleIdentifier(stmt);
-        ModelActionBuilder importAction = stmt.newInferenceAction(SourceLinkage);
+        ModelActionBuilder importAction = stmt.newInferenceAction(SOURCE_LINKAGE);
         final Prerequisite<StmtContext<?, ?, ?>> imported;
         final Prerequisite<Mutable<?, ?, ?>> linkageTarget;
-        imported = importAction.requiresCtx(stmt, ModuleNamespace.class, impIdentifier, SourceLinkage);
-        linkageTarget = importAction.mutatesCtx(stmt.getRoot(),SourceLinkage);
+        imported = importAction.requiresCtx(stmt, ModuleNamespace.class, impIdentifier, SOURCE_LINKAGE);
+        linkageTarget = importAction.mutatesCtx(stmt.getRoot(),SOURCE_LINKAGE);
 
         importAction.apply(new InferenceAction() {
 

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java
index 1c3edcd376dff640dc6f28979b4d425cf6e4a5be..fadc8fccf855db7ca1144d5dda24ea719904337a 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java
@@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 public class ModuleStatementSupport extends AbstractStatementSupport<String, ModuleStatement, EffectiveStatement<String,ModuleStatement>> {
 
     public ModuleStatementSupport() {
-        super(Rfc6020Mapping.Module);
+        super(Rfc6020Mapping.MODULE);
     }
 
     @Override

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java
index acd9394b5f0ab2fb874ffcaea4f1d171f71e29fd..ad2eb0aee1e8a73fba915649401d9c6dee72c6c8 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java
@@ -19,7 +19,7 @@ public class NamespaceStatementImpl extends AbstractDeclaredStatement<URI> imple
     public static class Definition extends AbstractStatementSupport<URI,NamespaceStatement,EffectiveStatement<URI,NamespaceStatement>> {
 
         public Definition() {
-            super(org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping.Namespace);
+            super(org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping.NAMESPACE);
         }
 
         @Override

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java
index df63da002ec925ac121b8b7a49ae5796860224a7..eeb9824df407fc7e06aa92621403f73be5f87fdb 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java
@@ -19,7 +19,7 @@ public class PrefixStatementImpl extends AbstractDeclaredStatement<String> imple
     public static class Definition extends AbstractStatementSupport<String,PrefixStatement,EffectiveStatement<String,PrefixStatement>> {
 
         public Definition() {
-            super(Rfc6020Mapping.Prefix);
+            super(Rfc6020Mapping.PREFIX);
         }
 
         @Override

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java
index 324eeaff6fbf4af853627ecc7bdf606a7b134eb2..a9bab4de76eca85c0fcb34443526d4e38736a172 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java
@@ -45,7 +45,7 @@ public class UsesStatementImpl extends AbstractDeclaredStatement<QName> implemen
             AbstractStatementSupport<QName, UsesStatement, EffectiveStatement<QName, UsesStatement>> {
 
         public Definition() {
-            super(Rfc6020Mapping.Uses);
+            super(Rfc6020Mapping.USES);
         }
 
         @Override
@@ -54,7 +54,7 @@ public class UsesStatementImpl extends AbstractDeclaredStatement<QName> implemen
         }
 
         public void onStatementDeclared(Mutable<QName, UsesStatement, ?> usesNode) throws InferenceException {
-            ModelActionBuilder modifier = usesNode.newInferenceAction(ModelProcessingPhase.EffectiveModel);
+            ModelActionBuilder modifier = usesNode.newInferenceAction(ModelProcessingPhase.EFFECTIVE_MODEL);
             final QName groupingName = usesNode.getStatementArgument();
             final StatementSourceReference usesSource = usesNode.getStatementSourceReference();
             final Prerequisite<?> targetPre = modifier.mutatesEffectiveCtx(usesNode.getParentContext());

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangInferencePipeline.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangInferencePipeline.java
index c16cd191acc975d40ac539d33ff936bfb4cc4bd1..4dd537714d67401ce751ea0e95aaa1f43d9ee625 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangInferencePipeline.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangInferencePipeline.java
@@ -36,17 +36,17 @@ public final class YangInferencePipeline {
 
     public static final Map<ModelProcessingPhase, StatementSupportBundle> RFC6020_BUNDLES = ImmutableMap
             .<ModelProcessingPhase, StatementSupportBundle> builder()
-            .put(ModelProcessingPhase.SourceLinkage, LINKAGE_BUNDLE)
-            .put(ModelProcessingPhase.StatementDefinition,STMT_DEF_BUNDLE)
-            .put(ModelProcessingPhase.FullDeclaration,FULL_DECL_BUNDLE)
-            .put(ModelProcessingPhase.EffectiveModel,FULL_DECL_BUNDLE)
+            .put(ModelProcessingPhase.SOURCE_LINKAGE, LINKAGE_BUNDLE)
+            .put(ModelProcessingPhase.STATEMENT_DEFINITION,STMT_DEF_BUNDLE)
+            .put(ModelProcessingPhase.FULL_DECLARATION,FULL_DECL_BUNDLE)
+            .put(ModelProcessingPhase.EFFECTIVE_MODEL,FULL_DECL_BUNDLE)
             .build();
 
     public static final CrossSourceStatementReactor RFC6020_REACTOR = CrossSourceStatementReactor.builder()
-            .setBundle(ModelProcessingPhase.SourceLinkage, LINKAGE_BUNDLE)
-            .setBundle(ModelProcessingPhase.StatementDefinition,STMT_DEF_BUNDLE)
-            .setBundle(ModelProcessingPhase.FullDeclaration,FULL_DECL_BUNDLE)
-            .setBundle(ModelProcessingPhase.EffectiveModel,FULL_DECL_BUNDLE)
+            .setBundle(ModelProcessingPhase.SOURCE_LINKAGE, LINKAGE_BUNDLE)
+            .setBundle(ModelProcessingPhase.STATEMENT_DEFINITION,STMT_DEF_BUNDLE)
+            .setBundle(ModelProcessingPhase.FULL_DECLARATION,FULL_DECL_BUNDLE)
+            .setBundle(ModelProcessingPhase.EFFECTIVE_MODEL,FULL_DECL_BUNDLE)
             .build();
 
     private YangInferencePipeline() {

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 afcd486bdb830ec6099b3fa306b8530c3eefa63f..b1bcbd351d352663e136e3100629403683667153 100644 (file)
--- 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
@@ -57,7 +57,7 @@ public class ImportResolutionTest {
             fail("reactor.process should fail doe to misssing imported source");
         } catch (ReactorException e) {
             assertTrue(e instanceof SomeModifiersUnresolvedException);
-            assertEquals(ModelProcessingPhase.SourceLinkage,e.getPhase());
+            assertEquals(ModelProcessingPhase.SOURCE_LINKAGE,e.getPhase());
         }
 
     }
@@ -71,7 +71,7 @@ public class ImportResolutionTest {
             fail("reactor.process should fail doe to circular import");
         } catch (ReactorException e) {
             assertTrue(e instanceof SomeModifiersUnresolvedException);
-            assertEquals(ModelProcessingPhase.SourceLinkage,e.getPhase());
+            assertEquals(ModelProcessingPhase.SOURCE_LINKAGE,e.getPhase());
         }
     }
 
@@ -84,7 +84,7 @@ public class ImportResolutionTest {
             fail("reactor.process should fail doe to self import");
         } catch (ReactorException e) {
             assertTrue(e instanceof SomeModifiersUnresolvedException);
-            assertEquals(ModelProcessingPhase.SourceLinkage,e.getPhase());
+            assertEquals(ModelProcessingPhase.SOURCE_LINKAGE,e.getPhase());
         }
     }
 

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/TestStatementSource.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/TestStatementSource.java
index 6da6f06066ad859754bf781f44dea6db34dbcd54..8893e7401b43def09d8e8871893b70380383b159 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/TestStatementSource.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/TestStatementSource.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.stmt.test;
 
-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.Prefix;
+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.PREFIX;
 
 import java.util.Arrays;
 import java.util.List;
@@ -52,11 +52,8 @@ class TestStatementSource implements StatementStreamSource {
         extensions();
         body();
         end();
-
     }
 
-
-
     @Override
     public void writeLinkage(StatementWriter writer, QNameToStatementDefinition stmtDef) throws SourceException {
         this.writer = writer;
@@ -70,7 +67,6 @@ class TestStatementSource implements StatementStreamSource {
         header();
         extensions();
         end();
-
     }
 
     protected void extensions() {
@@ -83,12 +79,12 @@ class TestStatementSource implements StatementStreamSource {
     }
 
     TestStatementSource header() throws SourceException {
-        stmt(Module).arg(name); {
-            stmt(Namespace).arg(getNamespace()).end();
-            stmt(Prefix).arg(name).end();
-            for(String imp : imports)  {
-                stmt(Import).arg(imp);
-                    stmt(Prefix).arg(imp).end();
+        stmt(MODULE).arg(name); {
+            stmt(NAMESPACE).arg(getNamespace()).end();
+            stmt(PREFIX).arg(name).end();
+            for(String imp : imports) {
+                stmt(IMPORT).arg(imp);
+                    stmt(PREFIX).arg(imp).end();
                 end();
             }
         }
@@ -113,6 +109,4 @@ class TestStatementSource implements StatementStreamSource {
         writer.endStatement(REF);
         return this;
     }
-
-
 }