[09/12] hbase git commit: HBASE-19552 find-and-replace thirdparty offset

2017-12-28 Thread mdrob
http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractPositionedByteRange.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractPositionedByteRange.java
 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractPositionedByteRange.java
index 60144e3..175da02 100644
--- 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractPositionedByteRange.java
+++ 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractPositionedByteRange.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.hbase.util;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.yetus.audience.InterfaceStability;
 
-import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+import 
org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
 
 /**
  * Extends the basic {@link SimpleByteRange} implementation with position

http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java
index aec7a18..2e14b13 100644
--- 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java
+++ 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java
@@ -35,7 +35,7 @@ import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+import 
org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
 
 /**
  * This class manages an array of ByteBuffers with a default size 4MB. These

http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java
index 5e6809f..2246002 100644
--- 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java
+++ 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.io.WritableUtils;
 import org.apache.yetus.audience.InterfaceAudience;
 import sun.nio.ch.DirectBuffer;
 
-import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+import 
org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
 
 /**
  * Utility functions for working with byte buffers, such as reading/writing

http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeUtils.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeUtils.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeUtils.java
index ff6767f..90f3bf3 100644
--- 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeUtils.java
+++ 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeUtils.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 
 import org.apache.yetus.audience.InterfaceAudience;
 
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
+import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
 
 /**
  * Utility methods for working with {@link ByteRange}.

http://git-wip-us.apache.org/repos/asf/hbase/blob/64cb777a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
--
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
index 12e4788..b7912fd 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
@@ -17,9 +17,9 @@
  */
 package org.apache.hadoop.hbase.util;
 
-import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkArgument;
-import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull;
-import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkPositionIndex;
+import static 
org.apache.hbase.thirdparty.com.google.common.base.Preconditions.checkArgument;
+import static 
org.apache.hbase.thirdparty.com.google.common.base.Preconditions.checkNotNull;
+import static 

[09/12] hbase git commit: HBASE-19552 find-and-replace thirdparty offset

2017-12-28 Thread mdrob
http://git-wip-us.apache.org/repos/asf/hbase/blob/c3b4f788/hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java
index de2e482..bdcb8f5 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/PrivateCellUtil.java
@@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.ClassSize;
 import org.apache.yetus.audience.InterfaceAudience;
 
-import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+import 
org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
 
 /**
  * Utility methods helpful slinging {@link Cell} instances. It has more 
powerful and

http://git-wip-us.apache.org/repos/asf/hbase/blob/c3b4f788/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java
index 16842da..468b5d3 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+import 
org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
 
 /**
  * ScheduledChore is a task performed on a period in hbase. ScheduledChores 
become active once

http://git-wip-us.apache.org/repos/asf/hbase/blob/c3b4f788/hbase-common/src/main/java/org/apache/hadoop/hbase/ServerName.java
--
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ServerName.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/ServerName.java
index 10f658c..7a32b44 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ServerName.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ServerName.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.hbase.util.Addressing;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.yetus.audience.InterfaceAudience;
 
-import org.apache.hadoop.hbase.shaded.com.google.common.net.InetAddresses;
+import org.apache.hbase.thirdparty.com.google.common.net.InetAddresses;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/hbase/blob/c3b4f788/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
--
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
index 5a43794..e6cabbc 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
@@ -141,7 +141,7 @@ public final class TableName implements 
Comparable {
 }
 
 int namespaceDelimIndex =
-  
org.apache.hadoop.hbase.shaded.com.google.common.primitives.Bytes.lastIndexOf(tableName,
+  
org.apache.hbase.thirdparty.com.google.common.primitives.Bytes.lastIndexOf(tableName,
 (byte) NAMESPACE_DELIM);
 if (namespaceDelimIndex < 0){
   isLegalTableQualifierName(tableName);
@@ -436,7 +436,7 @@ public final class TableName implements 
Comparable {
 }
 
 int namespaceDelimIndex =
-  
org.apache.hadoop.hbase.shaded.com.google.common.primitives.Bytes.lastIndexOf(fullName,
+  
org.apache.hbase.thirdparty.com.google.common.primitives.Bytes.lastIndexOf(fullName,
 (byte) NAMESPACE_DELIM);
 
 if (namespaceDelimIndex < 0) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/c3b4f788/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferPool.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferPool.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferPool.java
index e699ea9..6c009b3 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferPool.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBufferPool.java
@@ -26,7 +26,7 @@ import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+import