From a7147d16c31d9028c6b5dc557264433de0f11c91 Mon Sep 17 00:00:00 2001
From: Jan Srnicek <jsrnicek@cisco.com>
Date: Fri, 23 Sep 2016 16:39:09 +0200
Subject: 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>
---
 .../translate/v3po/util/MacTranslator.java         | 109 +++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/MacTranslator.java

(limited to 'vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/MacTranslator.java')

diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/MacTranslator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/MacTranslator.java
new file mode 100644
index 000000000..f18a122f2
--- /dev/null
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/v3po/util/MacTranslator.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.translate.v3po.util;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.base.Splitter;
+import java.util.List;
+import java.util.function.BiConsumer;
+import javax.annotation.Nonnull;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+
+/**
+ * Trait providing logic for translation of ipv4-related data
+ */
+public interface MacTranslator {
+
+    Splitter COLON_SPLITTER = Splitter.on(':');
+
+    /**
+     * Parse string represented mac address (using ":" as separator) into a byte array
+     */
+    @Nonnull
+    default byte[] parseMac(@Nonnull final String macAddress) {
+        final List<String> parts = COLON_SPLITTER.splitToList(macAddress);
+        checkArgument(parts.size() == 6, "Mac address is expected to have 6 parts but was: %s", macAddress);
+        return parseMacLikeString(parts);
+    }
+
+    default byte[] parseMacLikeString(final List<String> strings) {
+        return strings.stream().limit(6).map(this::parseHexByte).collect(
+                () -> new byte[strings.size()],
+                new BiConsumer<byte[], Byte>() {
+
+                    private int i = -1;
+
+                    @Override
+                    public void accept(final byte[] bytes, final Byte aByte) {
+                        bytes[++i] = aByte;
+                    }
+                },
+                (bytes, bytes2) -> {
+                    throw new UnsupportedOperationException("Parallel collect not supported");
+                });
+    }
+
+    /**
+     * Converts byte array to address string ,not separated with ":"
+     */
+    default String byteArrayToMacUnseparated(byte[] address) {
+        checkArgument(address.length == 6, "Illegal array length");
+        return Hex.encodeHexString(address);
+    }
+
+    /**
+     * Converts byte array to address string ,separated with ":"
+     */
+    default String byteArrayToMacSeparated(byte[] address) {
+        checkArgument(address.length == 6, "Illegal array length");
+
+        String unseparatedAddress = Hex.encodeHexString(address);
+        String separated = "";
+
+        for (int i = 0; i < unseparatedAddress.length(); i = i + 2) {
+            if (i == (unseparatedAddress.length() - 2)) {
+                separated = separated + unseparatedAddress.substring(0 + i, 2 + i);
+            } else {
+                separated = separated + unseparatedAddress.substring(0 + i, 2 + i) + ":";
+            }
+        }
+
+        return separated;
+    }
+
+    /**
+     * Converts MAC string to byte array
+     */
+    default byte[] macToByteArray(String mac) {
+        checkNotNull(mac, "MAC cannot be null");
+
+        mac = mac.replace(":", "");
+
+        try {
+            return Hex.decodeHex(mac.toCharArray());
+        } catch (DecoderException e) {
+            throw new IllegalArgumentException("Unable to convert mac", e);
+        }
+    }
+
+    default byte parseHexByte(final String aByte) {
+        return (byte) Integer.parseInt(aByte, 16);
+    }
+}
-- 
cgit 1.2.3-korg