From caf27ffe6772a07f3440623b7ec38c3eb69369e4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 3 Oct 2015 01:36:12 +0200 Subject: [PATCH] Split keys into an ImmutableSet This simplifies building the set and results in memory-optimal set. Change-Id: I16cde5188b7c473c8cac2943e587ff553cb31c05 Signed-off-by: Robert Varga --- .../parser/stmt/rfc6020/KeyStatementImpl.java | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java index 94d1049890..8a967f6209 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java @@ -7,11 +7,10 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet.Builder; import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.KeyStatement; @@ -20,7 +19,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; 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.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.KeyEffectiveStatementImpl; public class KeyStatementImpl extends AbstractDeclaredStatement> implements @@ -39,23 +37,19 @@ public class KeyStatementImpl extends AbstractDeclaredStatement parseArgumentValue(final StmtContext ctx, final String value) - throws SourceException { - - final List keyTokens = StmtContextUtils.LIST_KEY_SPLITTER.splitToList(value); - - // to detect if key contains duplicates - if ((new HashSet<>(keyTokens)).size() < keyTokens.size()) { - throw new IllegalArgumentException(); + public Collection parseArgumentValue(final StmtContext ctx, final String value) { + final Builder builder = ImmutableSet.builder(); + int tokens = 0; + for (String keyToken : StmtContextUtils.LIST_KEY_SPLITTER.split(value)) { + builder.add(SchemaNodeIdentifier.create(false, Utils.qNameFromArgument(ctx, keyToken))); + tokens++; } - // FIXME: would an ImmutableSetBuilder be better? - Set keyNodes = new LinkedHashSet<>(); - for (String keyToken : keyTokens) { - keyNodes.add(SchemaNodeIdentifier.create(false, Utils.qNameFromArgument(ctx, keyToken))); - } + // Throws NPE on nulls, retains first inserted value, cannot be modified + final Collection ret = builder.build(); - return keyNodes; + Preconditions.checkArgument(ret.size() == tokens, "Key argument '%s' contains duplicates", value); + return ret; } @Override -- 2.36.6