Fix checkstyle in yang-model-export

Fix violations and enable enforcement.

Change-Id: I22ac0386510e001e09d3fd883876f92785e2f88f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-model-export/pom.xml b/yang/yang-model-export/pom.xml
index 841d9d75a5afe370dc3d8d8f6074430933ff56d0..7e1ed5946bd88b62f0c6338f0af5ac17563abce5 100644 (file)
--- a/yang/yang-model-export/pom.xml
+++ b/yang/yang-model-export/pom.xml
@@ -76,4 +76,15 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java
index 875711c1fd760a2b0109111142ba39e8bb6f6dd1..bb12e0166ef03c754c2c90355a61a292fe478652 100644 (file)
--- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java
+++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java
@@ -202,7 +202,7 @@ abstract class SchemaContextEmitter {
              * use DeclaredSchemaContextEmitter
              */
             new DeclaredSchemaContextEmitter(yangSchemaWriter, extensions, module.getYangVersion())
-            .emitModule(((EffectiveStatement<?, ?>) module).getDeclared());
+                .emitModule(((EffectiveStatement<?, ?>) module).getDeclared());
         } else {
             /*
              * if we don't have access to declared form of supplied module or we
@@ -210,7 +210,7 @@ abstract class SchemaContextEmitter {
              * by uses or augment), we use EffectiveSchemaContextEmitter.
              */
             new EffectiveSchemaContextEmitter(yangSchemaWriter, extensions, module.getYangVersion(), emitInstantiated)
-            .emitModule(module);
+                .emitModule(module);
         }
     }
 
@@ -1390,8 +1390,8 @@ abstract class SchemaContextEmitter {
             }
         }
 
-        private void emitBase(final QName qName) {
-            super.writer.startBaseNode(qName);
+        private void emitBase(final QName qname) {
+            super.writer.startBaseNode(qname);
             super.writer.endNode();
         }
 

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 7e930b0527aaf4a38daf41daa3b968b77d781050..fe60336161bf975127fe82646cc2d73a3988ba80 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
@@ -48,255 +48,243 @@ final class SchemaToStatementWriterAdaptor implements YangModuleWriter {
     }
 
     @Override
-    public void startModuleNode(final String identifier) {
-        writer.startStatement(YangStmtMapping.MODULE);
-        writer.writeArgument(identifier);
+    public void startActionNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.ACTION);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startOrganizationNode(final String input) {
-        writer.startStatement(YangStmtMapping.ORGANIZATION);
-        writer.writeArgument(input);
+    public void startActionNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.ACTION);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startContactNode(final String input) {
-        writer.startStatement(YangStmtMapping.CONTACT);
-        writer.writeArgument(input);
+    public void startAnydataNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.ANYDATA);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startDescriptionNode(final String input) {
-        writer.startStatement(YangStmtMapping.DESCRIPTION);
-        writer.writeArgument(input);
+    public void startAnydataNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.ANYDATA);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startReferenceNode(final String input) {
-        writer.startStatement(YangStmtMapping.REFERENCE);
-        writer.writeArgument(input);
+    public void startAnyxmlNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.ANYXML);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startUnitsNode(final String input) {
-        writer.startStatement(YangStmtMapping.UNITS);
-        writer.writeArgument(input);
+    public void startAnyxmlNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.ANYXML);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startYangVersionNode(final String input) {
-        writer.startStatement(YangStmtMapping.YANG_VERSION);
+    public void startArgumentNode(final String input) {
+        writer.startStatement(YangStmtMapping.ARGUMENT);
         writer.writeArgument(input);
     }
 
     @Override
-    public void startNamespaceNode(final URI uri) {
-        writer.startStatement(YangStmtMapping.NAMESPACE);
-        writer.writeArgument(uri.toString());
-    }
-
-    @Override
-    public void startKeyNode(final List<QName> keyList) {
-        writer.startStatement(YangStmtMapping.KEY);
-        final StringBuilder keyStr = new StringBuilder();
-        final Iterator<QName> iter = keyList.iterator();
-        while (iter.hasNext()) {
-            keyStr.append(iter.next().getLocalName());
-            if (iter.hasNext()) {
-                keyStr.append(' ');
-            }
-        }
-        writer.writeArgument(keyStr.toString());
+    public void startAugmentNode(final SchemaPath targetPath) {
+        writer.startStatement(YangStmtMapping.AUGMENT);
+        writer.writeArgument(targetPath);
     }
 
     @Override
-    public void startPrefixNode(final String input) {
-        writer.startStatement(YangStmtMapping.PREFIX);
-        writer.writeArgument(input);
+    public void startAugmentNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.AUGMENT);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startFeatureNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.FEATURE);
-        writer.writeArgument(qName);
+    public void startBaseNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.BASE);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startExtensionNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.EXTENSION);
-        writer.writeArgument(qName);
+    public void startBaseNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.BASE);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startArgumentNode(final String input) {
-        writer.startStatement(YangStmtMapping.ARGUMENT);
-        writer.writeArgument(input);
+    public void startBelongsToNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.BELONGS_TO);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startStatusNode(final Status status) {
-        writer.startStatement(YangStmtMapping.STATUS);
-        writer.writeArgument(status.toString().toLowerCase());
+    public void startBitNode(final String name) {
+        writer.startStatement(YangStmtMapping.BIT);
+        writer.writeArgument(name);
     }
 
     @Override
-    public void startTypeNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.TYPE);
-        writer.writeArgument(qName);
+    public void startCaseNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.CASE);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startLeafNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.LEAF);
-        writer.writeArgument(qName);
+    public void startCaseNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.CASE);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startContainerNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.CONTAINER);
-        writer.writeArgument(qName);
+    public void startChoiceNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.CHOICE);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startGroupingNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.GROUPING);
-        writer.writeArgument(qName);
+    public void startChoiceNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.CHOICE);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startRpcNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.RPC);
-        writer.writeArgument(qName);
+    public void startConfigNode(final boolean config) {
+        writer.startStatement(YangStmtMapping.CONFIG);
+        writer.writeArgument(Boolean.toString(config));
     }
 
     @Override
