This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new c95a39e HBASE-24115 Relocate test-only REST "client" from src/ to
test/ and mark Private (#1434)
c95a39e is described below
commit c95a39edadc534bdebf271229184c5311069c1d4
Author: Andrew Purtell <[email protected]>
AuthorDate: Mon Apr 6 16:18:40 2020 -0700
HBASE-24115 Relocate test-only REST "client" from src/ to test/ and mark
Private (#1434)
Signed-off-by: Sean Busbey <[email protected]>
Signed-off-by: Zach York <[email protected]>
Signed-off-by: Reid Chan <[email protected]>
Signed-off-by: Viraj Jasani <[email protected]>
Signed-off-by: Josh Elser <[email protected]>
---
.../apache/hadoop/hbase/rest/RESTDemoClient.java | 116 ---------------------
.../hadoop/hbase/rest/client/RemoteAdmin.java | 2 +-
.../hadoop/hbase/rest/client/RemoteHTable.java | 2 +-
3 files changed, 2 insertions(+), 118 deletions(-)
diff --git
a/hbase-examples/src/main/java/org/apache/hadoop/hbase/rest/RESTDemoClient.java
b/hbase-examples/src/main/java/org/apache/hadoop/hbase/rest/RESTDemoClient.java
deleted file mode 100644
index bf3aafa..0000000
---
a/hbase-examples/src/main/java/org/apache/hadoop/hbase/rest/RESTDemoClient.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.rest;
-
-import java.security.PrivilegedExceptionAction;
-
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginContext;
-
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.rest.client.Client;
-import org.apache.hadoop.hbase.rest.client.Cluster;
-import org.apache.hadoop.hbase.rest.client.RemoteHTable;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.ClientUtils;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
-
[email protected]
-public class RESTDemoClient {
-
- private static String host = "localhost";
- private static int port = 9090;
- private static boolean secure = false;
- private static org.apache.hadoop.conf.Configuration conf = null;
-
- public static void main(String[] args) throws Exception {
- System.out.println("REST Demo");
- System.out.println("Usage: RESTDemoClient [host=localhost] [port=9090]
[secure=false]");
- System.out.println("This demo assumes you have a table called \"example\""
- + " with a column family called \"family1\"");
-
- // use passed in arguments instead of defaults
- if (args.length >= 1) {
- host = args[0];
- }
- if (args.length >= 2) {
- port = Integer.parseInt(args[1]);
- }
- conf = HBaseConfiguration.create();
- String principal = conf.get(Constants.REST_KERBEROS_PRINCIPAL);
- if (principal != null) {
- secure = true;
- }
- if (args.length >= 3) {
- secure = Boolean.parseBoolean(args[2]);
- }
-
- final RESTDemoClient client = new RESTDemoClient();
- Subject.doAs(getSubject(), new PrivilegedExceptionAction<Void>() {
- @Override
- public Void run() throws Exception {
- client.run();
- return null;
- }
- });
- }
-
- public void run() throws Exception {
- Cluster cluster = new Cluster();
- cluster.add(host, port);
- Client restClient = new Client(cluster,
conf.getBoolean(Constants.REST_SSL_ENABLED, false));
- try (RemoteHTable remoteTable = new RemoteHTable(restClient, conf,
"example")) {
- // Write data to the table
- String rowKey = "row1";
- Put p = new Put(rowKey.getBytes());
- p.addColumn("family1".getBytes(), "qualifier1".getBytes(),
"value1".getBytes());
- remoteTable.put(p);
-
- // Get the data from the table
- Get g = new Get(rowKey.getBytes());
- Result result = remoteTable.get(g);
-
- Preconditions.checkArgument(result != null,
- Bytes.toString(remoteTable.getTableName()) + " should have a row with
key as " + rowKey);
- System.out.println("row = " + new String(result.getRow()));
- for (Cell cell : result.rawCells()) {
- System.out.print("family = " +
Bytes.toString(CellUtil.cloneFamily(cell)) + "\t");
- System.out.print("qualifier = " +
Bytes.toString(CellUtil.cloneQualifier(cell)) + "\t");
- System.out.print("value = " +
Bytes.toString(CellUtil.cloneValue(cell)) + "\t");
- System.out.println("timestamp = " +
Long.toString(cell.getTimestamp()));
- }
- }
- }
-
- static Subject getSubject() throws Exception {
- if (!secure) {
- return new Subject();
- }
-
- LoginContext context = ClientUtils.getLoginContext();
- context.login();
- return context.getSubject();
- }
-}
diff --git
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java
similarity index 99%
rename from
hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java
rename to
hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java
index 152fe4c..ca1566c 100644
---
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java
+++
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java
@@ -42,7 +42,7 @@ import org.apache.hadoop.hbase.rest.model.TableSchemaModel;
import org.apache.hadoop.hbase.rest.model.VersionModel;
import org.apache.hadoop.hbase.util.Bytes;
[email protected]
[email protected]
public class RemoteAdmin {
final Client client;
diff --git
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
similarity index 99%
rename from
hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
rename to
hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
index 29b48e1..3435217 100644
---
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
+++
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
@@ -82,7 +82,7 @@ import
org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
/**
* HTable interface to remote tables accessed via REST gateway
*/
[email protected]
[email protected]
public class RemoteHTable implements Table {
private static final Logger LOG =
LoggerFactory.getLogger(RemoteHTable.class);
