Fixing the ColumnSchema as per RFC7047 for a enum variable.

Enums are defined as a 1 or more atomic-type and hence the current Object[] is incorrect
and is causing deser issues with vtep schema. Fixing it with a more generic Object.
This will be properly accomodated when we have schema driven OVSDB approach is in place.

Change-Id: I0c1d2896ea34bbc3c358ca0d0818860908e0b1b1
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OvsdbType.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OvsdbType.java
index dafc5a4f97048f717cfe3675a1cd60b0cb57c0a6..f7b3ee85dbacfc31a41d133a4820c46151738916 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OvsdbType.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OvsdbType.java
@@ -9,9 +9,7 @@
  */
 package org.opendaylight.ovsdb.lib.database;\r
 \r
-import java.util.Arrays;\r
-\r
-import com.fasterxml.jackson.annotation.JsonProperty;\r
+import com.fasterxml.jackson.annotation.JsonProperty;
 \r
 \r
 public class OvsdbType {\r
@@ -28,6 +26,7 @@ public class OvsdbType {
 \r
         private String name;\r
 \r
+        @Override
         public String toString() {\r
             return name;\r
         }\r
@@ -55,7 +54,7 @@ public class OvsdbType {
             this.type = type;\r
         }\r
 \r
-        public BaseType(@JsonProperty("type") String type, @JsonProperty("enum") Object[] ovsdbEnum,\r
+        public BaseType(@JsonProperty("type") String type, @JsonProperty("enum") Object ovsdbEnum,\r
                 @JsonProperty("minInteger") Integer minInteger, @JsonProperty("maxInteger") Integer maxInteger,\r
                 @JsonProperty("minReal") Double minReal, @JsonProperty("maxReal") Double maxReal,\r
                 @JsonProperty("minLength") Integer minLength, @JsonProperty("maxLength") Integer maxLength,\r
@@ -73,7 +72,7 @@ public class OvsdbType {
         }\r
 \r
         public String type;\r
-        public Object[] ovsdbEnum;\r
+        public Object ovsdbEnum;\r
         public Integer minInteger;\r
         public Integer maxInteger;\r
         public Double minReal;\r
@@ -85,7 +84,7 @@ public class OvsdbType {
         @Override\r
         public String toString() {\r
             return "BaseType [type=" + type + ", ovsdbEnum="\r
-                    + Arrays.toString(ovsdbEnum) + ", minInteger=" + minInteger\r
+                    + ovsdbEnum + ", minInteger=" + minInteger\r
                     + ", maxInteger=" + maxInteger + ", minReal=" + minReal\r
                     + ", maxReal=" + maxReal + ", minLength=" + minLength\r
                     + ", maxLength=" + maxLength + ", refTable=" + refTable\r