-    public void startInputNode() {
-        writer.startStatement(YangStmtMapping.INPUT);
+    public void startConfigNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.CONFIG);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startOutputNode() {
-        writer.startStatement(YangStmtMapping.OUTPUT);
+    public void startContactNode(final String input) {
+        writer.startStatement(YangStmtMapping.CONTACT);
+        writer.writeArgument(input);
     }
 
     @Override
-    public void startLeafListNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.LEAF_LIST);
-        writer.writeArgument(qName);
+    public void startContainerNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.CONTAINER);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startListNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.LIST);
-        writer.writeArgument(qName);
+    public void startContainerNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.CONTAINER);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startChoiceNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.CHOICE);
-        writer.writeArgument(qName);
+    public void startDefaultNode(final String string) {
+        writer.startStatement(YangStmtMapping.DEFAULT);
+        writer.writeArgument(string);
     }
 
     @Override
-    public void startCaseNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.CASE);
-        writer.writeArgument(qName);
+    public void startDescriptionNode(final String input) {
+        writer.startStatement(YangStmtMapping.DESCRIPTION);
+        writer.writeArgument(input);
     }
 
     @Override
-    public void startNotificationNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.NOTIFICATION);
-        writer.writeArgument(qName);
+    public void startDeviateNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.DEVIATE);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startIdentityNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.IDENTITY);
-        writer.writeArgument(qName);
+    public void startDeviationNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.DEVIATION);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startBaseNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.BASE);
-        writer.writeArgument(qName);
+    public void startEnumNode(final String name) {
+        writer.startStatement(YangStmtMapping.ENUM);
+        writer.writeArgument(name);
     }
 
     @Override
-    public void startTypedefNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.TYPEDEF);
-        writer.writeArgument(qName);
+    public void startErrorAppTagNode(final String input) {
+        writer.startStatement(YangStmtMapping.ERROR_APP_TAG);
+        writer.writeArgument(input);
     }
 
     @Override
