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 --- lisp/lisp2vpp/pom.xml | 10 +++------- .../fd/honeycomb/lisp/cfgattrs/LispConfiguration.java | 18 +++++++++--------- .../lisp/translate/read/AdjacencyCustomizer.java | 2 +- .../read/factory/LocatorSetsReaderFactory.java | 5 ++--- .../fd/honeycomb/lisp/translate/util/EidConverter.java | 2 -- .../lisp/translate/write/LocatorSetCustomizer.java | 6 +++--- .../lisp/translate/util/EidConverterTest.java | 2 -- 7 files changed, 18 insertions(+), 27 deletions(-) (limited to 'lisp/lisp2vpp') diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 920d33a7e..3a5942ad5 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/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 @@ -62,24 +62,20 @@ io.fd.vpp jvpp-core - 16.12-SNAPSHOT com.google.inject guice - ${guice.version} net.jmob guice.conf - ${guice.config.version} com.google.inject.extensions guice-multibindings - ${guice.version} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/cfgattrs/LispConfiguration.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/cfgattrs/LispConfiguration.java index c38ca602f..dae41cebd 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/cfgattrs/LispConfiguration.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/cfgattrs/LispConfiguration.java @@ -21,44 +21,44 @@ import net.jmob.guice.conf.core.Syntax; /** * Class containing static configuration for Lisp module,
- * either loaded from property file or statically typed + * either loaded from property file or statically typed. */ @BindConfig(value = "lisp", syntax = Syntax.JSON) public class LispConfiguration { - //TODO - this constant should be part of V3po plugin + //TODO HONEYCOMB-176 - this constant should be part of V3po plugin /** - * Interface index to name mapping + * Interface index to name mapping. */ public static final String INTERFACE_CONTEXT = "interface-context"; /** - * Locator set index to name mapping + * Locator set index to name mapping. */ public static final String LOCATOR_SET_CONTEXT = "locator-set-context"; /** - * Local mappings's eid to name mapping + * Local mappings's eid to name mapping. */ public static final String LOCAL_MAPPING_CONTEXT = "local-mapping-context"; /** - * Remote mappings's eid to name mapping + * Remote mappings's eid to name mapping. */ public static final String REMOTE_MAPPING_CONTEXT = "remote-mapping-context"; /** - * Central honeycomb initializer + * Central honeycomb initializer. */ public static final String HONEYCOMB_INITIALIZER = "honeycomb-initializer"; /** - * Unique prefix for naming context of interfaces + * Unique prefix for naming context of interfaces. **/ public static final String INTERFACE_CONTEXT_PREFIX = "interface-"; /** - * Unique prefix for naming context of locator sets + * Unique prefix for naming context of locator sets. **/ public static final String LOCATOR_SET_CONTEXT_PREFIX = "locator-set-"; } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/AdjacencyCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/AdjacencyCustomizer.java index 1a9721ca0..50baf6b0e 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/AdjacencyCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/AdjacencyCustomizer.java @@ -66,7 +66,7 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer public void readCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final AdjacencyBuilder builder, @Nonnull final ReadContext ctx) throws ReadFailedException { - //TODO - finish after https://jira.fd.io/browse/VPP-362 + // TODO - finish after https://jira.fd.io/browse/VPP-362 throw new ReadFailedException(id, new OperationNotSupportedException("Operation not supported")); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java index 3d0801969..cc500e159 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java @@ -34,7 +34,7 @@ import org.openvpp.jvpp.core.future.FutureJVppCore; /** - * Produces reader for {@link LocatorSets}
and all its inhired child readers + * Produces reader for {@link LocatorSets}
and all its inhired child readers. */ public class LocatorSetsReaderFactory extends AbstractLispReaderFactoryBase implements ReaderFactory { @@ -42,8 +42,7 @@ public class LocatorSetsReaderFactory extends AbstractLispReaderFactoryBase impl private LocatorSetsReaderFactory(final InstanceIdentifier lispStateId, final FutureJVppCore vppApi, final NamingContext interfaceContext, - final NamingContext locatorSetContext - ) { + final NamingContext locatorSetContext) { super(lispStateId, vppApi); this.interfaceContext = interfaceContext; this.locatorSetContext = locatorSetContext; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/util/EidConverter.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/util/EidConverter.java index 39d0fe7f0..b0ca7fc04 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/util/EidConverter.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/util/EidConverter.java @@ -206,7 +206,6 @@ public final class EidConverter { } else if (address instanceof Mac) { return MAC; } else { - //TODO - other types throw new IllegalStateException("Unknown type detected"); } } @@ -256,7 +255,6 @@ public final class EidConverter { case MAC: return TranslateUtils.parseMac(((Mac) address).getMac().getValue()); default: - //TODO - other types throw new IllegalArgumentException("Unsupported type"); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java index c2db3b845..d6eaf4f68 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java @@ -47,7 +47,7 @@ import org.openvpp.jvpp.core.future.FutureJVppCore; /** - * Customizer for {@link LocatorSet} entity + * Customizer for {@link LocatorSet} entity. * * @see LocatorSet */ @@ -77,7 +77,7 @@ public class LocatorSetCustomizer extends FutureJVppCustomizer final String locatorSetName = dataAfter.getName(); checkNotNull(locatorSetName, "LocatorSet name is null"); - //TODO check and fill mapping when api returns index of created locator set + // TODO VPP-323 check and fill mapping when api returns index of created locator set // checkState(!locatorSetContext.containsIndex(locatorSetName, writeContext.getMappingContext()), // "Locator set with name %s allready defined", locatorSetName); @@ -102,7 +102,7 @@ public class LocatorSetCustomizer extends FutureJVppCustomizer public void updateCurrentAttributes(@Nonnull InstanceIdentifier id, @Nonnull LocatorSet dataBefore, @Nonnull LocatorSet dataAfter, - WriteContext writeContext) throws WriteFailedException { + @Nonnull WriteContext writeContext) throws WriteFailedException { throw new UnsupportedOperationException("Operation not supported"); } diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/util/EidConverterTest.java b/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/util/EidConverterTest.java index 15087ef24..0f06d2984 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/util/EidConverterTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/util/EidConverterTest.java @@ -43,7 +43,5 @@ public class EidConverterTest { new MacAddress("aa:bb:cc:dd:ee:ff")) .build()) .build())); - - //TODO testing of other types when they are implemented } } -- cgit 1.2.3-korg