Cleanup TODOs and FIXMEs

- Fix minor ones
- Report bigger and include issue number in comment
- Pull common dependencies into dependency management of common/parents

Change-Id: I06a6ac37c52b603fd73ed42023d6b2e7fa18010f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

8 files changed, 66 insertions, 47 deletions

diff --git a/vpp-common/minimal-distribution/pom.xml b/vpp-common/minimal-distribution/pom.xml
index 557f4e962..c6bd0d2ff 100644
--- a/vpp-common/minimal-distribution/pom.xml
+++ b/vpp-common/minimal-distribution/pom.xml
@@ -30,6 +30,7 @@
   <properties>
     <main.class>io.fd.honeycomb.vpp.distro.Main</main.class>
     <honeycomb.min.distro.version>1.16.12-SNAPSHOT</honeycomb.min.distro.version>
+    <jvpp.version>16.12-SNAPSHOT</jvpp.version>
   </properties>
 
   <build>
@@ -74,12 +75,12 @@
     <dependency>
       <groupId>io.fd.vpp</groupId>
       <artifactId>jvpp-registry</artifactId>
-      <version>16.12-SNAPSHOT</version>
+      <version>${jvpp.version}</version>
     </dependency>
     <dependency>
       <groupId>io.fd.vpp</groupId>
       <artifactId>jvpp-core</artifactId>
-      <version>16.12-SNAPSHOT</version>
+      <version>${jvpp.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/vpp-common/naming-context-api/pom.xml b/vpp-common/naming-context-api/pom.xml
index 096c20b66..b652df219 100644
--- a/vpp-common/naming-context-api/pom.xml
+++ b/vpp-common/naming-context-api/pom.xml
@@ -27,16 +27,4 @@
   <version>1.16.12-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.8.2-Beryllium-SR2</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
 </project>
diff --git a/vpp-common/naming-context-impl/pom.xml b/vpp-common/naming-context-impl/pom.xml
index 0523435f7..e628dd1d8 100644
--- a/vpp-common/naming-context-impl/pom.xml
+++ b/vpp-common/naming-context-impl/pom.xml
@@ -27,6 +27,7 @@
   <groupId>io.fd.honeycomb.vpp</groupId>
   <artifactId>naming-context-impl</artifactId>
   <version>1.16.12-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
@@ -45,9 +46,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-
-  <packaging>bundle</packaging>
-
-
-
 </project>
diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml
index 41360c49a..e3caf387e 100644
--- a/vpp-common/pom.xml
+++ b/vpp-common/pom.xml
@@ -36,6 +36,7 @@
     <module>naming-context-api</module>
     <module>naming-context-impl</module>
     <module>minimal-distribution</module>
+    <module>vpp-impl-parent</module>
   </modules>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml
new file mode 100644
index 000000000..0d688bac8
--- /dev/null
+++ b/vpp-common/vpp-impl-parent/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2015 Cisco and/or its affiliates.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at:
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+
+  <parent>
+    <groupId>io.fd.honeycomb.common</groupId>
+    <artifactId>impl-parent</artifactId>
+    <version>1.16.12-SNAPSHOT</version>
+    <relativePath>../../common/impl-parent</relativePath>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.fd.honeycomb.vpp</groupId>
+  <artifactId>vpp-impl-parent</artifactId>
+  <version>1.16.12-SNAPSHOT</version>
+  <properties>
+    <jvpp.version>16.12-SNAPSHOT</jvpp.version>
+  </properties>
+  <packaging>pom</packaging>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.fd.vpp</groupId>
+        <artifactId>jvpp-core</artifactId>
+        <version>${jvpp.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.fd.vpp</groupId>
+        <artifactId>jvpp-registry</artifactId>
+        <version>${jvpp.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+</project>
diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml
index c2d9ad82f..bb5568202 100644
--- a/vpp-common/vpp-translate-utils/pom.xml
+++ b/vpp-common/vpp-translate-utils/pom.xml
@@ -16,10 +16,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
-        <artifactId>impl-parent</artifactId>
+        <groupId>io.fd.honeycomb.vpp</groupId>
+        <artifactId>vpp-impl-parent</artifactId>
         <version>1.16.12-SNAPSHOT</version>
-        <relativePath>../../common/impl-parent</relativePath>
+        <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -28,17 +28,9 @@
     <version>1.16.12-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.8.2-Beryllium-SR2</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <properties>
+        <commons.codec.version>1.9</commons.codec.version>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -54,12 +46,10 @@
         <dependency>
             <groupId>io.fd.vpp</groupId>
             <artifactId>jvpp-registry</artifactId>
-            <version>16.12-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.fd.vpp</groupId>
             <artifactId>jvpp-core</artifactId>
-            <version>16.12-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
@@ -77,10 +67,9 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.9</version>
+            <version>${commons.codec.version}</version>
         </dependency>
 
-        <!-- Testing Dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -91,7 +80,5 @@
             <artifactId>mockito-all</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
-
 </project>
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/AbstractInterfaceTypeCustomizer.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/AbstractInterfaceTypeCustomizer.java
index cf6f29370..dd66f7225 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/AbstractInterfaceTypeCustomizer.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/AbstractInterfaceTypeCustomizer.java
@@ -33,9 +33,6 @@ import org.openvpp.jvpp.core.future.FutureJVppCore;
 /**
  * Validation WriteCustomizers for Interface subnodes.
  * Validates the type of interface.
- *
- * TODO this should be validated on model/DataTree level. However DataTree does not enforce When conditions
- * Delete this class when DataTree handles when constraints properly
  */
 public abstract class AbstractInterfaceTypeCustomizer<D extends DataObject>
     extends FutureJVppCustomizer implements WriterCustomizer<D> {
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/TagRewriteOperation.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/TagRewriteOperation.java
index 7958aff06..c403b7104 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/TagRewriteOperation.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/TagRewriteOperation.java
@@ -21,9 +21,9 @@ import javax.annotation.Nonnegative;
 import javax.annotation.Nullable;
 
 /**
- * Defines vlan tag rewrite config options for VPP
- *
- * TODO corresponding enum (defined in l2_vtr.h) should be defined in vpe.api
+ * Defines vlan tag rewrite config options for VPP.
+ * <p/>
+ * TODO HONEYCOMB-184 corresponding enum (defined in l2_vtr.h) should be defined in vpe.api
  * (does vpp's IDL support enum type definition?)
  * which would allow to generate this class in jvpp
  */
@@ -38,7 +38,7 @@ public enum TagRewriteOperation {
     translate_2_to_1(2),
     translate_2_to_2(2);
 
-    private final static int MAX_INDEX = 3;
+    private static final int MAX_INDEX = 3;
     private final int code;
     private final byte popTags;
 
@@ -73,7 +73,7 @@ public enum TagRewriteOperation {
     @Nullable
     public static TagRewriteOperation get(@Nonnegative final int code) {
         for (TagRewriteOperation operation : TagRewriteOperation.values()) {
-            if (code == operation.code){
+            if (code == operation.code) {
                 return operation;
             }
         }