-    public void startRevisionNode(final Revision date) {
-        writer.startStatement(YangStmtMapping.REVISION);
-        writer.writeArgument(date.toString());
+    public void startErrorMessageNode(final String input) {
+        writer.startStatement(YangStmtMapping.ERROR_MESSAGE);
+        writer.writeArgument(input);
     }
 
     @Override
-    public void startDefaultNode(final String string) {
-        writer.startStatement(YangStmtMapping.DEFAULT);
-        writer.writeArgument(string);
+    public void startExtensionNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.EXTENSION);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startMustNode(final RevisionAwareXPath xpath) {
-        writer.startStatement(YangStmtMapping.MUST);
-        writer.writeArgument(xpath);
+    public void startExtensionNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.EXTENSION);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startErrorMessageNode(final String input) {
-        writer.startStatement(YangStmtMapping.ERROR_MESSAGE);
-        writer.writeArgument(input);
+    public void startFeatureNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.FEATURE);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startErrorAppTagNode(final String input) {
-        writer.startStatement(YangStmtMapping.ERROR_APP_TAG);
-        writer.writeArgument(input);
+    public void startFeatureNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.FEATURE);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startPatternNode(final String regularExpression) {
-        writer.startStatement(YangStmtMapping.PATTERN);
-        writer.writeArgument(regularExpression);
+    public void startFractionDigitsNode(final Integer fractionDigits) {
+        writer.startStatement(YangStmtMapping.FRACTION_DIGITS);
+        writer.writeArgument(fractionDigits.toString());
     }
 
     @Override
-    public void startValueNode(final Integer integer) {
-        writer.startStatement(YangStmtMapping.VALUE);
-        writer.writeArgument(integer.toString());
+    public void startFractionDigitsNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.FRACTION_DIGITS);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startEnumNode(final String name) {
-        writer.startStatement(YangStmtMapping.ENUM);
-        writer.writeArgument(name);
+    public void startGroupingNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.GROUPING);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startRequireInstanceNode(final boolean require) {
-        writer.startStatement(YangStmtMapping.REQUIRE_INSTANCE);
-        writer.writeArgument(Boolean.toString(require));
+    public void startGroupingNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.GROUPING);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startPathNode(final RevisionAwareXPath revisionAwareXPath) {
-        writer.startStatement(YangStmtMapping.PATH);
-        writer.writeArgument(revisionAwareXPath);
+    public void startIdentityNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.IDENTITY);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startBitNode(final String name) {
-        writer.startStatement(YangStmtMapping.BIT);
-        writer.writeArgument(name);
+    public void startIdentityNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.IDENTITY);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startPositionNode(final UnsignedInteger position) {
-        writer.startStatement(YangStmtMapping.POSITION);
-        writer.writeArgument(position.toString());
+    public void startIfFeatureNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.IF_FEATURE);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
@@ -306,420 +294,432 @@ final class SchemaToStatementWriterAdaptor implements YangModuleWriter {
     }
 
     @Override
-    public void startRevisionDateNode(final Revision date) {
-        writer.startStatement(YangStmtMapping.REVISION_DATE);
-        writer.writeArgument(date.toString());
+    public void startIncludeNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.INCLUDE);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startUsesNode(final QName groupingName) {
-        writer.startStatement(YangStmtMapping.USES);
-        writer.writeArgument(groupingName);
+    public void startInputNode() {
+        writer.startStatement(YangStmtMapping.INPUT);
     }
 
     @Override
-    public void startAugmentNode(final SchemaPath targetPath) {
-        writer.startStatement(YangStmtMapping.AUGMENT);
-        writer.writeArgument(targetPath);
+    public void startKeyNode(final List<QName> keyList) {
+        writer.startStatement(YangStmtMapping.KEY);
+        final StringBuilder keyStr = new StringBuilder();
+        final Iterator<QName> iter = keyList.iterator();
+        while (iter.hasNext()) {
+            keyStr.append(iter.next().getLocalName());
+            if (iter.hasNext()) {
+                keyStr.append(' ');
+            }
+        }
+        writer.writeArgument(keyStr.toString());
     }
 
     @Override
-    public void startConfigNode(final boolean config) {
-        writer.startStatement(YangStmtMapping.CONFIG);
-        writer.writeArgument(Boolean.toString(config));
+    public void startKeyNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.KEY);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startLengthNode(final String lengthString) {
-        writer.startStatement(YangStmtMapping.LENGTH);
-        writer.writeArgument(lengthString);
+    public void startLeafListNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.LEAF_LIST);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startMaxElementsNode(final Integer max) {
-        writer.startStatement(YangStmtMapping.MAX_ELEMENTS);
-        writer.writeArgument(max.toString());
+    public void startLeafListNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.LEAF_LIST);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startMinElementsNode(final Integer min) {
-        writer.startStatement(YangStmtMapping.MIN_ELEMENTS);
-        writer.writeArgument(min.toString());
+    public void startLeafNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.LEAF);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startPresenceNode(final boolean presence) {
-        writer.startStatement(YangStmtMapping.PRESENCE);
-        writer.writeArgument(Boolean.toString(presence));
+    public void startLeafNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.LEAF);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startOrderedByNode(final String ordering) {
-        writer.startStatement(YangStmtMapping.ORDERED_BY);
-        writer.writeArgument(ordering);
+    public void startLengthNode(final String lengthString) {
+        writer.startStatement(YangStmtMapping.LENGTH);
+        writer.writeArgument(lengthString);
     }
 
     @Override
-    public void startRangeNode(final String rangeString) {
-        writer.startStatement(YangStmtMapping.RANGE);
-        writer.writeArgument(rangeString);
+    public void startListNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.LIST);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startFractionDigitsNode(final Integer fractionDigits) {
-        writer.startStatement(YangStmtMapping.FRACTION_DIGITS);
-        writer.writeArgument(fractionDigits.toString());
+    public void startListNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.LIST);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startRefineNode(final SchemaPath path) {
-        writer.startStatement(YangStmtMapping.REFINE);
-        writer.writeArgument(path);
+    public void startMandatoryNode(final boolean mandatory) {
+        writer.startStatement(YangStmtMapping.MANDATORY);
+        writer.writeArgument(Boolean.toString(mandatory));
     }
 
     @Override
-    public void startMandatoryNode(final boolean mandatory) {
+    public void startMandatoryNode(final String rawArgument) {
         writer.startStatement(YangStmtMapping.MANDATORY);
-        writer.writeArgument(Boolean.toString(mandatory));
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startAnyxmlNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.ANYXML);
-        writer.writeArgument(qName);
+    public void startMaxElementsNode(final Integer max) {
+        writer.startStatement(YangStmtMapping.MAX_ELEMENTS);
+        writer.writeArgument(max.toString());
     }
 
     @Override
-    public void startUnknownNode(final StatementDefinition def) {
-        writer.startStatement(def);
+    public void startMaxElementsNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.MAX_ELEMENTS);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startUnknownNode(final StatementDefinition def, final String nodeParameter) {
-        writer.startStatement(def);
-        writer.writeArgument(nodeParameter);
+    public void startMinElementsNode(final Integer min) {
+        writer.startStatement(YangStmtMapping.MIN_ELEMENTS);
+        writer.writeArgument(min.toString());
     }
 
     @Override
-    public void startYinElementNode(final boolean yinElement) {
-        writer.startStatement(YangStmtMapping.YIN_ELEMENT);
-        writer.writeArgument(Boolean.toString(yinElement));
+    public void startMinElementsNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.MIN_ELEMENTS);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startWhenNode(final RevisionAwareXPath revisionAwareXPath) {
-        writer.startStatement(YangStmtMapping.WHEN);
-        writer.writeArgument(revisionAwareXPath);
+    public void startModifierNode(final ModifierKind modifier) {
+        writer.startStatement(YangStmtMapping.MODIFIER);
+        writer.writeArgument(modifier.getKeyword());
     }
 
     @Override
-    public void startAnydataNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.ANYDATA);
-        writer.writeArgument(qName);
+    public void startModifierNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.MODIFIER);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startActionNode(final QName qName) {
-        writer.startStatement(YangStmtMapping.ACTION);
-        writer.writeArgument(qName);
+    public void startModuleNode(final String identifier) {
+        writer.startStatement(YangStmtMapping.MODULE);
+        writer.writeArgument(identifier);
     }
 
     @Override
-    public void startModifierNode(final ModifierKind modifier) {
-        writer.startStatement(YangStmtMapping.MODIFIER);
-        writer.writeArgument(modifier.getKeyword());
+    public void startMustNode(final RevisionAwareXPath xpath) {
+        writer.startStatement(YangStmtMapping.MUST);
+        writer.writeArgument(xpath);
+    }
+
+    @Override
+    public void startMustNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.MUST);
+        writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startUniqueNode(final UniqueConstraint uniqueConstraint) {
-        writer.startStatement(YangStmtMapping.UNIQUE);
-        final StringBuilder uniqueStr = new StringBuilder();
-        final Collection<Relative> tag = uniqueConstraint.getTag();
-
-        final Iterator<Relative> iter = tag.iterator();
-        while (iter.hasNext()) {
-            uniqueStr.append(
-                    String.join("/", Iterables.transform(iter.next().getPathFromRoot(), qn -> qn.getLocalName())));
-            if (iter.hasNext()) {
-                uniqueStr.append(' ');
-            }
-        }
-        writer.writeArgument(uniqueStr.toString());
+    public void startNamespaceNode(final URI uri) {
+        writer.startStatement(YangStmtMapping.NAMESPACE);
+        writer.writeArgument(uri.toString());
     }
 
     @Override
-    public void startRevisionNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.REVISION);
-        writer.writeArgument(rawArgument);
+    public void startNotificationNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.NOTIFICATION);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startRevisionDateNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.REVISION_DATE);
+    public void startNotificationNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.NOTIFICATION);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startExtensionNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.EXTENSION);
-        writer.writeArgument(rawArgument);
+    public void startOrderedByNode(final String ordering) {
+        writer.startStatement(YangStmtMapping.ORDERED_BY);
+        writer.writeArgument(ordering);
     }
 
     @Override
-    public void startBaseNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.BASE);
-        writer.writeArgument(rawArgument);
+    public void startOrganizationNode(final String input) {
+        writer.startStatement(YangStmtMapping.ORGANIZATION);
+        writer.writeArgument(input);
     }
 
     @Override
-    public void startFeatureNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.FEATURE);
-        writer.writeArgument(rawArgument);
+    public void startOutputNode() {
+        writer.startStatement(YangStmtMapping.OUTPUT);
     }
 
     @Override
-    public void startYinElementNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.YIN_ELEMENT);
-        writer.writeArgument(rawArgument);
+    public void startPathNode(final RevisionAwareXPath revisionAwareXPath) {
+        writer.startStatement(YangStmtMapping.PATH);
+        writer.writeArgument(revisionAwareXPath);
     }
 
     @Override
-    public void startIdentityNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.IDENTITY);
+    public void startPathNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.PATH);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startTypedefNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.TYPEDEF);
-        writer.writeArgument(rawArgument);
+    public void startPatternNode(final String regularExpression) {
+        writer.startStatement(YangStmtMapping.PATTERN);
+        writer.writeArgument(regularExpression);
     }
 
     @Override
