Merge pull request apache#76 from seznam/pete/use-shaded-guava

#! Switch over to shaded guava
mareksimunek · Apr 6, 2017 · 5b164dc · 5b164dc
2 parents 81a35f5 + 4778592
commit 5b164dc
Show file tree

Hide file tree

Showing 65 changed files with 114 additions and 150 deletions.
diff --git a/sdks/java/extensions/euphoria/euphoria-core/pom.xml b/sdks/java/extensions/euphoria/euphoria-core/pom.xml
@@ -37,8 +37,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
+      <groupId>cz.seznam.euphoria</groupId>
+      <artifactId>shaded-guava</artifactId>
     </dependency>
 
     <dependency>

diff --git a/...euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/windowing/Session.java b/...euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/windowing/Session.java
@@ -15,12 +15,12 @@
  */
 package cz.seznam.euphoria.core.client.dataset.windowing;
 
-import com.google.common.base.Preconditions;
 import cz.seznam.euphoria.core.client.triggers.AfterFirstCompositeTrigger;
 import cz.seznam.euphoria.core.client.triggers.PeriodicTimeTrigger;
 import cz.seznam.euphoria.core.client.triggers.TimeTrigger;
 import cz.seznam.euphoria.core.client.triggers.Trigger;
 import cz.seznam.euphoria.core.client.util.Pair;
+import cz.seznam.euphoria.shaded.guava.com.google.common.base.Preconditions;
 
 import javax.annotation.Nullable;
 import java.time.Duration;

diff --git a/...ia/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/windowing/Time.java b/...ia/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/windowing/Time.java
@@ -15,11 +15,11 @@
  */
 package cz.seznam.euphoria.core.client.dataset.windowing;
 
-import com.google.common.base.Preconditions;
 import cz.seznam.euphoria.core.client.triggers.AfterFirstCompositeTrigger;
 import cz.seznam.euphoria.core.client.triggers.PeriodicTimeTrigger;
 import cz.seznam.euphoria.core.client.triggers.TimeTrigger;
 import cz.seznam.euphoria.core.client.triggers.Trigger;
+import cz.seznam.euphoria.shaded.guava.com.google.common.base.Preconditions;
 
 import javax.annotation.Nullable;
 import java.time.Duration;

diff --git a/...oria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/windowing/TimeSliding.java b/...oria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/windowing/TimeSliding.java
@@ -15,13 +15,12 @@
  */
 package cz.seznam.euphoria.core.client.dataset.windowing;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.AbstractIterator;
 import cz.seznam.euphoria.core.client.io.Context;
 import cz.seznam.euphoria.core.client.triggers.TimeTrigger;
 import cz.seznam.euphoria.core.client.triggers.Trigger;
+import cz.seznam.euphoria.shaded.guava.com.google.common.base.Preconditions;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.AbstractIterator;
 
-import java.io.Serializable;
 import java.time.Duration;
 import java.util.Iterator;
 

diff --git a/...uphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/io/ListDataSource.java b/...uphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/io/ListDataSource.java
@@ -15,8 +15,8 @@
  */
 package cz.seznam.euphoria.core.client.io;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Lists;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Sets;
 
 import java.io.IOException;
 import java.time.Duration;

diff --git a/...sions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/executor/Executor.java b/...sions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/executor/Executor.java
@@ -15,13 +15,13 @@
  */
 package cz.seznam.euphoria.core.executor;
 
-import com.google.common.collect.Sets;
 import cz.seznam.euphoria.core.client.flow.Flow;
 import cz.seznam.euphoria.core.client.operator.FlatMap;
 import cz.seznam.euphoria.core.client.operator.Operator;
 import cz.seznam.euphoria.core.client.operator.ReduceStateByKey;
 import cz.seznam.euphoria.core.client.operator.Repartition;
 import cz.seznam.euphoria.core.client.operator.Union;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Sets;
 
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;

diff --git a/...s/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/executor/FlowUnfolder.java b/...s/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/executor/FlowUnfolder.java
@@ -15,14 +15,14 @@
  */
 package cz.seznam.euphoria.core.executor;
 
