Merge from development repository.

[controller.git] / opendaylight / sal / yang-prototype / yang / yang-model-util / src / main / java / org / opendaylight / controller / model / util / ExtendedType.java

diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/ExtendedType.java b/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/ExtendedType.java
index 44ca80430c2a8b80ed65a47ea8bb1d8406e1246e..87c74be7a283ea95578a406d532c7596676e8c1c 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/ExtendedType.java
+++ b/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/ExtendedType.java
@@ -11,10 +11,10 @@ import java.util.Collections;
 import java.util.List;\r
 \r
 import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.model.api.ExtensionDefinition;\r
 import org.opendaylight.controller.yang.model.api.SchemaPath;\r
 import org.opendaylight.controller.yang.model.api.Status;\r
 import org.opendaylight.controller.yang.model.api.TypeDefinition;\r
+import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;\r
 \r
 public class ExtendedType implements TypeDefinition {\r
 \r
@@ -23,7 +23,7 @@ public class ExtendedType implements TypeDefinition {
     private final SchemaPath path;\r
     private final String description;\r
     private final String reference;\r
-    private final List<ExtensionDefinition> extensions;\r
+    private final List<UnknownSchemaNode> unknownSchemaNodes;\r
 \r
     private Status status;\r
     private String units;\r
@@ -37,7 +37,7 @@ public class ExtendedType implements TypeDefinition {
         private final String description;\r
         private final String reference;\r
 \r
-        private List<ExtensionDefinition> extensions = Collections.emptyList();;\r
+        private List<UnknownSchemaNode> unknownSchemaNodes = Collections.emptyList();;\r
         private Status status = Status.CURRENT;\r
         private String units = "";\r
         private Object defaultValue = null;\r
@@ -66,8 +66,8 @@ public class ExtendedType implements TypeDefinition {
             return this;\r
         }\r
 \r
-        public Builder extensions(final List<ExtensionDefinition> extensions) {\r
-            this.extensions = extensions;\r
+        public Builder unknownSchemaNodes(final List<UnknownSchemaNode> unknownSchemaNodes) {\r
+            this.unknownSchemaNodes = unknownSchemaNodes;\r
             return this;\r
         }\r
 \r
@@ -82,7 +82,7 @@ public class ExtendedType implements TypeDefinition {
         this.path = builder.path;\r
         this.description = builder.description;\r
         this.reference = builder.reference;\r
-        this.extensions = builder.extensions;\r
+        this.unknownSchemaNodes = builder.unknownSchemaNodes;\r
         this.status = builder.status;\r
         this.units = builder.units;\r
         this.defaultValue = builder.defaultValue;\r
@@ -129,8 +129,8 @@ public class ExtendedType implements TypeDefinition {
     }\r
 \r
     @Override\r
-    public List<ExtensionDefinition> getExtensionSchemaNodes() {\r
-        return extensions;\r
+    public List<UnknownSchemaNode> getUnknownSchemaNodes() {\r
+        return unknownSchemaNodes;\r
     }\r
 \r
     @Override\r
@@ -144,7 +144,7 @@ public class ExtendedType implements TypeDefinition {
         result = prime * result\r
                 + ((description == null) ? 0 : description.hashCode());\r
         result = prime * result\r
-                + ((extensions == null) ? 0 : extensions.hashCode());\r
+                + ((unknownSchemaNodes == null) ? 0 : unknownSchemaNodes.hashCode());\r
         result = prime * result + ((path == null) ? 0 : path.hashCode());\r
         result = prime * result\r
                 + ((reference == null) ? 0 : reference.hashCode());\r
@@ -188,11 +188,11 @@ public class ExtendedType implements TypeDefinition {
         } else if (!description.equals(other.description)) {\r
             return false;\r
         }\r
-        if (extensions == null) {\r
-            if (other.extensions != null) {\r
+        if (unknownSchemaNodes == null) {\r
+            if (other.unknownSchemaNodes != null) {\r
                 return false;\r
             }\r
-        } else if (!extensions.equals(other.extensions)) {\r
+        } else if (!unknownSchemaNodes.equals(other.unknownSchemaNodes)) {\r
             return false;\r
         }\r
         if (path == null) {\r
@@ -242,8 +242,8 @@ public class ExtendedType implements TypeDefinition {
         builder2.append(description);\r
         builder2.append(", reference=");\r
         builder2.append(reference);\r
-        builder2.append(", extensions=");\r
-        builder2.append(extensions);\r
+        builder2.append(", unknownSchemaNodes=");\r
+        builder2.append(unknownSchemaNodes);\r
         builder2.append(", status=");\r
         builder2.append(status);\r
         builder2.append(", units=");\r