-    public void startRpcNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.RPC);
-        writer.writeArgument(rawArgument);
+    public void startPositionNode(final UnsignedInteger position) {
+        writer.startStatement(YangStmtMapping.POSITION);
+        writer.writeArgument(position.toString());
     }
 
     @Override
-    public void startTypeNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.TYPE);
+    public void startPositionNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.POSITION);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startContainerNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.CONTAINER);
-        writer.writeArgument(rawArgument);
+    public void startPrefixNode(final String input) {
+        writer.startStatement(YangStmtMapping.PREFIX);
+        writer.writeArgument(input);
     }
 
     @Override
-    public void startPresenceNode(final String rawArgument) {
+    public void startPresenceNode(final boolean presence) {
         writer.startStatement(YangStmtMapping.PRESENCE);
-        writer.writeArgument(rawArgument);
+        writer.writeArgument(Boolean.toString(presence));
     }
 
     @Override
-    public void startStatusNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.STATUS);
+    public void startPresenceNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.PRESENCE);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startConfigNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.CONFIG);
-        writer.writeArgument(rawArgument);
+    public void startRangeNode(final String rangeString) {
+        writer.startStatement(YangStmtMapping.RANGE);
+        writer.writeArgument(rangeString);
     }
 
     @Override
-    public void startLeafNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.LEAF);
-        writer.writeArgument(rawArgument);
+    public void startReferenceNode(final String input) {
+        writer.startStatement(YangStmtMapping.REFERENCE);
+        writer.writeArgument(input);
     }
 
     @Override
-    public void startWhenNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.WHEN);
-        writer.writeArgument(rawArgument);
+    public void startRefineNode(final SchemaPath path) {
+        writer.startStatement(YangStmtMapping.REFINE);
+        writer.writeArgument(path);
     }
 
     @Override
-    public void startLeafListNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.LEAF_LIST);
+    public void startRefineNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.REFINE);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startMustNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.MUST);
-        writer.writeArgument(rawArgument);
+    public void startRequireInstanceNode(final boolean require) {
+        writer.startStatement(YangStmtMapping.REQUIRE_INSTANCE);
+        writer.writeArgument(Boolean.toString(require));
     }
 
     @Override
-    public void startMinElementsNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.MIN_ELEMENTS);
+    public void startRequireInstanceNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.REQUIRE_INSTANCE);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startMaxElementsNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.MAX_ELEMENTS);
-        writer.writeArgument(rawArgument);
+    public void startRevisionDateNode(final Revision date) {
+        writer.startStatement(YangStmtMapping.REVISION_DATE);
+        writer.writeArgument(date.toString());
     }
 
     @Override
-    public void startListNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.LIST);
+    public void startRevisionDateNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.REVISION_DATE);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startKeyNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.KEY);
-        writer.writeArgument(rawArgument);
+    public void startRevisionNode(final Revision date) {
+        writer.startStatement(YangStmtMapping.REVISION);
+        writer.writeArgument(date.toString());
     }
 
     @Override
-    public void startUniqueNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.UNIQUE);
+    public void startRevisionNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.REVISION);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startActionNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.ACTION);
-        writer.writeArgument(rawArgument);
+    public void startRpcNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.RPC);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startChoiceNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.CHOICE);
+    public void startRpcNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.RPC);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startMandatoryNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.MANDATORY);
-        writer.writeArgument(rawArgument);
+    public void startStatusNode(final Status status) {
+        writer.startStatement(YangStmtMapping.STATUS);
+        writer.writeArgument(status.toString().toLowerCase());
     }
 
     @Override
-    public void startAnyxmlNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.ANYXML);
+    public void startStatusNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.STATUS);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startCaseNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.CASE);
+    public void startSubmoduleNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.SUBMODULE);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startAnydataNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.ANYDATA);
-        writer.writeArgument(rawArgument);
+    public void startTypeNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.TYPE);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startGroupingNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.GROUPING);
+    public void startTypeNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.TYPE);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startUsesNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.USES);
-        writer.writeArgument(rawArgument);
+    public void startTypedefNode(final QName qname) {
+        writer.startStatement(YangStmtMapping.TYPEDEF);
+        writer.writeArgument(qname);
     }
 
     @Override
