HONEYCOMB-289 - Type-aware read customizers

Refactoring due to https://gerrit.fd.io/r/#/c/3898/

Change-Id: I3ddcc06aca0a730db9fd727a3d2b10cd085f870e
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

1 files changed, 20 insertions, 19 deletions

diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java
index 710bb8d1c..a7167c3ef 100755
--- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java
@@ -20,6 +20,8 @@ package io.fd.hc2vpp.lisp.translate.read;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.base.Optional;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
 import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext;
 import io.fd.hc2vpp.lisp.context.util.EidMappingContext;
 import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams;
@@ -31,8 +33,6 @@ import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
 import io.fd.honeycomb.translate.util.RWUtils;
 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.FutureJVppCustomizer;
-import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
 import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGet;
 import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGetReply;
 import io.fd.vpp.jvpp.core.future.FutureJVppCore;
@@ -70,6 +70,7 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer
         super(futureJvpp);
         dumpCacheManager = new DumpCacheManager.DumpCacheManagerBuilder<LispAdjacenciesGetReply, AdjacencyDumpParams>()
                 .withExecutor(createExecutor())
+                .acceptOnly(LispAdjacenciesGetReply.class)
                 .build();
 
         this.adjacenciesMappingContext =
@@ -155,19 +156,32 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer
         };
     }
 
+    private static final class AdjacencyDumpParams {
+
+        private final int vni;
+
+        AdjacencyDumpParams(final int vni) {
+            this.vni = vni;
+        }
+
+        public int getVni() {
+            return this.vni;
+        }
+    }
+
     private class EidPairProducer implements EidTranslator {
 
         private final EidMappingContext localMappingContext;
         private final EidMappingContext remoteMappingContext;
 
-        public EidPairProducer(final EidMappingContext localMappingContext,
-                               final EidMappingContext remoteMappingContext) {
+        EidPairProducer(final EidMappingContext localMappingContext,
+                        final EidMappingContext remoteMappingContext) {
             this.localMappingContext = checkNotNull(localMappingContext, "Local mapping context cannot be null");
             this.remoteMappingContext = checkNotNull(remoteMappingContext, "Remote mapping context cannot be null");
         }
 
-        public EidIdentificatorPair createPair(final LispAdjacency data, final int vni,
-                                               final MappingContext mappingContext) {
+        EidIdentificatorPair createPair(final LispAdjacency data, final int vni,
+                                        final MappingContext mappingContext) {
             return new EidIdentificatorPairBuilder()
                     .setLocalEidId(new MappingId(localMappingContext.getId(getArrayAsEidLocal(
                             MappingsDumpParams.EidType.valueOf(data.eidType), data.leid, vni), mappingContext)))
@@ -176,17 +190,4 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer
                     .build();
         }
     }
-
-    private static final class AdjacencyDumpParams {
-
-        private final int vni;
-
-        AdjacencyDumpParams(final int vni) {
-            this.vni = vni;
-        }
-
-        public int getVni() {
-            return this.vni;
-        }
-    }
 }