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, 9 insertions, 7 deletions

diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/TagRewriteOperation.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/TagRewriteOperation.java
index c403b7104..e7c07ed75 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/TagRewriteOperation.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/TagRewriteOperation.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.fd.honeycomb.translate.v3po.util;
 
 import com.google.common.base.Preconditions;
@@ -39,6 +40,11 @@ public enum TagRewriteOperation {
     translate_2_to_2(2);
 
     private static final int MAX_INDEX = 3;
+    private static TagRewriteOperation[][] translation = new TagRewriteOperation[][]{
+            {disabled, push_1, push_2},
+            {pop_1, translate_1_to_1, translate_1_to_2},
+            {pop_2, translate_2_to_1, translate_2_to_2}
+    };
     private final int code;
     private final byte popTags;
 
@@ -47,15 +53,10 @@ public enum TagRewriteOperation {
         this.popTags = UnsignedBytes.checkedCast(popTags);
     }
 
-    private static TagRewriteOperation[][] translation = new TagRewriteOperation[][] {
-        {disabled, push_1, push_2},
-        {pop_1, translate_1_to_1, translate_1_to_2},
-        {pop_2, translate_2_to_1, translate_2_to_2}
-    };
-
     /**
      * Returns VPP tag rewrite operation for given number of tags to pop and tags to push.
-     * @param toPop number of tags to pop (0..2)
+     *
+     * @param toPop  number of tags to pop (0..2)
      * @param toPush number of tags to push (0..2)
      * @return vpp tag rewrite operation for given input parameters
      */
@@ -67,6 +68,7 @@ public enum TagRewriteOperation {
 
     /**
      * Returns VPP tag rewrite operation for given operation code.
+     *
      * @param code VPP tag rewrite operation code
      * @return vpp tag rewrite operation for given input parameter
      */