X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Frfc6020%2Feffective%2FNotificationEffectiveStatementImpl.java;h=f324612301676667e71fb7e9242975fe774f4b7f;hb=3c4bdfac3a8b04ecd1d6eab2cdadbb365b54664e;hp=a29dba00f669cddc10fc97a298877f961097b6a9;hpb=aa0d59e9afecc484e8d0e219d3156e7817266e28;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java index a29dba00f6..f324612301 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java @@ -10,44 +10,37 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.Collection; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -import org.opendaylight.yangtools.yang.model.api.stmt.NotificationStatement; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.NotificationStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -public class NotificationEffectiveStatementImpl - extends AbstractEffectiveDocumentedDataNodeContainer - implements NotificationDefinition { +public class NotificationEffectiveStatementImpl extends + AbstractEffectiveDocumentedDataNodeContainer implements NotificationDefinition { private final QName qname; private final SchemaPath path; - ImmutableSet augmentations; - ImmutableList unknownNodes; + private final Set augmentations; + private final List unknownNodes; public NotificationEffectiveStatementImpl( - StmtContext> ctx) { + final StmtContext> ctx) { super(ctx); this.qname = ctx.getStatementArgument(); - this.path = Utils.getSchemaPath(ctx); + this.path = ctx.getSchemaPath().get(); - initSubstatementCollections(); - } - - private void initSubstatementCollections() { + // initSubstatementCollections Collection> effectiveSubstatements = effectiveSubstatements(); - List unknownNodesInit = new LinkedList<>(); - Set augmentationsInit = new HashSet<>(); - + Set augmentationsInit = new LinkedHashSet<>(); for (EffectiveStatement effectiveStatement : effectiveSubstatements) { if (effectiveStatement instanceof UnknownSchemaNode) { UnknownSchemaNode unknownNode = (UnknownSchemaNode) effectiveStatement; @@ -58,7 +51,6 @@ public class NotificationEffectiveStatementImpl augmentationsInit.add(augmentationSchema); } } - this.unknownNodes = ImmutableList.copyOf(unknownNodesInit); this.augmentations = ImmutableSet.copyOf(augmentationsInit); } @@ -104,29 +96,11 @@ public class NotificationEffectiveStatementImpl return false; } final NotificationEffectiveStatementImpl other = (NotificationEffectiveStatementImpl) obj; - if (qname == null) { - if (other.qname != null) { - return false; - } - } else if (!qname.equals(other.qname)) { - return false; - } - if (path == null) { - if (other.path != null) { - return false; - } - } else if (!path.equals(other.path)) { - return false; - } - return true; + return Objects.equals(qname, other.qname) && Objects.equals(path, other.path); } @Override public String toString() { - StringBuilder sb = new StringBuilder( - NotificationEffectiveStatementImpl.class.getSimpleName()); - sb.append("[qname=").append(qname).append(", path=").append(path) - .append("]"); - return sb.toString(); + return NotificationEffectiveStatementImpl.class.getSimpleName() + "[qname=" + qname + ", path=" + path + "]"; } }