BUG-865: deprecate pre-Beryllium parser elements

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / builder / impl / TypeDefinitionBuilderImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java
index 66bd8e0089300ce4eaa083a310c0190fe872abe3..a131d9f9bc48b55041238a8c7d727b69e8c14fc1 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java
@@ -7,9 +7,11 @@
  */
 package org.opendaylight.yangtools.yang.parser.builder.impl;
 
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
 import java.util.Collections;
 import java.util.List;
-
+import java.util.Objects;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
@@ -18,15 +20,16 @@ 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 org.opendaylight.yangtools.yang.model.util.ExtendedType;
-import org.opendaylight.yangtools.yang.model.util.UnknownType;
 import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.util.AbstractTypeAwareBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.util.Comparators;
 import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
-import com.google.common.base.Preconditions;
-
+/**
+ * @deprecated Pre-Beryllium implementation, scheduled for removal.
+ */
+@Deprecated
 public final class TypeDefinitionBuilderImpl extends AbstractTypeAwareBuilder implements TypeDefinitionBuilder {
     private SchemaPath schemaPath;
     private List<RangeConstraint> ranges = Collections.emptyList();
@@ -57,27 +60,28 @@ public final class TypeDefinitionBuilderImpl extends AbstractTypeAwareBuilder im
         this.units = base.getUnits();
         this.defaultValue = base.getDefaultValue();
 
-        ExtendedType ext = base;
-        this.addedByUses = ext.isAddedByUses();
-        this.ranges = ext.getRangeConstraints();
-        this.lengths = ext.getLengthConstraints();
-        this.patterns = ext.getPatternConstraints();
-        this.fractionDigits = ext.getFractionDigits();
+        this.addedByUses = base.isAddedByUses();
+        this.ranges = base.getRangeConstraints();
+        this.lengths = base.getLengthConstraints();
+        this.patterns = base.getPatternConstraints();
+        this.fractionDigits = base.getFractionDigits();
         this.unknownNodes.addAll(base.getUnknownSchemaNodes());
     }
 
     @Override
     public TypeDefinition<? extends TypeDefinition<?>> build() {
-        TypeDefinition<?> result = null;
-        ExtendedType.Builder typeBuilder = null;
-        if ((type == null || type instanceof UnknownType) && typedef == null) {
-            throw new YangParseException("Unresolved type: '" + qname.getLocalName() + "'.");
-        }
-        if (type == null || type instanceof UnknownType) {
-            type = typedef.build();
+        TypeDefinition<?> result;
+        ExtendedType.Builder typeBuilder;
+        if (type == null) {
+            if (typedef == null) {
+                throw new YangParseException("Unresolved type: '" + qname.getLocalName() + "'.");
+            } else {
+                type = typedef.build();
+            }
         }
 
-        typeBuilder = new ExtendedType.Builder(qname, type, description, reference, schemaPath);
+        typeBuilder = ExtendedType.builder(qname, type, Optional.fromNullable(description),
+                Optional.fromNullable(reference), schemaPath);
         typeBuilder.status(status);
         typeBuilder.units(units);
         typeBuilder.defaultValue(defaultValue);
@@ -174,11 +178,6 @@ public final class TypeDefinitionBuilderImpl extends AbstractTypeAwareBuilder im
         this.defaultValue = defaultValue;
     }
 
-    @Override
-    public List<UnknownSchemaNodeBuilder> getUnknownNodes() {
-        return Collections.emptyList();
-    }
-
     @Override
     public List<RangeConstraint> getRanges() {
         return ranges;
@@ -234,7 +233,7 @@ public final class TypeDefinitionBuilderImpl extends AbstractTypeAwareBuilder im
     public int hashCode() {
         final int prime = 31;
         int result = super.hashCode();
-        result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode());
+        result = prime * result + Objects.hashCode(schemaPath);
 
         return result;
     }