-    public void startRefineNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.REFINE);
+    public void startTypedefNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.TYPEDEF);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startAugmentNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.AUGMENT);
-        writer.writeArgument(rawArgument);
+    public void startUniqueNode(final UniqueConstraint uniqueConstraint) {
+        writer.startStatement(YangStmtMapping.UNIQUE);
+        final StringBuilder uniqueStr = new StringBuilder();
+        final Collection<Relative> tag = uniqueConstraint.getTag();
+
+        final Iterator<Relative> iter = tag.iterator();
+        while (iter.hasNext()) {
+            uniqueStr.append(
+                    String.join("/", Iterables.transform(iter.next().getPathFromRoot(), qn -> qn.getLocalName())));
+            if (iter.hasNext()) {
+                uniqueStr.append(' ');
+            }
+        }
+        writer.writeArgument(uniqueStr.toString());
     }
 
     @Override
-    public void startNotificationNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.NOTIFICATION);
+    public void startUniqueNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.UNIQUE);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startValueNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.VALUE);
-        writer.writeArgument(rawArgument);
+    public void startUnitsNode(final String input) {
+        writer.startStatement(YangStmtMapping.UNITS);
+        writer.writeArgument(input);
     }
 
     @Override
-    public void startModifierNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.MODIFIER);
-        writer.writeArgument(rawArgument);
+    public void startUnknownNode(final StatementDefinition def) {
+        writer.startStatement(def);
     }
 
     @Override
-    public void startFractionDigitsNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.FRACTION_DIGITS);
-        writer.writeArgument(rawArgument);
+    public void startUnknownNode(final StatementDefinition def, final String nodeParameter) {
+        writer.startStatement(def);
+        writer.writeArgument(nodeParameter);
     }
 
     @Override
-    public void startPathNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.PATH);
-        writer.writeArgument(rawArgument);
+    public void startUsesNode(final QName groupingName) {
+        writer.startStatement(YangStmtMapping.USES);
+        writer.writeArgument(groupingName);
     }
 
     @Override
-    public void startRequireInstanceNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.REQUIRE_INSTANCE);
+    public void startUsesNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.USES);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startPositionNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.POSITION);
-        writer.writeArgument(rawArgument);
+    public void startValueNode(final Integer integer) {
+        writer.startStatement(YangStmtMapping.VALUE);
+        writer.writeArgument(integer.toString());
     }
 
     @Override
-    public void startBelongsToNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.BELONGS_TO);
+    public void startValueNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.VALUE);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startIfFeatureNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.IF_FEATURE);
-        writer.writeArgument(rawArgument);
+    public void startWhenNode(final RevisionAwareXPath revisionAwareXPath) {
+        writer.startStatement(YangStmtMapping.WHEN);
+        writer.writeArgument(revisionAwareXPath);
     }
 
     @Override
-    public void startSubmoduleNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.SUBMODULE);
+    public void startWhenNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.WHEN);
         writer.writeArgument(rawArgument);
     }
 
     @Override
-    public void startIncludeNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.INCLUDE);
-        writer.writeArgument(rawArgument);
+    public void startYangVersionNode(final String input) {
+        writer.startStatement(YangStmtMapping.YANG_VERSION);
+        writer.writeArgument(input);
     }
 
     @Override
-    public void startDeviationNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.DEVIATION);
-        writer.writeArgument(rawArgument);
+    public void startYinElementNode(final boolean yinElement) {
+        writer.startStatement(YangStmtMapping.YIN_ELEMENT);
+        writer.writeArgument(Boolean.toString(yinElement));
     }
 
     @Override
-    public void startDeviateNode(final String rawArgument) {
-        writer.startStatement(YangStmtMapping.DEVIATE);
+    public void startYinElementNode(final String rawArgument) {
+        writer.startStatement(YangStmtMapping.YIN_ELEMENT);
         writer.writeArgument(rawArgument);
     }
 }

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 59a4f784aba65063605da37d9c63cb6a83cf27b0..db45d54a17d221e6ebba1e82ca1b64415b1d53c2 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
@@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 @Deprecated
 @Beta
 @NotThreadSafe
