import static com.google.common.base.Verify.verify;
+import com.google.common.base.CharMatcher;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.KeyEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.KeyStatement;
+import org.opendaylight.yangtools.yang.parser.antlr.YangStatementLexer;
import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
public final class KeyStatementSupport
extends BaseStatementSupport<Set<QName>, KeyStatement, KeyEffectiveStatement> {
- private static final Splitter LIST_KEY_SPLITTER = Splitter.on(' ').omitEmptyStrings().trimResults();
+ /**
+ * This is equivalent to {@link YangStatementLexer#SEP}'s definition. Currently equivalent to the non-repeating
+ * part of:
+ *
+ * <p>
+ * {@code SEP: [ \n\r\t]+ -> type(SEP);}.
+ */
+ private static final CharMatcher SEP = CharMatcher.anyOf(" \n\r\t").precomputed();
+
+ /**
+ * Splitter corresponding to {@code key-arg} ABNF as defined
+ * in <a href="https://tools.ietf.org/html/rfc6020#section-12">RFC6020, section 12</a>:
+ *
+ * <p>
+ * {@code key-arg = node-identifier *(sep node-identifier)}
+ *
+ * <p>
+ * We also account for {@link #SEP} not handling repetition by ignoring empty strings.
+ */
+ private static final Splitter KEY_ARG_SPLITTER = Splitter.on(SEP).omitEmptyStrings();
+
private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
YangStmtMapping.KEY)
.build();
private static final KeyStatementSupport INSTANCE = new KeyStatementSupport();
private KeyStatementSupport() {
- super(YangStmtMapping.KEY);
+ super(YangStmtMapping.KEY, CopyPolicy.DECLARED_COPY);
}
public static KeyStatementSupport getInstance() {
public ImmutableSet<QName> parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
final Builder<QName> builder = ImmutableSet.builder();
int tokens = 0;
- for (String keyToken : LIST_KEY_SPLITTER.split(value)) {
+ for (String keyToken : KEY_ARG_SPLITTER.split(value)) {
builder.add(StmtContextUtils.parseNodeIdentifier(ctx, keyToken));
tokens++;
}
// Throws NPE on nulls, retains first inserted value, cannot be modified
final ImmutableSet<QName> ret = builder.build();
- SourceException.throwIf(ret.size() != tokens, ctx.getStatementSourceReference(),
- "Key argument '%s' contains duplicates", value);
+ SourceException.throwIf(ret.size() != tokens, ctx, "Key argument '%s' contains duplicates", value);
return ret;
}
final QNameModule targetModule) {
final Builder<QName> builder = ImmutableSet.builder();
boolean replaced = false;
- for (final QName qname : ctx.coerceStatementArgument()) {
+ for (final QName qname : ctx.getArgument()) {
if (!targetModule.equals(qname.getModule())) {
final QName newQname = qname.bindTo(targetModule).intern();
builder.add(newQname);
// This makes sure we reuse the collection when a grouping is
// instantiated in the same module
- return replaced ? builder.build() : ctx.getStatementArgument();
+ return replaced ? builder.build() : ctx.argument();
}
@Override
@Override
protected KeyStatement createDeclared(final StmtContext<Set<QName>, KeyStatement, ?> ctx,
final ImmutableList<? extends DeclaredStatement<?>> substatements) {
- return new RegularKeyStatement(ctx, substatements);
+ return new RegularKeyStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
}
@Override
protected KeyStatement createEmptyDeclared(final StmtContext<Set<QName>, KeyStatement, ?> ctx) {
- return new EmptyKeyStatement(ctx);
+ return new EmptyKeyStatement(ctx.getRawArgument(), ctx.getArgument());
}
@Override
- protected KeyEffectiveStatement createEffective(
- final StmtContext<Set<QName>, KeyStatement, KeyEffectiveStatement> ctx, final KeyStatement declared,
+ protected KeyEffectiveStatement createEffective(final Current<Set<QName>, KeyStatement> stmt,
final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
- final Set<QName> arg = ctx.coerceStatementArgument();
+ final Set<QName> arg = stmt.getArgument();
+ final KeyStatement declared = stmt.declared();
+ if (substatements.isEmpty()) {
+ return arg.equals(declared.argument()) ? new EmptyLocalKeyEffectiveStatement(declared)
+ : new EmptyForeignKeyEffectiveStatement(declared, arg);
+ }
+
return arg.equals(declared.argument()) ? new RegularLocalKeyEffectiveStatement(declared, substatements)
: new RegularForeignKeyEffectiveStatement(declared, arg, substatements);
}
- @Override
- protected KeyEffectiveStatement createEmptyEffective(
- final StmtContext<Set<QName>, KeyStatement, KeyEffectiveStatement> ctx, final KeyStatement declared) {
- final Set<QName> arg = ctx.coerceStatementArgument();
- return arg.equals(declared.argument()) ? new EmptyLocalKeyEffectiveStatement(declared)
- : new EmptyForeignKeyEffectiveStatement(declared, arg);
- }
-
static @NonNull Object maskSet(final @NonNull Set<QName> set) {
return set.size() == 1 ? set.iterator().next() : set;
}
Code Review / yangtools.git / blobdiff