홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
lishuai
Committed by Thomas Vachuska
72916e37 1 parent 35b34725

[ONOS-2546]Modify the bug of conditional judgment when converting 

JsonNode into ColumnType or BaseType.

Change-Id: I8199c097b1cad0234486b9ac3d0eedce9c4772ac
Inline Side-by-side
Showing 2 changed files with 7 additions and 7 deletions
......@@ -121,8 +121,8 @@ public final class BaseTypeFactory {
if (node != null) {
max = node.asInt();
}
if (node.has("enum")) {
JsonNode anEnum = node.get("enum").get(1);
if (type.has("enum")) {
JsonNode anEnum = type.get("enum").get(1);
for (JsonNode n : anEnum) {
enums.add(n.asInt());
}
......@@ -148,8 +148,8 @@ public final class BaseTypeFactory {
if (node != null) {
max = node.asDouble();
}
if (node.has("enum")) {
JsonNode anEnum = node.get("enum").get(1);
if (type.has("enum")) {
JsonNode anEnum = type.get("enum").get(1);
for (JsonNode n : anEnum) {
enums.add(n.asDouble());
}
......@@ -175,8 +175,8 @@ public final class BaseTypeFactory {
if (node != null) {
maxLength = node.asInt();
}
if (node.has("enum")) {
JsonNode enumVal = node.get("enum");
if (type.has("enum")) {
JsonNode enumVal = type.get("enum");
if (enumVal.isArray()) {
JsonNode anEnum = enumVal.get(1);
for (JsonNode n : anEnum) {
......
......@@ -61,7 +61,7 @@ public final class ColumnTypeFactory {
* @return ColumnType
*/
public static ColumnType getColumnTypeFromJson(JsonNode json) {
if (json.isObject() && !json.has(Type.VALUE.type())) {
if (!json.isObject() || !json.has(Type.VALUE.type())) {
return createAtomicColumnType(json);
} else if (!json.isValueNode() && json.has(Type.VALUE.type())) {
return createKeyValuedColumnType(json);
......