[#noissue] Remove hbase shaded package

techblue · Apr 9, 2020 · b21546c · b21546c
1 parent c984760
commit b21546c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...tor/src/test/java/com/navercorp/pinpoint/collector/receiver/AddressFilterAdaptorTest.java b/...tor/src/test/java/com/navercorp/pinpoint/collector/receiver/AddressFilterAdaptorTest.java
@@ -19,7 +19,7 @@
 import com.navercorp.pinpoint.collector.receiver.thrift.AddressFilterAdaptor;
 import com.navercorp.pinpoint.common.server.util.AddressFilter;
 import com.navercorp.pinpoint.common.server.util.IgnoreAddressFilter;
-import org.apache.hadoop.hbase.shaded.com.google.common.net.InetAddresses;
+import com.google.common.net.InetAddresses;
 import org.jboss.netty.channel.Channel;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/...r/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/UDPReceiverTest.java b/...r/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/UDPReceiverTest.java
@@ -21,14 +21,15 @@
 import com.navercorp.pinpoint.collector.util.DefaultObjectPool;
 import com.navercorp.pinpoint.collector.util.ObjectPool;
 import com.navercorp.pinpoint.collector.util.ObjectPoolFactory;
-import org.apache.hadoop.hbase.shaded.org.apache.commons.io.IOUtils;
+import com.navercorp.pinpoint.common.util.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.SocketUtils;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
@@ -160,9 +161,7 @@ boolean validatePacket(DatagramPacket packet) {
             if (receiver != null) {
                 receiver.shutdown();
             }
-            IOUtils.closeQuietly(datagramSocket);
-
-
+            IOUtils.closeQuietly((Closeable) datagramSocket);
         }
     }
 

diff --git a/...hema/src/main/java/com/navercorp/pinpoint/hbase/schema/reader/core/CreateTableChange.java b/...hema/src/main/java/com/navercorp/pinpoint/hbase/schema/reader/core/CreateTableChange.java
@@ -16,7 +16,6 @@
 
 package com.navercorp.pinpoint.hbase.schema.reader.core;
 
-import org.apache.hadoop.hbase.shaded.org.apache.commons.lang.ArrayUtils;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.springframework.util.CollectionUtils;
 
@@ -28,6 +27,8 @@
  * @author HyunGil Jeong
  */
 public class CreateTableChange extends TableChange {
+    private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+
     private final SplitOption splitOption;
 
     public CreateTableChange(
@@ -100,7 +101,7 @@ public String toString() {
         // https://github.com/apache/hbase/blob/master/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java
         public class Auto implements SplitOption {
             private static final byte xFF = (byte) 0xFF;
-            private static final byte[] FIRST_ROW_BYTES = ArrayUtils.EMPTY_BYTE_ARRAY;
+            private static final byte[] FIRST_ROW_BYTES = EMPTY_BYTE_ARRAY;
             private static final byte[] LAST_ROW_BYTES = new byte[]{xFF, xFF, xFF, xFF, xFF, xFF, xFF, xFF};
 
             private final int numRegions;

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ActiveTraceChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ActiveTraceChart.java
@@ -23,7 +23,7 @@
 import com.navercorp.pinpoint.web.vo.stat.SampledActiveTrace;
 import com.navercorp.pinpoint.web.vo.stat.chart.StatChart;
 import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup;
-import org.apache.hadoop.hbase.shaded.com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap;
 
 import java.util.List;
 import java.util.Map;