Skip to content

PHOENIX-6234 - Replace Guava with phoenix-thirdparty version in 4.x#1317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gjacoby126 merged 2 commits into from
Sep 21, 2021
Merged

PHOENIX-6234 - Replace Guava with phoenix-thirdparty version in 4.x #1317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43c6c46
PHOENIX-6234 - Replace Guava with phoenix-thirdparty version in 4.x
gjacoby126 Sep 20, 2021
acad2c5
PHOENIX-6234 - Replace Guava with phoenix-thirdparty version in 4.x
gjacoby126 Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 2 additions & 11 deletions phoenix-core/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -288,28 +288,19 @@
</dependency>
<dependency>
<groupId>org.apache.tephra</groupId>
<artifactId>tephra-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tephra</groupId>
<artifactId>tephra-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
<artifactId>tephra-core-shaded</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tephra</groupId>
<artifactId>tephra-hbase-compat-${tephra.hbase.compat.version}</artifactId>
<classifier>shaded</classifier>
</dependency>

<!-- Make sure we have all the antlr dependencies -->
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ...ore/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,8 +73,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Multimap;

@Category(NeedsOwnMiniClusterTest.class)
public class WALRecoveryRegionPostOpenIT extends BaseTest {
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/Sandbox.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
*/
package org.apache.phoenix;

import com.google.common.collect.ImmutableMap;
import org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;

import com.google.common.base.Objects;
import org.apache.phoenix.thirdparty.com.google.common.base.Objects;

public class AlterMultiTenantTableWithViewsIT extends SplitSystemCatalogIT {

Expand Down
4 changes: 2 additions & 2 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,8 @@
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;

import com.google.common.base.Function;
import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.base.Function;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;

@RunWith(Parameterized.class)
public class AlterTableWithViewsIT extends SplitSystemCatalogIT {
Expand Down
4 changes: 2 additions & 2 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,8 @@
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;

import com.google.common.primitives.Doubles;
import com.google.common.primitives.Floats;
import org.apache.phoenix.thirdparty.com.google.common.primitives.Doubles;
import org.apache.phoenix.thirdparty.com.google.common.primitives.Floats;


public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/Array1IT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;

import com.google.common.primitives.Floats;
import org.apache.phoenix.thirdparty.com.google.common.primitives.Floats;

public class Array1IT extends ArrayIT {
private void assertArrayGetString(ResultSet rs, int arrayIndex, Array expectedArray, String expectedString)
Expand Down
2 changes: 1 addition & 1 deletion ...re/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityForSplittableSyscatIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
package org.apache.phoenix.end2end;


import com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;

import org.apache.phoenix.end2end.BackwardCompatibilityTestUtil.MavenCoordinates;
import org.apache.phoenix.util.PhoenixRuntime;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@
import java.util.List;
import java.util.Properties;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.compile.ExplainPlan;
import org.apache.phoenix.compile.ExplainPlanAttributes;
import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOrderByIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@
import java.sql.SQLException;
import java.util.Properties;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.compile.ExplainPlan;
import org.apache.phoenix.compile.ExplainPlanAttributes;
import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
Expand Down
4 changes: 2 additions & 2 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,8 @@
*/
package org.apache.phoenix.end2end;

import com.google.common.base.Joiner;
import com.google.common.base.Throwables;
import org.apache.phoenix.thirdparty.com.google.common.base.Joiner;
import org.apache.phoenix.thirdparty.com.google.common.base.Throwables;
import com.google.protobuf.RpcCallback;
import com.google.protobuf.RpcController;
import org.apache.hadoop.conf.Configuration;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@
import java.util.List;
import java.util.Properties;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Expand Down
4 changes: 2 additions & 2 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
*/
package org.apache.phoenix.end2end;

import static com.google.common.collect.Sets.newHashSet;
import static org.apache.phoenix.thirdparty.com.google.common.collect.Sets.newHashSet;
import static org.junit.Assert.assertEquals;

import java.sql.Connection;
Expand All@@ -36,7 +36,7 @@
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.SchemaUtil;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;

public class BaseTenantSpecificViewIndexIT extends SplitSystemCatalogIT {

Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
import java.util.Collections;
import java.util.Properties;

import com.google.common.collect.ImmutableList;
import org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableList;
import org.apache.commons.csv.CSVParser;
import org.apache.commons.csv.CSVRecord;
import org.apache.commons.io.FileUtils;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;

@RunWith(Parameterized.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
Expand Down
4 changes: 2 additions & 2 deletions ...ix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,8 @@

package org.apache.phoenix.end2end;

import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap;
import org.apache.phoenix.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.hadoop.hbase.regionserver.ScanInfoUtil;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.common.collect.Sets;
import org.apache.phoenix.thirdparty.com.google.common.collect.Sets;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/CostBasedDecisionIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@
import org.junit.BeforeClass;
import org.junit.Test;

import com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;

public class CostBasedDecisionIT extends BaseUniqueNamesOwnClusterIT {
private final String testTable500;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@
import org.junit.BeforeClass;
import org.junit.Test;

import com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;


public class CountDistinctCompressionIT extends BaseUniqueNamesOwnClusterIT {
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
import java.sql.Statement;
import java.util.Map;

import com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/DateArithmeticIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;

public class DateArithmeticIT extends ParallelStatsDisabledIT {

Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;


@RunWith(Parameterized.class)
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/DropSchemaIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;

import com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;

@RunWith(Parameterized.class)
public class DropSchemaIT extends BaseUniqueNamesOwnClusterIT {
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/DropTableWithViewsIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@
import java.util.Collections;
import java.util.Map;

import com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnWildcardIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
import static org.apache.phoenix.schema.PTable.ImmutableStorageScheme.ONE_CELL_PER_COLUMN;
import static org.junit.Assert.assertEquals;

import com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.schema.PTable.ImmutableStorageScheme;
import org.apache.phoenix.util.ReadOnlyProps;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/EmptyColumnIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@
import org.junit.Ignore;
import org.junit.Test;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;

public class EncodeFunctionIT extends ParallelStatsDisabledIT {

Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsDisabledIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@
import org.apache.phoenix.end2end.ExplainPlanWithStatsEnabledIT.Estimate;
import org.junit.Test;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;

/**
* This class has tests for asserting the bytes and rows information exposed in the explain plan
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsEnabledIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@
import org.junit.BeforeClass;
import org.junit.Test;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;

/**
* This class has tests for asserting the bytes and rows information exposed in the explain plan
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/GlobalConnectionTenantTableIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@
import org.junit.BeforeClass;
import org.junit.Test;

import com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;

public class GlobalConnectionTenantTableIT extends BaseTest {

Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;


@RunWith(Parameterized.class)
Expand Down
6 changes: 3 additions & 3 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,9 +35,9 @@
import java.util.List;
import java.util.Properties;

import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.base.Function;
import org.apache.phoenix.thirdparty.com.google.common.base.Joiner;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.compile.ExplainPlan;
import org.apache.phoenix.compile.ExplainPlanAttributes;
import org.apache.phoenix.compile.QueryPlan;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexBuildTimestampIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;

@RunWith(Parameterized.class)
public class IndexBuildTimestampIT extends BaseUniqueNamesOwnClusterIT {
Expand Down
4 changes: 2 additions & 2 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,8 +57,8 @@
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;

import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexRepairRegionScannerIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
*/
package org.apache.phoenix.end2end;

import com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.TableName;
Expand Down
4 changes: 2 additions & 2 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolBaseIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@
*/
package org.apache.phoenix.end2end;

import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.mapreduce.Counters;
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolForTenantIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
*/
package org.apache.phoenix.end2end;

import com.google.common.base.Joiner;
import org.apache.phoenix.thirdparty.com.google.common.base.Joiner;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.mapreduce.Counters;
Expand Down
4 changes: 2 additions & 2 deletions phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;

import com.google.common.collect.Sets;
import org.apache.phoenix.thirdparty.com.google.common.collect.Sets;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileStatus;
Expand DownExpand Up@@ -69,7 +69,7 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;

import com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Loading