-import com.google.common.collect.Iterables;
 import cz.seznam.euphoria.core.client.dataset.Dataset;
 import cz.seznam.euphoria.core.client.flow.Flow;
 import cz.seznam.euphoria.core.client.functional.UnaryPredicate;
 import cz.seznam.euphoria.core.client.graph.DAG;
 import cz.seznam.euphoria.core.client.graph.Node;
 import cz.seznam.euphoria.core.client.io.DataSink;
 import cz.seznam.euphoria.core.client.operator.Operator;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Iterables;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/.../euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/executor/FlowValidator.java b/.../euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/executor/FlowValidator.java
@@ -15,7 +15,6 @@
  */
 package cz.seznam.euphoria.core.executor;
 
-import com.google.common.base.Preconditions;
 import cz.seznam.euphoria.core.client.dataset.Dataset;
 import cz.seznam.euphoria.core.client.dataset.windowing.Batch;
 import cz.seznam.euphoria.core.client.dataset.windowing.Windowing;
@@ -27,6 +26,7 @@
 import cz.seznam.euphoria.core.client.operator.WindowWiseOperator;
 import cz.seznam.euphoria.core.client.operator.WindowingRequiredException;
 import cz.seznam.euphoria.core.client.util.Pair;
+import cz.seznam.euphoria.shaded.guava.com.google.common.base.Preconditions;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...ia/euphoria-core/src/main/java/cz/seznam/euphoria/core/executor/greduce/GroupReducer.java b/...ia/euphoria-core/src/main/java/cz/seznam/euphoria/core/executor/greduce/GroupReducer.java
@@ -15,7 +15,6 @@
  */
 package cz.seznam.euphoria.core.executor.greduce;
 
-import com.google.common.base.Preconditions;
 import cz.seznam.euphoria.core.client.dataset.windowing.MergingWindowing;
 import cz.seznam.euphoria.core.client.dataset.windowing.TimedWindow;
 import cz.seznam.euphoria.core.client.dataset.windowing.Window;
@@ -37,6 +36,7 @@
 import cz.seznam.euphoria.core.client.triggers.Trigger;
 import cz.seznam.euphoria.core.client.triggers.TriggerContext;
 import cz.seznam.euphoria.core.client.util.Pair;
+import cz.seznam.euphoria.shaded.guava.com.google.common.base.Preconditions;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...oria-core/src/test/java/cz/seznam/euphoria/core/client/dataset/windowing/SessionTest.java b/...oria-core/src/test/java/cz/seznam/euphoria/core/client/dataset/windowing/SessionTest.java
@@ -15,15 +15,16 @@
  */
 package cz.seznam.euphoria.core.client.dataset.windowing;
 