-class SingleModuleYinStatementWriter implements StatementTextWriter {
+final class SingleModuleYinStatementWriter implements StatementTextWriter {
 
     private final XMLStreamWriter writer;
     private final URI currentModuleNs;
@@ -46,13 +46,14 @@ class SingleModuleYinStatementWriter implements StatementTextWriter {
     }
 
     private void initializeYinNamespaceInXml() {
-       try {
+        try {
             final String defaultNs = writer.getNamespaceContext().getNamespaceURI(XMLConstants.NULL_NS_URI);
             if (defaultNs == null) {
                 writer.setDefaultNamespace(YangConstants.RFC6020_YIN_NAMESPACE.toString());
             } else if (!YangConstants.RFC6020_YIN_NAMESPACE.toString().equals(defaultNs)) {
                 // FIXME: Implement support for exporting YIN as part of other XML document.
-                throw new UnsupportedOperationException("Not implemented support for nesting YIN in different XML element.");
+                throw new UnsupportedOperationException(
+                        "Not implemented support for nesting YIN in different XML element.");
             }
         } catch (final XMLStreamException e) {
             throw new IllegalStateException(e);
@@ -70,7 +71,7 @@ class SingleModuleYinStatementWriter implements StatementTextWriter {
         try {
             writeStartXmlElement(statement.getStatementName());
             if (YangStmtMapping.MODULE.equals(statement) || YangStmtMapping.SUBMODULE.equals(statement)) {
-                declareXmlNamespaces(prefixToNamespace);
+                declareXmlNamespaces();
             }
         } catch (final XMLStreamException e) {
             // FIXME: Introduce proper expression
@@ -181,7 +182,7 @@ class SingleModuleYinStatementWriter implements StatementTextWriter {
         String prefix = writer.getNamespaceContext().getPrefix(namespace.toString());
         if (prefix == null) {
             // FIXME: declare prefix
-            prefix =prefixToNamespace.inverse().get(namespace);
+            prefix = prefixToNamespace.inverse().get(namespace);
         }
         if (prefix == null) {
             throw new IllegalArgumentException("Namespace " + namespace + " is not bound to imported prefixes.");
@@ -193,7 +194,7 @@ class SingleModuleYinStatementWriter implements StatementTextWriter {
         writer.writeCharacters(strRep);
     }
 
-    private void declareXmlNamespaces(final Map<String, URI> prefixToNamespace) {
+    private void declareXmlNamespaces() {
         try {
             writer.writeDefaultNamespace(YangConstants.RFC6020_YIN_NAMESPACE.toString());
             for (final Entry<String, URI> nsDeclaration : prefixToNamespace.entrySet()) {
@@ -208,8 +209,8 @@ class SingleModuleYinStatementWriter implements StatementTextWriter {
         writer.writeEndElement();
     }
 
-    private void writeXmlArgument(final QName qName, final String value) throws XMLStreamException {
-        writer.writeAttribute(qName.getNamespace().toString(), qName.getLocalName(), value);
+    private void writeXmlArgument(final QName qname, final String value) throws XMLStreamException {
+        writer.writeAttribute(qname.getNamespace().toString(), qname.getLocalName(), value);
     }
 
     private void writeStartXmlElement(final QName name) throws XMLStreamException {

diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangModuleWriter.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangModuleWriter.java
index dab4bff1677b5b2d634cbb16e40979c9113ac5dd..e19ab354d88828e57efa7f269182af52c75ea01b 100644 (file)
--- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangModuleWriter.java
+++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangModuleWriter.java
@@ -21,226 +21,225 @@ import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
 
 @Deprecated
 interface YangModuleWriter {
-
     void endNode();
 
-    void startModuleNode(String identifier);
-
-    void startOrganizationNode(String input);
-
-    void startContactNode(String input);
-
-    void startDescriptionNode(String input);
+    void startActionNode(QName qname);
 
-    void startUnitsNode(String input);
+    void startActionNode(String rawArgument);
 
-    void startYangVersionNode(String input);
+    void startAnydataNode(QName qname);
 
-    void startNamespaceNode(URI uri);
+    void startAnydataNode(String rawArgument);
 
-    void startKeyNode(List<QName> keyList);
+    void startAnyxmlNode(QName qname);
 
-    void startPrefixNode(String input);
+    void startAnyxmlNode(String rawArgument);
 
-    void startFeatureNode(QName qName);
+    void startArgumentNode(String input);
 
-    void startExtensionNode(QName qName);
+    void startAugmentNode(SchemaPath targetPath);
 
-    void startArgumentNode(String input);
+    void startAugmentNode(String rawArgument);
 
-    void startStatusNode(Status status);
+    void startBaseNode(QName qname);
 
-    void startTypeNode(QName qName);
+    void startBaseNode(String rawArgument);
 
-    void startLeafNode(QName qName);
+    void startBelongsToNode(String rawArgument);
 
-    void startContainerNode(QName qName);
+    void startBitNode(String name);
 
-    void startGroupingNode(QName qName);
+    void startCaseNode(QName qname);
 
-    void startRpcNode(QName qName);
+    void startCaseNode(String rawArgument);
 
-    void startInputNode();
+    void startChoiceNode(QName qname);
 
-    void startOutputNode();
+    void startChoiceNode(String rawArgument);
 
-    void startLeafListNode(QName qName);
+    void startConfigNode(boolean config);
 
-    void startListNode(QName qName);
+    void startConfigNode(String rawArgument);
 
-    void startChoiceNode(QName qName);
+    void startContactNode(String input);
 
-    void startCaseNode(QName qName);
+    void startContainerNode(QName qname);
 
-    void startNotificationNode(QName qName);
+    void startContainerNode(String rawArgument);
 
-    void startIdentityNode(QName qName);
+    void startDefaultNode(String string);
 
-    void startBaseNode(QName qName);
+    void startDescriptionNode(String input);
 
-    void startTypedefNode(QName qName);
+    void startDeviateNode(String rawArgument);
 
-    void startRevisionNode(Revision date);
+    void startDeviationNode(String rawArgument);
 
-    void startDefaultNode(String string);
+    void startEnumNode(String name);
 
-    void startMustNode(RevisionAwareXPath xpath);
+    void startErrorAppTagNode(String input);
 
     void startErrorMessageNode(String input);
 
-    void startErrorAppTagNode(String input);
+    void startExtensionNode(QName qname);
 
-    void startPatternNode(String regularExpression);
+    void startExtensionNode(String rawArgument);
 
-    void startValueNode(Integer integer);
+    void startFeatureNode(QName qname);
 
-    void startEnumNode(String name);
+    void startFeatureNode(String rawArgument);
 
-    void startRequireInstanceNode(boolean require);
+    void startFractionDigitsNode(Integer fractionDigits);
 
-    void startPathNode(RevisionAwareXPath revisionAwareXPath);
+    void startFractionDigitsNode(String rawArgument);
 
-    void startBitNode(String name);
+    void startGroupingNode(QName qname);
 
-    void startPositionNode(UnsignedInteger position);
+    void startGroupingNode(String rawArgument);
 
-    void startReferenceNode(String input);
+    void startIdentityNode(QName qname);
 
-    void startRevisionDateNode(Revision date);
+    void startIdentityNode(String rawArgument);
+
+    void startIfFeatureNode(String rawArgument);
 
     void startImportNode(String moduleName);
 
-    void startUsesNode(QName groupingName);
+    void startIncludeNode(String rawArgument);
 
-    void startAugmentNode(SchemaPath targetPath);
+    void startInputNode();
 
-    void startConfigNode(boolean config);
+    void startKeyNode(List<QName> keyList);
 
-    void startLengthNode(String lengthString);
+    void startKeyNode(String rawArgument);
 
-    void startMaxElementsNode(Integer max);
+    void startLeafListNode(QName qname);
 
-    void startMinElementsNode(Integer min);
+    void startLeafListNode(String rawArgument);
 
-    void startPresenceNode(boolean presence);
+    void startLeafNode(QName qname);
 
-    void startOrderedByNode(String ordering);
+    void startLeafNode(String rawArgument);
 
-    void startRangeNode(String rangeString);
+    void startLengthNode(String lengthString);
 
-    void startRefineNode(SchemaPath path);
+    void startListNode(QName qname);
+
+    void startListNode(String rawArgument);
 
     void startMandatoryNode(boolean mandatory);
 
-    void startAnyxmlNode(QName qName);
+    void startMandatoryNode(String rawArgument);
 
-    void startUnknownNode(StatementDefinition def);
+    void startMaxElementsNode(Integer max);
 
-    void startUnknownNode(StatementDefinition def, String nodeParameter);
+    void startMaxElementsNode(String rawArgument);
 
-    void startFractionDigitsNode(Integer fractionDigits);
+    void startMinElementsNode(Integer min);
 
-    void startYinElementNode(boolean yinElement);
+    void startMinElementsNode(String rawArgument);
 
-    void startWhenNode(RevisionAwareXPath revisionAwareXPath);
+    void startModifierNode(ModifierKind modifier);
 
-    void startAnydataNode(QName qName);
+    void startModifierNode(String rawArgument);
 
-    void startActionNode(QName qName);
+    void startModuleNode(String identifier);
 
-    void startModifierNode(ModifierKind modifier);
+    void startMustNode(RevisionAwareXPath xpath);
 
-    void startUniqueNode(UniqueConstraint uniqueConstraint);
+    void startMustNode(String rawArgument);
 
-    void startRevisionNode(String rawArgument);
+    void startNamespaceNode(URI uri);
 
-    void startRevisionDateNode(String rawArgument);
+    void startNotificationNode(QName qname);
 
-    void startExtensionNode(String rawArgument);
+    void startNotificationNode(String rawArgument);
 
-    void startBaseNode(String rawArgument);
+    void startOrderedByNode(String ordering);
 
-    void startFeatureNode(String rawArgument);
+    void startOrganizationNode(String input);
 
-    void startYinElementNode(String rawArgument);
+    void startOutputNode();
 
-    void startIdentityNode(String rawArgument);
+    void startPathNode(RevisionAwareXPath revisionAwareXPath);
 
-    void startTypedefNode(String rawArgument);
+    void startPathNode(String rawArgument);
 
-    void startRpcNode(String rawArgument);
+    void startPatternNode(String regularExpression);
 
-    void startTypeNode(String rawArgument);
+    void startPositionNode(String rawArgument);
 
-    void startContainerNode(String rawArgument);
+    void startPositionNode(UnsignedInteger position);
 
-    void startPresenceNode(String rawArgument);
+    void startPrefixNode(String input);
 
-    void startStatusNode(String rawArgument);
+    void startPresenceNode(boolean presence);
 
-    void startConfigNode(String rawArgument);
+    void startPresenceNode(String rawArgument);
 
-    void startLeafNode(String rawArgument);
+    void startRangeNode(String rangeString);
 
-    void startWhenNode(String rawArgument);
+    void startReferenceNode(String input);
 
-    void startLeafListNode(String rawArgument);
+    void startRefineNode(SchemaPath path);
 
-    void startMustNode(String rawArgument);
+    void startRefineNode(String rawArgument);
 
-    void startMinElementsNode(String rawArgument);
+    void startRequireInstanceNode(boolean require);
 
-    void startMaxElementsNode(String rawArgument);
+    void startRequireInstanceNode(String rawArgument);
 
-    void startListNode(String rawArgument);
+    void startRevisionDateNode(Revision date);
 
-    void startKeyNode(String rawArgument);
+    void startRevisionDateNode(String rawArgument);
 
-    void startUniqueNode(String rawArgument);
+    void startRevisionNode(Revision date);
 
-    void startActionNode(String rawArgument);
+    void startRevisionNode(String rawArgument);
 
-    void startChoiceNode(String rawArgument);
+    void startRpcNode(QName qname);
 
-    void startMandatoryNode(String rawArgument);
+    void startRpcNode(String rawArgument);
 
-    void startAnyxmlNode(String rawArgument);
+    void startStatusNode(Status status);
 
-    void startCaseNode(String rawArgument);
+    void startStatusNode(String rawArgument);
 
-    void startAnydataNode(String rawArgument);
+    void startSubmoduleNode(String rawArgument);
 
-    void startGroupingNode(String rawArgument);
+    void startTypedefNode(QName qname);
 
-    void startUsesNode(String rawArgument);
+    void startTypedefNode(String rawArgument);
 
-    void startRefineNode(String rawArgument);
+    void startTypeNode(QName qname);
 
-    void startAugmentNode(String rawArgument);
+    void startTypeNode(String rawArgument);
 
-    void startNotificationNode(String rawArgument);
+    void startUniqueNode(String rawArgument);
 
-    void startValueNode(String rawArgument);
+    void startUniqueNode(UniqueConstraint uniqueConstraint);
 
-    void startModifierNode(String rawArgument);
+    void startUnitsNode(String input);
 
-    void startFractionDigitsNode(String rawArgument);
+    void startUnknownNode(StatementDefinition def);
 
-    void startPathNode(String rawArgument);
+    void startUnknownNode(StatementDefinition def, String nodeParameter);
 
-    void startRequireInstanceNode(String rawArgument);
+    void startUsesNode(QName groupingName);
 
-    void startPositionNode(String rawArgument);
+    void startUsesNode(String rawArgument);
 
-    void startBelongsToNode(String rawArgument);
+    void startValueNode(Integer integer);
 
-    void startIfFeatureNode(String rawArgument);
+    void startValueNode(String rawArgument);
 
-    void startSubmoduleNode(String rawArgument);
+    void startWhenNode(RevisionAwareXPath revisionAwareXPath);
 
-    void startIncludeNode(String rawArgument);
+    void startWhenNode(String rawArgument);
 
-    void startDeviationNode(String rawArgument);
+    void startYangVersionNode(String input);
 
-    void startDeviateNode(String rawArgument);
+    void startYinElementNode(boolean yinElement);
+
+    void startYinElementNode(String rawArgument);
 }

diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReaderFactory.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReaderFactory.java
index f07c68eb89149e8bcec0e9b0325cfc7d7615d757..f1eae36b0cd125a249ab7171187236adaf901b12 100644 (file)
--- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReaderFactory.java
+++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReaderFactory.java
@@ -90,7 +90,7 @@ public final class YinXMLEventReaderFactory {
      * @throws NullPointerException if module is null
      * @throws IllegalArgumentException if the specified module does not expose declared model
      */
-    public final XMLEventReader createXMLEventReader(final ModuleEffectiveStatement module) {
+    public XMLEventReader createXMLEventReader(final ModuleEffectiveStatement module) {
         final ModuleStatement declared = module.getDeclared();
         checkArgument(declared != null, "Module %s does not expose declared model", module);
 
@@ -106,7 +106,7 @@ public final class YinXMLEventReaderFactory {
      * @throws NullPointerException if any argument is null
      * @throws IllegalArgumentException if the specified submodule does not expose declared model
      */
-    public final XMLEventReader createXMLEventReader(final ModuleEffectiveStatement module,
+    public XMLEventReader createXMLEventReader(final ModuleEffectiveStatement module,
             final SubmoduleEffectiveStatement submodule) {
         final SubmoduleStatement declared = submodule.getDeclared();
         checkArgument(declared != null, "Submodule %s does not expose declared model", submodule);

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java
index cb1161dfa4aa32263a7bcc2dbff7e2ec9bbc699c..133ba33743464c7e5f25d3c80bdd2c0427f9b54d 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java
@@ -17,7 +17,6 @@ import java.io.ByteArrayOutputStream;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.export.YinExportUtils;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class Bug5531Test {
@@ -33,9 +32,9 @@ public class Bug5531Test {
         BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(byteArrayOutputStream);
 
         // write small module of size less than 8kB
-       for (Module module : schema.getModules()) {
-           YinExportUtils.writeModuleToOutputStream(schema, module, bufferedOutputStream);
-       }
+        for (Module module : schema.getModules()) {
+            YinExportUtils.writeModuleToOutputStream(schema, module, bufferedOutputStream);
+        }
 
         String output = byteArrayOutputStream.toString();
 

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java
index b7bb3e19dd3e4a38652961281918569f8e4a17cf..18561536dff34b9eaeabe185a4bb29c962c36bce 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java
@@ -19,7 +19,6 @@ import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.export.YinExportUtils;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class Bug6856Test {

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/EffectiveSchemaContextEmitterTest.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/EffectiveSchemaContextEmitterTest.java
index 2b151d15eaeb325939bf9676dc5ab1ed3024f910..0379eb713948240a286ed518a0f8706886ccd605 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/EffectiveSchemaContextEmitterTest.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/EffectiveSchemaContextEmitterTest.java
@@ -52,13 +52,13 @@ public class EffectiveSchemaContextEmitterTest {
 
             try (OutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
                 try (BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(byteArrayOutputStream)) {
-                writeModuleToOutputStream(schema, module, bufferedOutputStream, false);
-                final String output = byteArrayOutputStream.toString();
-                assertNotNull(output);
-                assertNotEquals(0, output.length());
+                    writeModuleToOutputStream(schema, module, bufferedOutputStream, false);
+                    final String output = byteArrayOutputStream.toString();
+                    assertNotNull(output);
+                    assertNotEquals(0, output.length());
 
-                final Document doc = YinExportTestUtils.loadDocument("/bugs/bug2444/yin-effective-emitter", module);
-                assertXMLEquals(module.getName(), doc, output);
+                    final Document doc = YinExportTestUtils.loadDocument("/bugs/bug2444/yin-effective-emitter", module);
+                    assertXMLEquals(module.getName(), doc, output);
                 }
             }
         }
@@ -81,7 +81,7 @@ public class EffectiveSchemaContextEmitterTest {
         final YangModuleWriter yangSchemaWriter = SchemaToStatementWriterAdaptor.from(statementWriter);
         final Map<QName, StatementDefinition> extensions = ExtensionStatement.mapFrom(ctx.getExtensions());
         new EffectiveSchemaContextEmitter(yangSchemaWriter, extensions, module.getYangVersion(), emitInstantiated)
-        .emitModule(module);
+            .emitModule(module);
     }
 
     private static Map<String, URI> prefixToNamespace(final SchemaContext ctx, final Module module) {

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java
index 4495648b35e89364239cbb84912452fb91b826c5..1897e3446f64153ed86c04117b0a6a8237253d82 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java
@@ -18,7 +18,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.export.YinExportUtils;
 import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory;
 import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter;
 import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation;

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.java
index 9dafe2b915e21110b5836014945d55781132aaa5..c5592fc7da94374f2354a5abfd559dad8afe3f55 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
-public class YinExportTestUtils {
+public final class YinExportTestUtils {
 
     private YinExportTestUtils() {
         throw new UnsupportedOperationException("Utility class");