[gora] branch master updated: Remove deprecated API calls from HbaseStore and HBaseStoreMetadataAnalyzer classes

[dj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

djkevincr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gora.git


The following commit(s) were added to refs/heads/master by this push:
     new 7b80edb  Remove deprecated API calls from HbaseStore and HBaseStoreMetadataAnalyzer classes
     new deb08b0  Merge pull request #159 from sneceesay77/master
7b80edb is described below

commit 7b80edbfe28a488e1bbbe69741ff9f8432a676b8
Author: sc306 <Sheriffo Ceesay>
AuthorDate: Sat Apr 6 23:21:26 2019 +0100

    Remove deprecated API calls from HbaseStore and HBaseStoreMetadataAnalyzer classes
---
 .../src/main/java/org/apache/gora/hbase/store/HBaseStore.java       | 2 +-
 .../org/apache/gora/hbase/store/HBaseStoreMetadataAnalyzer.java     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
index f474c4c..46872ff 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
@@ -626,7 +626,7 @@ public class HBaseStore<K, T extends PersistentBase> extends DataStoreBase<K, T>
   private void addTimeRange(Get get, Query<K, T> query) throws IOException {
     if(query.getStartTime() > 0 || query.getEndTime() > 0) {
       if(query.getStartTime() == query.getEndTime()) {
-        get.setTimeStamp(query.getStartTime());
+        get.setTimestamp(query.getStartTime());
       } else {
         long startTime = query.getStartTime() > 0 ? query.getStartTime() : 0;
         long endTime = query.getEndTime() > 0 ? query.getEndTime() : Long.MAX_VALUE;
diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStoreMetadataAnalyzer.java b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStoreMetadataAnalyzer.java
index 29cb405..398029c 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStoreMetadataAnalyzer.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStoreMetadataAnalyzer.java
@@ -24,11 +24,13 @@ import java.util.stream.Collectors;
 
 import org.apache.gora.store.impl.DataStoreMetadataAnalyzer;
 import org.apache.gora.util.GoraException;
-import org.apache.hadoop.hbase.HTableDescriptor;
+
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.Connection;
 import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.apache.hadoop.hbase.client.TableDescriptor;
+
 
 public class HBaseStoreMetadataAnalyzer extends DataStoreMetadataAnalyzer {
 
@@ -66,7 +68,7 @@ public class HBaseStoreMetadataAnalyzer extends DataStoreMetadataAnalyzer {
         try {
             Admin hbaseAdmin = this.hbaseConnection.getAdmin();
             TableName hbaseTableName =  TableName.valueOf(tableName);
-            HTableDescriptor tableDescriptor = hbaseAdmin.getTableDescriptor(hbaseTableName) ;
+            TableDescriptor tableDescriptor = hbaseAdmin.getDescriptor(hbaseTableName);
             HBaseTableMetadata tableMetadata = new HBaseTableMetadata() ;
             tableMetadata.getColumnFamilies().addAll(Arrays.stream(tableDescriptor.getColumnFamilies()).map(hcolumn -> hcolumn.getNameAsString()).collect(Collectors.toList())) ;
             hbaseAdmin.close();