X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-model-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Futil%2FExtendedType.java;h=c4a7ffe3edab286c9396defec69cdb2edebc057b;hb=08c9d84f927740567791ffb0b9dfba6176cee321;hp=3000c78e9fc98befdcf1b033cda1c3dbf09ea00f;hpb=60e6cd382641b756c70a4d6555a345a5f4726040;p=yangtools.git diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java index 3000c78e9f..c4a7ffe3ed 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java @@ -7,6 +7,9 @@ */ package org.opendaylight.yangtools.yang.model.util; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; + import java.net.URI; import java.util.Collections; import java.util.Date; @@ -20,9 +23,6 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; - -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; /** * Extended Type represents YANG type derived from other type. * @@ -52,15 +52,15 @@ public class ExtendedType implements TypeDefinition> { private final boolean addedByUses; /** - * - * Creates Builder for extended / derived type. - * - * @param typeName QName of derived type - * @param baseType Base type of derived type - * @param description Description of type - * @param reference Reference of Type - * @param path Schema path to type definition. - */ + * + * Creates Builder for extended / derived type. + * + * @param typeName QName of derived type + * @param baseType Base type of derived type + * @param description Description of type + * @param reference Reference of Type + * @param path Schema path to type definition. + */ public static final Builder builder(final QName typeName,final TypeDefinition baseType,final Optional description,final Optional reference,final SchemaPath path) { return new Builder(typeName, baseType, description.or(""), reference.or(""), path); } @@ -150,7 +150,11 @@ public class ExtendedType implements TypeDefinition> { public Builder unknownSchemaNodes( final List unknownSchemaNodes) { - this.unknownSchemaNodes = unknownSchemaNodes; + if (unknownSchemaNodes.isEmpty()) { + this.unknownSchemaNodes = Collections.emptyList(); + } else { + this.unknownSchemaNodes = unknownSchemaNodes; + } return this; } @@ -265,8 +269,9 @@ public class ExtendedType implements TypeDefinition> { if (path != null ? !path.equals(that.path) : that.path != null) { return false; } - if (typeName != null ? !typeName.equals(that.typeName) : that.typeName != null) + if (typeName != null ? !typeName.equals(that.typeName) : that.typeName != null) { return false; + } return true; }