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>
---
 infra/cfg-init/pom.xml                                                  | 2 +-
 infra/data-impl/pom.xml                                                 | 2 +-
 infra/impl/pom.xml                                                      | 2 +-
 infra/it/it-test/pom.xml                                                | 2 +-
 infra/notification/impl/pom.xml                                         | 2 +-
 infra/translate-api/pom.xml                                             | 2 +-
 .../io/fd/honeycomb/translate/write/registry/DataObjectUpdatesTest.java | 1 +
 infra/translate-impl/pom.xml                                            | 2 +-
 infra/translate-spi/pom.xml                                             | 2 +-
 infra/translate-utils/pom.xml                                           | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'infra')

diff --git a/infra/cfg-init/pom.xml b/infra/cfg-init/pom.xml
index c1fd353dc..1a0098dd0 100644
--- a/infra/cfg-init/pom.xml
+++ b/infra/cfg-init/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/infra/data-impl/pom.xml b/infra/data-impl/pom.xml
index 341378192..8b4e29918 100644
--- a/infra/data-impl/pom.xml
+++ b/infra/data-impl/pom.xml
@@ -60,7 +60,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/infra/impl/pom.xml b/infra/impl/pom.xml
index 0bbe23e6c..572a079bf 100644
--- a/infra/impl/pom.xml
+++ b/infra/impl/pom.xml
@@ -61,7 +61,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/infra/it/it-test/pom.xml b/infra/it/it-test/pom.xml
index 9600de2e3..bd2f9c0d6 100644
--- a/infra/it/it-test/pom.xml
+++ b/infra/it/it-test/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/infra/notification/impl/pom.xml b/infra/notification/impl/pom.xml
index 083cb98eb..f289f75d1 100644
--- a/infra/notification/impl/pom.xml
+++ b/infra/notification/impl/pom.xml
@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/infra/translate-api/pom.xml b/infra/translate-api/pom.xml
index 88801f13c..594057284 100644
--- a/infra/translate-api/pom.xml
+++ b/infra/translate-api/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/infra/translate-api/src/test/java/io/fd/honeycomb/translate/write/registry/DataObjectUpdatesTest.java b/infra/translate-api/src/test/java/io/fd/honeycomb/translate/write/registry/DataObjectUpdatesTest.java
index 2c576eb6b..46ebb01ff 100644
--- a/infra/translate-api/src/test/java/io/fd/honeycomb/translate/write/registry/DataObjectUpdatesTest.java
+++ b/infra/translate-api/src/test/java/io/fd/honeycomb/translate/write/registry/DataObjectUpdatesTest.java
@@ -20,6 +20,7 @@ import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
+
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
diff --git a/infra/translate-impl/pom.xml b/infra/translate-impl/pom.xml
index 99b3a9846..2a9280b87 100644
--- a/infra/translate-impl/pom.xml
+++ b/infra/translate-impl/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/infra/translate-spi/pom.xml b/infra/translate-spi/pom.xml
index 18de9b1d4..8fb2cd1cb 100644
--- a/infra/translate-spi/pom.xml
+++ b/infra/translate-spi/pom.xml
@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/infra/translate-utils/pom.xml b/infra/translate-utils/pom.xml
index e1b14702a..d05f6b7ba 100644
--- a/infra/translate-utils/pom.xml
+++ b/infra/translate-utils/pom.xml
@@ -72,7 +72,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
-- 
cgit 1.2.3-korg