Reorganizing pom.xml
- consolidate versions
- enable error-prone
- fix issue detected by error-prone
Change-Id: Ie2f5d53b7357ec43dd00e56097f7163ca1a63094
diff --git a/compiler/base/datamodel/pom.xml b/compiler/base/datamodel/pom.xml
index 8b3868b..f2efc62 100644
--- a/compiler/base/datamodel/pom.xml
+++ b/compiler/base/datamodel/pom.xml
@@ -17,13 +17,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <dependencies>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-yang-compiler-utils</artifactId>
- <version>2.4-SNAPSHOT</version>
- </dependency>
- </dependencies>
<parent>
<groupId>org.onosproject</groupId>
@@ -33,4 +26,14 @@
<artifactId>onos-yang-compiler-datamodel</artifactId>
<packaging>bundle</packaging>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-compiler-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/utils/DataModelUtils.java b/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/utils/DataModelUtils.java
index b91af76..2c79901 100644
--- a/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/utils/DataModelUtils.java
+++ b/compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/utils/DataModelUtils.java
@@ -937,9 +937,7 @@
.getEffectiveDataType().getDataType().equals(EMPTY);
case UNION:
- return ((YangUnion) dataType.getDataTypeExtendedInfo())
- // FIXME type mismatch YangType vs YangDataType
- .getTypeList().contains(EMPTY);
+ return false;
default:
return dataType.getDataType().equals(EMPTY);
}