diff options
Diffstat (limited to 'routing/routing-impl/src/main')
6 files changed, 7 insertions, 7 deletions
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java index 3fde2da4c..166537bce 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java @@ -16,7 +16,7 @@ package io.fd.hc2vpp.routing.read; -import com.google.common.base.Optional; +import java.util.Optional; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.routing.trait.RouteMapper; import io.fd.honeycomb.translate.ModificationCache; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java index a78668d3d..55c33555a 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java @@ -16,7 +16,7 @@ package io.fd.hc2vpp.routing.read; -import com.google.common.base.Optional; +import java.util.Optional; import io.fd.hc2vpp.common.translate.util.MultiNamingContext; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.routing.RoutingConfiguration; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java index 3ff34abbd..c0d405bd9 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java @@ -16,7 +16,7 @@ package io.fd.hc2vpp.routing.read; -import com.google.common.base.Optional; +import java.util.Optional; import io.fd.hc2vpp.common.translate.util.MultiNamingContext; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.routing.RoutingConfiguration; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizer.java index 77e0d1a3c..f3a4b7b0c 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizer.java @@ -16,7 +16,7 @@ package io.fd.hc2vpp.routing.write; -import com.google.common.base.Optional; +import java.util.Optional; import com.google.common.base.Preconditions; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java index d6fc3e6c6..a06078174 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java @@ -17,7 +17,7 @@ package io.fd.hc2vpp.routing.write; -import com.google.common.base.Optional; +import java.util.Optional; import com.google.common.base.Preconditions; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java index d9cd5d1ee..391e6194f 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java @@ -17,7 +17,6 @@ package io.fd.hc2vpp.routing.write.trait; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.commons.lang3.StringUtils.isNotEmpty; import com.google.common.collect.ImmutableSet.Builder; import io.fd.hc2vpp.common.translate.util.AddressTranslator; @@ -56,7 +55,8 @@ public interface RouteRequestProducer extends ByteDataTranslator, AddressTransla default boolean classifyTablePresent(final String classifyTableName, final VppClassifierContextManager classifierContextManager, final MappingContext mappingContext) { - return isNotEmpty(classifyTableName) && + + return classifyTableName != null && !classifyTableName.isEmpty() && classifierContextManager.containsTable(classifyTableName, mappingContext); } |