-import com.google.common.collect.Iterables;
 import cz.seznam.euphoria.core.client.util.Pair;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Iterables;
 import org.junit.Test;
 
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collection;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class SessionTest {
 

diff --git a/...-core/src/test/java/cz/seznam/euphoria/core/client/dataset/windowing/TimeSlidingTest.java b/...-core/src/test/java/cz/seznam/euphoria/core/client/dataset/windowing/TimeSlidingTest.java
@@ -15,13 +15,13 @@
  */
 package cz.seznam.euphoria.core.client.dataset.windowing;
 
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Iterables;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Sets;
 import org.junit.Test;
 
 import java.time.Duration;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class TimeSlidingTest {
 

diff --git a/...uphoria-core/src/test/java/cz/seznam/euphoria/core/client/dataset/windowing/TimeTest.java b/...uphoria-core/src/test/java/cz/seznam/euphoria/core/client/dataset/windowing/TimeTest.java
@@ -15,12 +15,12 @@
  */
 package cz.seznam.euphoria.core.client.dataset.windowing;
 
-import com.google.common.collect.Iterables;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Iterables;
 import org.junit.Test;
 
 import java.time.Duration;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class TimeTest {
 

diff --git a/...ia-core/src/test/java/cz/seznam/euphoria/core/client/dataset/windowing/WindowingTest.java b/...ia-core/src/test/java/cz/seznam/euphoria/core/client/dataset/windowing/WindowingTest.java
@@ -15,9 +15,9 @@
  */
 package cz.seznam.euphoria.core.client.dataset.windowing;
 
-import com.google.common.collect.Iterables;
 import cz.seznam.euphoria.core.client.functional.UnaryFunction;
 import cz.seznam.euphoria.core.client.util.Pair;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Iterables;
 import org.junit.Test;
 
 import java.time.Duration;

diff --git a/...ns/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/graph/DAGTest.java b/...ns/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/graph/DAGTest.java
@@ -15,7 +15,7 @@
  */
 package cz.seznam.euphoria.core.client.graph;
 
-import com.google.common.collect.Iterables;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Iterables;
 import org.junit.Test;
 
 import java.util.Arrays;

diff --git a/...horia/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/io/ListDataSinkTest.java b/...horia/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/io/ListDataSinkTest.java
@@ -15,10 +15,10 @@
  */
 package cz.seznam.euphoria.core.client.io;
 
-import com.google.common.collect.Iterables;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Iterables;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class ListDataSinkTest {
 

diff --git a/...oria-core/src/test/java/cz/seznam/euphoria/core/client/io/MockBatchDataSourceFactory.java b/...oria-core/src/test/java/cz/seznam/euphoria/core/client/io/MockBatchDataSourceFactory.java
@@ -15,8 +15,8 @@
  */
 package cz.seznam.euphoria.core.client.io;
 
-import com.google.common.collect.Sets;
 import cz.seznam.euphoria.core.util.Settings;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Sets;
 
 import java.io.IOException;
 import java.net.URI;

diff --git a/...ria-core/src/test/java/cz/seznam/euphoria/core/client/io/MockStreamDataSourceFactory.java b/...ria-core/src/test/java/cz/seznam/euphoria/core/client/io/MockStreamDataSourceFactory.java
@@ -15,8 +15,8 @@
  */
 package cz.seznam.euphoria.core.client.io;
 
-import com.google.common.collect.Sets;
 import cz.seznam.euphoria.core.util.Settings;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Sets;
 
 import java.io.IOException;
 import java.net.URI;

diff --git a/...euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/TopPerKeyKeyTest.java b/...euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/TopPerKeyKeyTest.java
@@ -15,13 +15,13 @@
  */
 package cz.seznam.euphoria.core.client.operator;
 
-import com.google.common.collect.Iterables;
 import cz.seznam.euphoria.core.client.dataset.Dataset;
 import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioner;
 import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioning;
 import cz.seznam.euphoria.core.client.dataset.windowing.Time;
 import cz.seznam.euphoria.core.client.flow.Flow;
 import cz.seznam.euphoria.core.client.util.Triple;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Iterables;
 import org.junit.Test;
 
 import java.time.Duration;

diff --git a/...phoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/executor/FlowUnfolderTest.java b/...phoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/executor/FlowUnfolderTest.java
@@ -15,7 +15,6 @@
  */
 package cz.seznam.euphoria.core.executor;
 
-import com.google.common.collect.Sets;
 import cz.seznam.euphoria.core.client.dataset.Dataset;
 import cz.seznam.euphoria.core.client.dataset.windowing.Time;
 import cz.seznam.euphoria.core.client.flow.Flow;
@@ -35,6 +34,7 @@
 import cz.seznam.euphoria.core.client.util.Pair;
 import cz.seznam.euphoria.core.executor.FlowUnfolder.InputOperator;
 import cz.seznam.euphoria.core.util.Settings;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Sets;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/sdks/java/extensions/euphoria/euphoria-examples/pom.xml b/sdks/java/extensions/euphoria/euphoria-examples/pom.xml
@@ -63,23 +63,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>cz.seznam.euphoria</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>euphoria-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>cz.seznam.euphoria</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>euphoria-hadoop</artifactId>
     </dependency>
     <dependency>
-      <groupId>cz.seznam.euphoria</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>euphoria-flink</artifactId>
     </dependency>
     <dependency>
-      <groupId>cz.seznam.euphoria</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>euphoria-spark</artifactId>
     </dependency>
     <dependency>
-      <groupId>cz.seznam.euphoria</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>euphoria-inmem</artifactId>
     </dependency>
 

diff --git a/sdks/java/extensions/euphoria/euphoria-flink/pom.xml b/sdks/java/extensions/euphoria/euphoria-flink/pom.xml
@@ -33,20 +33,14 @@
   </description>
 
   <dependencies>
-
     <dependency>
-      <groupId>cz.seznam.euphoria</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>euphoria-core</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>shaded-guava</artifactId>
     </dependency>
 
     <dependency>

diff --git a/.../euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/ExecutionEnvironment.java b/.../euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/ExecutionEnvironment.java
@@ -15,7 +15,6 @@
  */
 package cz.seznam.euphoria.flink;
 
-import com.google.common.collect.Sets;
 import cz.seznam.euphoria.core.client.dataset.Dataset;
 import cz.seznam.euphoria.core.client.dataset.windowing.Batch;
 import cz.seznam.euphoria.core.client.dataset.windowing.TimeInterval;
@@ -27,6 +26,7 @@
 import cz.seznam.euphoria.flink.batch.BatchElement;
 import cz.seznam.euphoria.flink.streaming.StreamingElement;
 import cz.seznam.euphoria.flink.streaming.windowing.KeyedMultiWindowedElement;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Sets;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.slf4j.Logger;

diff --git a/...sions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/ExecutorContext.java b/...sions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/ExecutorContext.java
@@ -15,11 +15,11 @@
  */
 package cz.seznam.euphoria.flink;
 
-import com.google.common.collect.Iterables;
 import cz.seznam.euphoria.core.client.dataset.Dataset;
 import cz.seznam.euphoria.core.client.graph.DAG;
 import cz.seznam.euphoria.core.client.graph.Node;
 import cz.seznam.euphoria.core.client.operator.SingleInputOperator;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Iterables;
 import org.apache.flink.streaming.api.datastream.DataStream;
 
 import java.util.ArrayList;

diff --git a/...oria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/batch/BatchFlowTranslator.java b/...oria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/batch/BatchFlowTranslator.java
@@ -15,7 +15,7 @@
  */
 package cz.seznam.euphoria.flink.batch;
 
-import com.google.common.base.Preconditions;
+import cz.seznam.euphoria.shaded.guava.com.google.common.base.Preconditions;
 import cz.seznam.euphoria.core.client.flow.Flow;
 import cz.seznam.euphoria.core.client.functional.UnaryPredicate;
 import cz.seznam.euphoria.core.client.graph.DAG;

diff --git a/...ia/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/batch/ReduceByKeyTranslator.java b/...ia/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/batch/ReduceByKeyTranslator.java
@@ -15,8 +15,6 @@
  */
 package cz.seznam.euphoria.flink.batch;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
 import cz.seznam.euphoria.core.client.dataset.windowing.MergingWindowing;
 import cz.seznam.euphoria.core.client.dataset.windowing.TimedWindow;
 import cz.seznam.euphoria.core.client.dataset.windowing.Window;
@@ -28,6 +26,8 @@
 import cz.seznam.euphoria.flink.FlinkOperator;
 import cz.seznam.euphoria.flink.Utils;
 import cz.seznam.euphoria.flink.functions.PartitionerWrapper;
+import cz.seznam.euphoria.shaded.guava.com.google.common.base.Preconditions;
+import cz.seznam.euphoria.shaded.guava.com.google.common.collect.Iterables;
 import org.apache.flink.api.common.functions.ReduceFunction;
 import org.apache.flink.api.common.typeinfo.TypeHint;
 import org.apache.flink.api.java.DataSet;
@@ -37,7 +37,6 @@
 import org.apache.flink.api.java.tuple.Tuple2;
 
 import java.util.Arrays;
-import java.util.Set;
 
 public class ReduceByKeyTranslator implements BatchOperatorTranslator<ReduceByKey> {