From 1326e9fa5cffe326b82aeee9d82d008526aff947 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Mon, 5 Sep 2016 12:10:26 +0200 Subject: 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 --- vpp-common/minimal-distribution/pom.xml | 5 ++- vpp-common/naming-context-api/pom.xml | 12 ------ vpp-common/naming-context-impl/pom.xml | 6 +-- vpp-common/pom.xml | 1 + vpp-common/vpp-impl-parent/pom.xml | 49 ++++++++++++++++++++++ vpp-common/vpp-translate-utils/pom.xml | 27 ++++-------- .../v3po/util/AbstractInterfaceTypeCustomizer.java | 3 -- .../translate/v3po/util/TagRewriteOperation.java | 10 ++--- 8 files changed, 66 insertions(+), 47 deletions(-) create mode 100644 vpp-common/vpp-impl-parent/pom.xml (limited to 'vpp-common') 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 @@ io.fd.honeycomb.vpp.distro.Main 1.16.12-SNAPSHOT + 16.12-SNAPSHOT @@ -74,12 +75,12 @@ io.fd.vpp jvpp-registry - 16.12-SNAPSHOT + ${jvpp.version} io.fd.vpp jvpp-core - 16.12-SNAPSHOT + ${jvpp.version} ${project.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 @@ 1.16.12-SNAPSHOT bundle - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.8.2-Beryllium-SR2 - pom - import - - - - 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 @@ io.fd.honeycomb.vpp naming-context-impl 1.16.12-SNAPSHOT + bundle @@ -45,9 +46,4 @@ ${project.version} - - bundle - - - 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 @@ naming-context-api naming-context-impl minimal-distribution + vpp-impl-parent 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 @@ + + + + + + + io.fd.honeycomb.common + impl-parent + 1.16.12-SNAPSHOT + ../../common/impl-parent + + + 4.0.0 + io.fd.honeycomb.vpp + vpp-impl-parent + 1.16.12-SNAPSHOT + + 16.12-SNAPSHOT + + pom + + + + + io.fd.vpp + jvpp-core + ${jvpp.version} + + + io.fd.vpp + jvpp-registry + ${jvpp.version} + + + + 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 @@ - io.fd.honeycomb.common - impl-parent + io.fd.honeycomb.vpp + vpp-impl-parent 1.16.12-SNAPSHOT - ../../common/impl-parent + ../../vpp-common/vpp-impl-parent 4.0.0 @@ -28,17 +28,9 @@ 1.16.12-SNAPSHOT bundle - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.8.2-Beryllium-SR2 - pom - import - - - + + 1.9 + @@ -54,12 +46,10 @@ io.fd.vpp jvpp-registry - 16.12-SNAPSHOT io.fd.vpp jvpp-core - 16.12-SNAPSHOT org.opendaylight.mdsal.model @@ -77,10 +67,9 @@ commons-codec commons-codec - 1.9 + ${commons.codec.version} - junit junit @@ -91,7 +80,5 @@ mockito-all test - - 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 extends FutureJVppCustomizer implements WriterCustomizer { 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. + *

+ * 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; } } -- cgit 1.2.3-korg