From 927fb75d969b2d39c91ae6735f0127646348b73c Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Mon, 21 Nov 2016 14:44:15 +0100 Subject: HONEYCOMB-289 - Type-aware read customizers Refactoring due to https://gerrit.fd.io/r/#/c/3898/ Change-Id: I3ddcc06aca0a730db9fd727a3d2b10cd085f870e Signed-off-by: Jan Srnicek --- .../src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java | 2 ++ .../src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'nat/nat2vpp/src/main') diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java index 76c478594..497ed1c96 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatReaderFactory.java @@ -64,11 +64,13 @@ public class NatReaderFactory implements ReaderFactory { this.mapEntryDumpMgr = new DumpCacheManager.DumpCacheManagerBuilder() .withExecutor(new MappingEntryCustomizer.MappingEntryDumpExecutor(jvppSnat)) + .acceptOnly(SnatStaticMappingDetailsReplyDump.class) .build(); this.addressRangeDumpMgr = new DumpCacheManager.DumpCacheManagerBuilder() .withExecutor(new ExternalIpPoolCustomizer.AddressRangeDumpExecutor(jvppSnat)) + .acceptOnly(SnatAddressDetailsReplyDump.class) .build(); } diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java index 87a70f707..641785281 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java @@ -19,14 +19,14 @@ package io.fd.hc2vpp.nat.read.ifc; import com.google.inject.Inject; import com.google.inject.name.Named; +import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; +import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.impl.read.GenericInitReader; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetailsReplyDump; import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDump; import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade; @@ -60,6 +60,7 @@ public final class IfcNatReaderFactory implements ReaderFactory { @Named("interface-context") final NamingContext ifcContext) { this.snatIfcDumpMgr = new DumpCacheManager.DumpCacheManagerBuilder() .withExecutor(new SnatInterfaceExecutor(jvppSnat)) + .acceptOnly(SnatInterfaceDetailsReplyDump.class) .build(); this.ifcContext = ifcContext; } -- cgit 1.2.3-korg