Merge from development repository.

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

diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/BinaryType.java b/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/BinaryType.java
index 99a948960b0f7c339eb3c70b688be10e141edb8b..7429c015314317d1a5a2bcbb473d949e9955c729 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/BinaryType.java
+++ b/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/model/util/BinaryType.java
@@ -13,9 +13,9 @@ import java.util.List;
 import org.opendaylight.controller.model.api.type.BinaryTypeDefinition;\r
 import org.opendaylight.controller.model.api.type.LengthConstraint;\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.UnknownSchemaNode;\r
 \r
 public class BinaryType implements BinaryTypeDefinition {\r
 \r
@@ -25,29 +25,28 @@ public class BinaryType implements BinaryTypeDefinition {
     private final String reference = "";\r
 \r
     private List<Byte> bytes;\r
-    private final LengthConstraint lengthConstraint;\r
+    private final List<LengthConstraint> lengthConstraints;\r
     private String units = "";\r
 \r
     public BinaryType() {\r
         super();\r
 \r
-        lengthConstraint = BaseConstraints.lengthConstraint(0L, Long.MAX_VALUE,\r
-                null, null);\r
+        lengthConstraints = Collections.emptyList();\r
         bytes = Collections.emptyList();\r
         bytes = Collections.unmodifiableList(bytes);\r
     }\r
 \r
     public BinaryType(final List<Byte> bytes,\r
-            final LengthConstraint lengthConstraint, final String units) {\r
+            final List<LengthConstraint> lengthConstraints, final String units) {\r
         super();\r
         this.bytes = bytes;\r
-        this.lengthConstraint = lengthConstraint;\r
+        this.lengthConstraints = lengthConstraints;\r
         this.units = units;\r
     }\r
 \r
     /*\r
      * (non-Javadoc)\r
-     * \r
+     *\r
      * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()\r
      */\r
     @Override\r
@@ -57,7 +56,7 @@ public class BinaryType implements BinaryTypeDefinition {
 \r
     /*\r
      * (non-Javadoc)\r
-     * \r
+     *\r
      * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getUnits()\r
      */\r
     @Override\r
@@ -67,7 +66,7 @@ public class BinaryType implements BinaryTypeDefinition {
 \r
     /*\r
      * (non-Javadoc)\r
-     * \r
+     *\r
      * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue()\r
      */\r
     @Override\r
@@ -77,7 +76,7 @@ public class BinaryType implements BinaryTypeDefinition {
 \r
     /*\r
      * (non-Javadoc)\r
-     * \r
+     *\r
      * @see org.opendaylight.controller.yang.model.api.SchemaNode#getQName()\r
      */\r
     @Override\r
@@ -87,7 +86,7 @@ public class BinaryType implements BinaryTypeDefinition {
 \r
     /*\r
      * (non-Javadoc)\r
-     * \r
+     *\r
      * @see org.opendaylight.controller.yang.model.api.SchemaNode#getPath()\r
      */\r
     @Override\r
@@ -97,7 +96,7 @@ public class BinaryType implements BinaryTypeDefinition {
 \r
     /*\r
      * (non-Javadoc)\r
-     * \r
+     *\r
      * @see org.opendaylight.controller.yang.model.api.SchemaNode#getDescription()\r
      */\r
     @Override\r
@@ -107,7 +106,7 @@ public class BinaryType implements BinaryTypeDefinition {
 \r
     /*\r
      * (non-Javadoc)\r
-     * \r
+     *\r
      * @see org.opendaylight.controller.yang.model.api.SchemaNode#getReference()\r
      */\r
     @Override\r
@@ -117,7 +116,7 @@ public class BinaryType implements BinaryTypeDefinition {
 \r
     /*\r
      * (non-Javadoc)\r
-     * \r
+     *\r
      * @see org.opendaylight.controller.yang.model.api.SchemaNode#getStatus()\r
      */\r
     @Override\r
@@ -127,18 +126,18 @@ public class BinaryType implements BinaryTypeDefinition {
 \r
     /*\r
      * (non-Javadoc)\r
-     * \r
+     *\r
      * @see\r
      * org.opendaylight.controller.yang.model.base.type.api.BinaryTypeDefinition#getLengthConstraint\r
      * ()\r
      */\r
     @Override\r
-    public LengthConstraint getLengthConstraint() {\r
-        return lengthConstraint;\r
+    public List<LengthConstraint> getLengthConstraints() {\r
+        return lengthConstraints;\r
     }\r
 \r
     @Override\r
-    public List<ExtensionDefinition> getExtensionSchemaNodes() {\r
+    public List<UnknownSchemaNode> getUnknownSchemaNodes() {\r
         return Collections.emptyList();\r
     }\r
 \r
@@ -151,7 +150,7 @@ public class BinaryType implements BinaryTypeDefinition {
                 + ((description == null) ? 0 : description.hashCode());\r
         result = prime\r
                 * result\r
-                + ((lengthConstraint == null) ? 0 : lengthConstraint.hashCode());\r
+                + ((lengthConstraints == null) ? 0 : lengthConstraints.hashCode());\r
         result = prime * result + ((name == null) ? 0 : name.hashCode());\r
         result = prime * result + ((path == null) ? 0 : path.hashCode());\r
         result = prime * result\r
@@ -186,11 +185,11 @@ public class BinaryType implements BinaryTypeDefinition {
         } else if (!description.equals(other.description)) {\r
             return false;\r
         }\r
-        if (lengthConstraint == null) {\r
-            if (other.lengthConstraint != null) {\r
+        if (lengthConstraints == null) {\r
+            if (other.lengthConstraints != null) {\r
                 return false;\r
             }\r
-        } else if (!lengthConstraint.equals(other.lengthConstraint)) {\r
+        } else if (!lengthConstraints.equals(other.lengthConstraints)) {\r
             return false;\r
         }\r
         if (name == null) {\r
@@ -237,8 +236,8 @@ public class BinaryType implements BinaryTypeDefinition {
         builder.append(reference);\r
         builder.append(", bytes=");\r
         builder.append(bytes);\r
-        builder.append(", lengthConstraint=");\r
-        builder.append(lengthConstraint);\r
+        builder.append(", lengthConstraints=");\r
+        builder.append(lengthConstraints);\r
         builder.append(", units=");\r
         builder.append(units);\r
         builder.append("]");\r