Repository: cxf Updated Branches: refs/heads/master f44588951 -> d70027b90
Updating HBase client version Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d70027b9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d70027b9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d70027b9 Branch: refs/heads/master Commit: d70027b90fcda6eceb58389e3bd42704a8bfd10b Parents: f445889 Author: Sergey Beryozkin <[email protected]> Authored: Tue Nov 18 15:16:02 2014 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Nov 18 15:16:02 2014 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 +- .../jaxrs/ext/search/hbase/HBaseVisitorTest.java | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d70027b9/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d798b60..87e2002 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -639,7 +639,7 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-client</artifactId> - <version>0.98.3-hadoop2</version> + <version>0.99.0</version> <exclusions> <exclusion> <groupId>io.netty</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/d70027b9/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java index ca4177d..0fc7855 100644 --- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java +++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java @@ -23,12 +23,11 @@ import org.apache.cxf.jaxrs.ext.search.SearchCondition; import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.client.HConnection; -import org.apache.hadoop.hbase.client.HConnectionManager; -import org.apache.hadoop.hbase.client.HTableInterface; +import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.filter.Filter; import org.junit.After; @@ -41,14 +40,13 @@ public class HBaseVisitorTest extends Assert { public static final byte[] BOOK_FAMILY = "book".getBytes(); public static final byte[] NAME_QUALIFIER = "name".getBytes(); - HConnection connection; - HTableInterface table; + Table table; + @SuppressWarnings("deprecation") @Before public void setUp() throws Exception { try { Configuration hBaseConfig = HBaseConfiguration.create(); - connection = HConnectionManager.createConnection(hBaseConfig); - table = connection.getTable("books"); + table = new HTable(hBaseConfig, "books"); } catch (Throwable t) { t.printStackTrace(); } @@ -83,10 +81,5 @@ public class HBaseVisitorTest extends Assert { if (table != null) { table.close(); } - if (connection != null) { - connection.close(); - } - - } }
