[1/2] hbase git commit: HBASE-18950 Remove Optional parameters in AsyncAdmin interface
Repository: hbase
Updated Branches:
refs/heads/branch-2 061a73db6 -> 47c614c70
http://git-wip-us.apache.org/repos/asf/hbase/blob/47c614c7/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
index c3c4045..83ba244 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
@@ -21,10 +21,8 @@ import static
org.apache.hadoop.hbase.client.AsyncProcess.START_LOG_ERRORS_AFTER
import java.util.Arrays;
import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import java.util.regex.Pattern;
@@ -41,8 +39,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
@@ -106,7 +102,7 @@ public abstract class TestAsyncAdminBase {
@After
public void tearDown() throws Exception {
-
admin.listTableNames(Optional.of(Pattern.compile(tableName.getNameAsString() +
".*")), false)
+admin.listTableNames(Pattern.compile(tableName.getNameAsString() + ".*"),
false)
.whenCompleteAsync((tables, err) -> {
if (tables != null) {
tables.forEach(table -> {
@@ -122,19 +118,21 @@ public abstract class TestAsyncAdminBase {
}
protected void createTableWithDefaultConf(TableName tableName) {
-createTableWithDefaultConf(tableName, Optional.empty());
+createTableWithDefaultConf(tableName, null);
}
- protected void createTableWithDefaultConf(TableName tableName,
Optional splitKeys) {
+ protected void createTableWithDefaultConf(TableName tableName, byte[][]
splitKeys) {
createTableWithDefaultConf(tableName, splitKeys, FAMILY);
}
- protected void createTableWithDefaultConf(TableName tableName,
Optional splitKeys,
+ protected void createTableWithDefaultConf(TableName tableName, byte[][]
splitKeys,
byte[]... families) {
TableDescriptorBuilder builder =
TableDescriptorBuilder.newBuilder(tableName);
for (byte[] family : families) {
builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(family));
}
-admin.createTable(builder.build(), splitKeys).join();
+CompletableFuture future = splitKeys == null ?
admin.createTable(builder.build())
+: admin.createTable(builder.build(), splitKeys);
+future.join();
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/47c614c7/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
index 53de2b5..e7c439b 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
@@ -31,7 +31,6 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ClusterStatus;
@@ -254,7 +253,7 @@ public class TestAsyncClusterAdminApi extends
TestAsyncAdminBase {
List tableRegions = admin.getTableRegions(table).get();
List regionLoads = Lists.newArrayList();
for (ServerName serverName : servers) {
-regionLoads.addAll(admin.getRegionLoads(serverName,
Optional.of(table)).get());
+regionLoads.addAll(admin.getRegionLoads(serverName, table).get());
}
checkRegionsAndRegionLoads(tableRegions, regionLoads);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/47c614c7/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
index 262cac6..1ee1b94 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
+++
[1/2] hbase git commit: HBASE-18950 Remove Optional parameters in AsyncAdmin interface
Repository: hbase
Updated Branches:
refs/heads/master bc3f3ee3b -> 888f2335c
http://git-wip-us.apache.org/repos/asf/hbase/blob/888f2335/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
index c3c4045..83ba244 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
@@ -21,10 +21,8 @@ import static
org.apache.hadoop.hbase.client.AsyncProcess.START_LOG_ERRORS_AFTER
import java.util.Arrays;
import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import java.util.regex.Pattern;
@@ -41,8 +39,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
@@ -106,7 +102,7 @@ public abstract class TestAsyncAdminBase {
@After
public void tearDown() throws Exception {
-
admin.listTableNames(Optional.of(Pattern.compile(tableName.getNameAsString() +
".*")), false)
+admin.listTableNames(Pattern.compile(tableName.getNameAsString() + ".*"),
false)
.whenCompleteAsync((tables, err) -> {
if (tables != null) {
tables.forEach(table -> {
@@ -122,19 +118,21 @@ public abstract class TestAsyncAdminBase {
}
protected void createTableWithDefaultConf(TableName tableName) {
-createTableWithDefaultConf(tableName, Optional.empty());
+createTableWithDefaultConf(tableName, null);
}
- protected void createTableWithDefaultConf(TableName tableName,
Optional splitKeys) {
+ protected void createTableWithDefaultConf(TableName tableName, byte[][]
splitKeys) {
createTableWithDefaultConf(tableName, splitKeys, FAMILY);
}
- protected void createTableWithDefaultConf(TableName tableName,
Optional splitKeys,
+ protected void createTableWithDefaultConf(TableName tableName, byte[][]
splitKeys,
byte[]... families) {
TableDescriptorBuilder builder =
TableDescriptorBuilder.newBuilder(tableName);
for (byte[] family : families) {
builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(family));
}
-admin.createTable(builder.build(), splitKeys).join();
+CompletableFuture future = splitKeys == null ?
admin.createTable(builder.build())
+: admin.createTable(builder.build(), splitKeys);
+future.join();
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/888f2335/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
index 53de2b5..e7c439b 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
@@ -31,7 +31,6 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ClusterStatus;
@@ -254,7 +253,7 @@ public class TestAsyncClusterAdminApi extends
TestAsyncAdminBase {
List tableRegions = admin.getTableRegions(table).get();
List regionLoads = Lists.newArrayList();
for (ServerName serverName : servers) {
-regionLoads.addAll(admin.getRegionLoads(serverName,
Optional.of(table)).get());
+regionLoads.addAll(admin.getRegionLoads(serverName, table).get());
}
checkRegionsAndRegionLoads(tableRegions, regionLoads);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/888f2335/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
index 262cac6..1ee1b94 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
+++
