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%2Fbuilder%2Fimpl%2FModuleImpl.java;h=fa4a8ae25aef164cf528413466411059d6852981;hb=9375dcb5e3056382f79c0b973ce4bce02551cc4c;hp=bfeef7a43e5a9ffd63aad89776a18a88a2ffc35a;hpb=93e8c16d8deff8cd2935d09c445d2d7082503cb4;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java index bfeef7a43e..fa4a8ae25a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java @@ -1,17 +1,26 @@ +/* + * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + package org.opendaylight.yangtools.yang.parser.builder.impl; import static com.google.common.base.Preconditions.checkNotNull; - -import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.net.URI; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.NavigableSet; +import java.util.Objects; import java.util.Set; import java.util.TreeSet; import org.opendaylight.yangtools.concepts.Immutable; +import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.Deviation; import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; @@ -26,17 +35,21 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainer; import org.opendaylight.yangtools.yang.parser.builder.util.Comparators; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implements Module, Immutable { - private final URI namespace; + private final QNameModule qnameModule; private final String name; private final String sourcePath; - private final Optional revision; private final String prefix; private final String yangVersion; private final String organization; private final String contact; private final Set imports; + private final Set submodules; private final Set features; private final Set notifications; private final Set augmentations; @@ -61,11 +74,12 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem super(builder); this.name = checkNotNull(name, "Missing name"); this.sourcePath = sourcePath; //TODO: can this be nullable? - this.imports = ImmutableSet.copyOf(builder.imports); - this.namespace = builder.getNamespace(); + this.imports = ImmutableSet. copyOf(builder.imports.values()); + this.submodules = ImmutableSet. copyOf(builder.submodules); this.prefix = builder.getPrefix(); - this.revision = builder.getRevision() == null ? Optional.absent(): - Optional.of(new Date(builder.getRevision().getTime())); + + this.qnameModule = QNameModule.create(builder.getNamespace(), + builder.getRevision() == null ? null : new Date(builder.getRevision().getTime())).intern(); this.yangVersion = builder.getYangVersion(); this.organization = builder.getOrganization(); this.contact = builder.getContact(); @@ -88,7 +102,7 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem @Override public URI getNamespace() { - return namespace; + return qnameModule.getNamespace(); } @Override @@ -98,11 +112,7 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem @Override public Date getRevision() { - if (revision.isPresent()) { - return new Date(revision.get().getTime()); - } else { - return null; - } + return qnameModule.getRevision(); } @Override @@ -130,6 +140,11 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem return imports; } + @Override + public Set getSubmodules() { + return submodules; + } + @Override public Set getFeatures() { return features; @@ -170,6 +185,7 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem return unknownNodes; } + @Override public String getSource() { return source; } @@ -178,10 +194,9 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((namespace == null) ? 0 : namespace.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((revision == null) ? 0 : revision.hashCode()); - result = prime * result + ((yangVersion == null) ? 0 : yangVersion.hashCode()); + result = prime * result + Objects.hashCode(name); + result = prime * result + Objects.hashCode(yangVersion); + result = prime * result + qnameModule.hashCode(); return result; } @@ -197,13 +212,6 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem return false; } ModuleImpl other = (ModuleImpl) obj; - if (namespace == null) { - if (other.namespace != null) { - return false; - } - } else if (!namespace.equals(other.namespace)) { - return false; - } if (name == null) { if (other.name != null) { return false; @@ -211,11 +219,7 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem } else if (!name.equals(other.name)) { return false; } - if (revision == null) { - if (other.revision != null) { - return false; - } - } else if (!revision.equals(other.revision)) { + if (!qnameModule.equals(other.qnameModule)) { return false; } if (yangVersion == null) { @@ -229,7 +233,7 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem } private static Set toImmutableSortedSet(final Set original) { - TreeSet sorted = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); + NavigableSet sorted = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); sorted.addAll(original); return Collections.unmodifiableSet(sorted); } @@ -239,11 +243,16 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem StringBuilder sb = new StringBuilder(ModuleImpl.class.getSimpleName()); sb.append("["); sb.append("name=").append(name); - sb.append(", namespace=").append(namespace); - sb.append(", revision=").append(revision); + sb.append(", namespace=").append(getNamespace()); + sb.append(", revision=").append(getRevision()); sb.append(", prefix=").append(prefix); sb.append(", yangVersion=").append(yangVersion); sb.append("]"); return sb.toString(); } -} \ No newline at end of file + + @Override + public QNameModule getQNameModule() { + return qnameModule; + } +}