Changed package structure of shaded guava classes

jacobfi · jacobfi · commit 485b44991869 · 2019-12-16T13:21:53.000+01:00
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ organization := "com.audienceproject"
 
 name := "spark-dynamodb"
 
-version := "1.0.1"
+version := "1.0.2"
 
 description := "Plug-and-play implementation of an Apache Spark custom data source for AWS DynamoDB."
 
diff --git a/src/main/java/com/audienceproject/shaded/google/common/base/Preconditions.java b/src/main/java/com/audienceproject/shaded/google/common/base/Preconditions.java
@@ -1,4 +1,4 @@
-package com.audienceproject.com.google.common.base;
+package com.audienceproject.shaded.google.common.base;
 
 /*
  * Notice:
diff --git a/src/main/java/com/audienceproject/shaded/google/common/base/Ticker.java b/src/main/java/com/audienceproject/shaded/google/common/base/Ticker.java
@@ -1,4 +1,4 @@
-package com.audienceproject.com.google.common.base;
+package com.audienceproject.shaded.google.common.base;
 
 /*
  * Notice:
diff --git a/src/main/java/com/audienceproject/shaded/google/common/util/concurrent/RateLimiter.java b/src/main/java/com/audienceproject/shaded/google/common/util/concurrent/RateLimiter.java
@@ -1,4 +1,4 @@
-package com.audienceproject.com.google.common.util.concurrent;
+package com.audienceproject.shaded.google.common.util.concurrent;
 
 /*
  * Notice:
@@ -21,8 +21,8 @@
  * limitations under the License.
  */
 
-import com.audienceproject.com.google.common.base.Preconditions;
-import com.audienceproject.com.google.common.base.Ticker;
+import com.audienceproject.shaded.google.common.base.Preconditions;
+import com.audienceproject.shaded.google.common.base.Ticker;
 
 import javax.annotation.concurrent.ThreadSafe;
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/audienceproject/shaded/google/common/util/concurrent/Uninterruptibles.java b/src/main/java/com/audienceproject/shaded/google/common/util/concurrent/Uninterruptibles.java
@@ -1,4 +1,4 @@
-package com.audienceproject.com.google.common.util.concurrent;
+package com.audienceproject.shaded.google.common.util.concurrent;
 
 /*
  * Notice:
@@ -21,7 +21,7 @@
  * limitations under the License.
  */
 
-import com.audienceproject.com.google.common.base.Preconditions;
+import com.audienceproject.shaded.google.common.base.Preconditions;
 
 import java.util.concurrent.*;
 
diff --git a/src/main/scala/com/audienceproject/spark/dynamodb/connector/DynamoWritable.scala b/src/main/scala/com/audienceproject/spark/dynamodb/connector/DynamoWritable.scala
@@ -21,7 +21,7 @@
 package com.audienceproject.spark.dynamodb.connector
 
 import com.amazonaws.services.dynamodbv2.document.DynamoDB
-import com.audienceproject.com.google.common.util.concurrent.RateLimiter
+import com.audienceproject.shaded.google.common.util.concurrent.RateLimiter
 import org.apache.spark.sql.catalyst.InternalRow
 
 private[dynamodb] trait DynamoWritable {
diff --git a/src/main/scala/com/audienceproject/spark/dynamodb/connector/TableConnector.scala b/src/main/scala/com/audienceproject/spark/dynamodb/connector/TableConnector.scala
@@ -24,7 +24,7 @@ import com.amazonaws.services.dynamodbv2.document._
 import com.amazonaws.services.dynamodbv2.document.spec.{BatchWriteItemSpec, ScanSpec, UpdateItemSpec}
 import com.amazonaws.services.dynamodbv2.model.ReturnConsumedCapacity
 import com.amazonaws.services.dynamodbv2.xspec.ExpressionSpecBuilder
-import com.audienceproject.com.google.common.util.concurrent.RateLimiter
+import com.audienceproject.shaded.google.common.util.concurrent.RateLimiter
 import com.audienceproject.spark.dynamodb.catalyst.JavaConverter
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.sources.Filter
diff --git a/src/main/scala/com/audienceproject/spark/dynamodb/datasource/DynamoBatchWriter.scala b/src/main/scala/com/audienceproject/spark/dynamodb/datasource/DynamoBatchWriter.scala
@@ -21,7 +21,7 @@
 package com.audienceproject.spark.dynamodb.datasource
 
 import com.amazonaws.services.dynamodbv2.document.DynamoDB
-import com.audienceproject.com.google.common.util.concurrent.RateLimiter
+import com.audienceproject.shaded.google.common.util.concurrent.RateLimiter
 import com.audienceproject.spark.dynamodb.connector.{ColumnSchema, TableConnector}
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.sources.v2.writer.{DataWriter, WriterCommitMessage}
diff --git a/src/main/scala/com/audienceproject/spark/dynamodb/datasource/DynamoUpdateWriter.scala b/src/main/scala/com/audienceproject/spark/dynamodb/datasource/DynamoUpdateWriter.scala
@@ -21,7 +21,7 @@
 package com.audienceproject.spark.dynamodb.datasource
 
 import com.amazonaws.services.dynamodbv2.document.DynamoDB
-import com.audienceproject.com.google.common.util.concurrent.RateLimiter
+import com.audienceproject.shaded.google.common.util.concurrent.RateLimiter
 import com.audienceproject.spark.dynamodb.connector.{ColumnSchema, TableConnector}
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.sources.v2.writer.{DataWriter, WriterCommitMessage}
diff --git a/src/main/scala/com/audienceproject/spark/dynamodb/datasource/ScanPartition.scala b/src/main/scala/com/audienceproject/spark/dynamodb/datasource/ScanPartition.scala
@@ -21,7 +21,7 @@
 package com.audienceproject.spark.dynamodb.datasource
 
 import com.amazonaws.services.dynamodbv2.document.Item
-import com.audienceproject.com.google.common.util.concurrent.RateLimiter
+import com.audienceproject.shaded.google.common.util.concurrent.RateLimiter
 import com.audienceproject.spark.dynamodb.connector.DynamoConnector
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.sources.Filter

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.audienceproject.com.google.common.base;`
	`1`	`+package com.audienceproject.shaded.google.common.base;`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`* Notice:`