Fixup SchemaNodeIdentifier design

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / unique / UniqueStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java
index ce5cc917fd9d6aab0d8637f66fa2d06ab8b3c399..6e0154a85f9cfdc887e5bfcde2598726db82c693 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java
@@ -7,15 +7,17 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.unique;
 
+import com.google.common.base.CharMatcher;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableSet;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.regex.Pattern;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
-import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier;
-import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Relative;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Descendant;
+import org.opendaylight.yangtools.yang.model.api.stmt.UniqueEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UniqueStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ArgumentUtils;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
@@ -24,21 +26,31 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
 public final class UniqueStatementSupport
-        extends AbstractStatementSupport<Collection<SchemaNodeIdentifier.Relative>, UniqueStatement,
-                EffectiveStatement<Collection<SchemaNodeIdentifier.Relative>, UniqueStatement>> {
-    private static final Splitter SPACE_SPLITTER = Splitter.on(' ').omitEmptyStrings().trimResults();
+        extends AbstractStatementSupport<Set<Descendant>, UniqueStatement, UniqueEffectiveStatement> {
+    /**
+     * Support 'sep' ABNF rule in RFC7950 section 14. CRLF pattern is used to squash line-break from CRLF to LF form
+     * and then we use SEP_SPLITTER, which can operate on single characters.
+     */
+    private static final Pattern CRLF_PATTERN = Pattern.compile("\r\n", Pattern.LITERAL);
+    private static final Splitter SEP_SPLITTER = Splitter.on(CharMatcher.anyOf(" \t\n").precomputed())
+            .omitEmptyStrings();
+
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
         YangStmtMapping.UNIQUE)
         .build();
+    private static final UniqueStatementSupport INSTANCE = new UniqueStatementSupport();
 
-    public UniqueStatementSupport() {
+    private UniqueStatementSupport() {
         super(YangStmtMapping.UNIQUE);
     }
 
+    public static UniqueStatementSupport getInstance() {
+        return INSTANCE;
+    }
+
     @Override
-    public Collection<SchemaNodeIdentifier.Relative> parseArgumentValue(final StmtContext<?, ?, ?> ctx,
-            final String value) {
-        final Collection<Relative> uniqueConstraints = parseUniqueConstraintArgument(ctx, value);
+    public Set<Descendant> parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
+        final Set<Descendant> uniqueConstraints = parseUniqueConstraintArgument(ctx, value);
         SourceException.throwIf(uniqueConstraints.isEmpty(), ctx.getStatementSourceReference(),
                 "Invalid argument value '%s' of unique statement. The value must contains at least "
                         + "one descendant schema node identifier.", value);
@@ -46,14 +58,13 @@ public final class UniqueStatementSupport
     }
 
     @Override
-    public UniqueStatement createDeclared(final StmtContext<Collection<Relative>, UniqueStatement, ?> ctx) {
+    public UniqueStatement createDeclared(final StmtContext<Set<Descendant>, UniqueStatement, ?> ctx) {
         return new UniqueStatementImpl(ctx);
     }
 
     @Override
-    public EffectiveStatement<Collection<Relative>, UniqueStatement> createEffective(
-            final StmtContext<Collection<Relative>, UniqueStatement,
-            EffectiveStatement<Collection<Relative>, UniqueStatement>> ctx) {
+    public UniqueEffectiveStatement createEffective(
+            final StmtContext<Set<Descendant>, UniqueStatement, UniqueEffectiveStatement> ctx) {
         return new UniqueEffectiveStatementImpl(ctx);
     }
 
@@ -62,15 +73,18 @@ public final class UniqueStatementSupport
         return SUBSTATEMENT_VALIDATOR;
     }
 
-    private static Collection<SchemaNodeIdentifier.Relative> parseUniqueConstraintArgument(
-            final StmtContext<?, ?, ?> ctx, final String argumentValue) {
-        final Set<SchemaNodeIdentifier.Relative> uniqueConstraintNodes = new HashSet<>();
-        for (final String uniqueArgToken : SPACE_SPLITTER.split(argumentValue)) {
+    private static Set<Descendant> parseUniqueConstraintArgument(final StmtContext<?, ?, ?> ctx,
+            final String argumentValue) {
+        // deal with 'line-break' rule, which is either "\n" or "\r\n", but not "\r"
+        final String nocrlf = CRLF_PATTERN.matcher(argumentValue).replaceAll("\n");
+
+        final Set<Descendant> uniqueConstraintNodes = new HashSet<>();
+        for (final String uniqueArgToken : SEP_SPLITTER.split(nocrlf)) {
             final SchemaNodeIdentifier nodeIdentifier = ArgumentUtils.nodeIdentifierFromPath(ctx, uniqueArgToken);
-            SourceException.throwIf(nodeIdentifier.isAbsolute(), ctx.getStatementSourceReference(),
+            SourceException.throwIf(nodeIdentifier instanceof Absolute, ctx.getStatementSourceReference(),
                     "Unique statement argument '%s' contains schema node identifier '%s' "
                             + "which is not in the descendant node identifier form.", argumentValue, uniqueArgToken);
-            uniqueConstraintNodes.add((SchemaNodeIdentifier.Relative) nodeIdentifier);
+            uniqueConstraintNodes.add((Descendant) nodeIdentifier);
         }
         return ImmutableSet.copyOf(uniqueConstraintNodes);
     }