DumpCacheManager: make dumpParams optional

Requires https://gerrit.fd.io/r/#/c/8185/

Change-Id: Ib2d529366bd3cf6bb292014026ab8053a19c0ed7
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

3 files changed, 6 insertions, 12 deletions

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 71758b4fe..aa451e241 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,8 +16,6 @@
 
 package io.fd.hc2vpp.routing.read;
 
-import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS;
-
 import com.google.common.base.Optional;
 import io.fd.hc2vpp.common.translate.util.MultiNamingContext;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
@@ -81,7 +79,7 @@ public class Ipv4RouteCustomizer
                                     @Nonnull final ReadContext readContext) throws ReadFailedException {
 
         final Optional<IpFibDetailsReplyDump> ipv4RoutesDump =
-                ipv4RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache(), NO_PARAMS);
+                ipv4RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache());
 
         final String protocolName = instanceIdentifier.firstKeyOf(RoutingProtocol.class).getName();
         final int protocolTableId = routingProtocolContext.getIndex(protocolName, readContext.getMappingContext());
@@ -136,7 +134,7 @@ public class Ipv4RouteCustomizer
         final String protocolName = instanceIdentifier.firstKeyOf(RoutingProtocol.class).getName();
         final int protocolTableId = routingProtocolContext.getIndex(protocolName, readContext.getMappingContext());
         final Optional<IpFibDetailsReplyDump> ipv4RoutesDump =
-                ipv4RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache(), NO_PARAMS);
+                ipv4RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache());
 
         if (ipv4RoutesDump.isPresent() && !ipv4RoutesDump.get().ipFibDetails.isEmpty()) {
 
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 c83891d85..219c29951 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,8 +16,6 @@
 
 package io.fd.hc2vpp.routing.read;
 
-import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS;
-
 import com.google.common.base.Optional;
 import io.fd.hc2vpp.common.translate.util.MultiNamingContext;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
@@ -79,7 +77,7 @@ public class Ipv6RouteCustomizer
                                     @Nonnull final ReadContext readContext) throws ReadFailedException {
 
         final Optional<Ip6FibDetailsReplyDump> ipv6RoutesDump =
-                ipv6RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache(), NO_PARAMS);
+                ipv6RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache());
 
         final String protocolName = instanceIdentifier.firstKeyOf(RoutingProtocol.class).getName();
         final int protocolTableId = routingProtocolContext.getIndex(protocolName, readContext.getMappingContext());
@@ -133,7 +131,7 @@ public class Ipv6RouteCustomizer
         final String protocolName = instanceIdentifier.firstKeyOf(RoutingProtocol.class).getName();
         final int protocolTableId = routingProtocolContext.getIndex(protocolName, readContext.getMappingContext());
         final Optional<Ip6FibDetailsReplyDump> ipv6RoutesDump =
-                ipv6RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache(), NO_PARAMS);
+                ipv6RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache());
 
         if (ipv6RoutesDump.isPresent() && !ipv6RoutesDump.get().ip6FibDetails.isEmpty()) {
 
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingProtocolCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingProtocolCustomizer.java
index c8a379b83..e33d1448d 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingProtocolCustomizer.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingProtocolCustomizer.java
@@ -16,8 +16,6 @@
 
 package io.fd.hc2vpp.routing.read;
 
-import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS;
-
 import com.google.common.base.Optional;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.hc2vpp.routing.trait.RouteMapper;
@@ -85,7 +83,7 @@ public class RoutingProtocolCustomizer
     private List<Integer> ipv4TableIds(final InstanceIdentifier<RoutingProtocol> instanceIdentifier,
                                        final ModificationCache modificationCache) throws ReadFailedException {
         final Optional<IpFibDetailsReplyDump>
-                ipv4Routes = ipv4RoutesDumpManager.getDump(instanceIdentifier, modificationCache, NO_PARAMS);
+                ipv4Routes = ipv4RoutesDumpManager.getDump(instanceIdentifier, modificationCache);
 
         if (ipv4Routes.isPresent()) {
             return ipv4Routes.get().ipFibDetails.stream()
@@ -98,7 +96,7 @@ public class RoutingProtocolCustomizer
     private List<Integer> ipv6TableIds(final InstanceIdentifier<RoutingProtocol> instanceIdentifier,
                                        final ModificationCache modificationCache) throws ReadFailedException {
         final Optional<Ip6FibDetailsReplyDump>
-                ipv6Routes = ipv6RoutesDumpManager.getDump(instanceIdentifier, modificationCache, NO_PARAMS);
+                ipv6Routes = ipv6RoutesDumpManager.getDump(instanceIdentifier, modificationCache);
 
         if (ipv6Routes.isPresent()) {
             return ipv6Routes.get().ip6FibDetails.stream()