HONEYCOMB-145 - Utility Class Refactoring

problematic mockito-all changed to mockito-core( https://github.com/mockito/mockito/issues/324)

Translate Utils Splitted to multiple Trait Interfaces

Ipv4Translator - Logic for translation of ipv4-based data
Ipv6Translator - Logic for translation of ipv6-based data
MacTranslator - Logic for translation of mac-based data
AddressTranslator - Aggregation trait for Ipv4/Ipv6/Mac 
JvppReplyConsumer - Logic for extracting replies from jvpp calls
ByteDataTranslator - any byte-based conversions
Plus some existing utility classes changed to traits


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

1 files changed, 6 insertions, 4 deletions

diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LispCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LispCustomizer.java
index 05c162d0c..040938c20 100755
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LispCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LispCustomizer.java
@@ -18,8 +18,9 @@ package io.fd.honeycomb.lisp.translate.write;
 
 import com.google.common.base.Preconditions;
 import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
+import io.fd.honeycomb.translate.v3po.util.ByteDataTranslator;
 import io.fd.honeycomb.translate.v3po.util.FutureJVppCustomizer;
-import io.fd.honeycomb.translate.v3po.util.TranslateUtils;
+import io.fd.honeycomb.translate.v3po.util.JvppReplyConsumer;
 import io.fd.honeycomb.translate.write.WriteContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
 import java.util.concurrent.CompletionStage;
@@ -36,7 +37,8 @@ import org.openvpp.jvpp.core.future.FutureJVppCore;
 /**
  * Handles updates of {@link Lisp} node. Takes care of LISP enable/disable
  */
-public class LispCustomizer extends FutureJVppCustomizer implements WriterCustomizer<Lisp> {
+public class LispCustomizer extends FutureJVppCustomizer
+        implements WriterCustomizer<Lisp>, ByteDataTranslator, JvppReplyConsumer {
 
     public LispCustomizer(final FutureJVppCore vppApi) {
         super(vppApi);
@@ -84,12 +86,12 @@ public class LispCustomizer extends FutureJVppCustomizer implements WriterCustom
     private void enableDisableLisp(final boolean enable) throws VppBaseCallException, TimeoutException {
         final CompletionStage<LispEnableDisableReply> lispEnableDisableReplyCompletionStage =
                 getFutureJVpp().lispEnableDisable(getRequest(enable));
-        TranslateUtils.getReply(lispEnableDisableReplyCompletionStage.toCompletableFuture());
+        getReply(lispEnableDisableReplyCompletionStage.toCompletableFuture());
     }
 
     private LispEnableDisable getRequest(final boolean enable) {
         final LispEnableDisable lispEnableDisable = new LispEnableDisable();
-        lispEnableDisable.isEn = TranslateUtils.booleanToByte(enable);
+        lispEnableDisable.isEn = booleanToByte(enable);
         return lispEnableDisable;
     }
 }