From 6c8e71367141628445b4cc843ad60afdfb5bb7c7 Mon Sep 17 00:00:00 2001
From: Jim Kellerman <jimk@apache.org>
Date: Wed, 15 Aug 2007 18:20:53 +0000
Subject: [PATCH] HADOOP-1711 HTable API should use interfaces instead of
 concrete classes as method parameters and return values

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@566291 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                             | 3 ++-
 src/java/org/apache/hadoop/hbase/HAbstractScanner.java  | 2 +-
 src/java/org/apache/hadoop/hbase/HScannerInterface.java | 8 ++++----
 src/java/org/apache/hadoop/hbase/HTable.java            | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4841931f912..792189871e8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -93,4 +93,5 @@ Trunk (unreleased changes)
      serve daughter splits. Phase 2: Master assigns children of split region
      instead of HRegionServer serving both children.
  58. HADOOP-1710 All updates should be batch updates
-
+ 59. HADOOP-1711 HTable API should use interfaces instead of concrete classes as
+     method parameters and return values
diff --git a/src/java/org/apache/hadoop/hbase/HAbstractScanner.java b/src/java/org/apache/hadoop/hbase/HAbstractScanner.java
index b7c2eb2849e..885e925cecc 100644
--- a/src/java/org/apache/hadoop/hbase/HAbstractScanner.java
+++ b/src/java/org/apache/hadoop/hbase/HAbstractScanner.java
@@ -206,7 +206,7 @@ public abstract class HAbstractScanner implements HInternalScannerInterface {
    * @return true if a match was found
    * @throws IOException
    * 
-   * @see org.apache.hadoop.hbase.HScannerInterface#next(org.apache.hadoop.hbase.HStoreKey, java.util.TreeMap)
+   * @see org.apache.hadoop.hbase.HScannerInterface#next(org.apache.hadoop.hbase.HStoreKey, java.util.SortedMap)
    */
   public boolean next(HStoreKey key, TreeMap<Text, byte []> results)
   throws IOException {
diff --git a/src/java/org/apache/hadoop/hbase/HScannerInterface.java b/src/java/org/apache/hadoop/hbase/HScannerInterface.java
index bc9865cc37c..2a0f9b499ce 100644
--- a/src/java/org/apache/hadoop/hbase/HScannerInterface.java
+++ b/src/java/org/apache/hadoop/hbase/HScannerInterface.java
@@ -19,10 +19,10 @@
  */
 package org.apache.hadoop.hbase;
 
-import org.apache.hadoop.io.*;
+import org.apache.hadoop.io.Text;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.SortedMap;
 
 /**
  * HScannerInterface iterates through a set of rows.  It's implemented by
@@ -36,7 +36,7 @@ public interface HScannerInterface {
    * @return true if data was returned
    * @throws IOException
    */
-  public boolean next(HStoreKey key, TreeMap<Text, byte[]> results)
+  public boolean next(HStoreKey key, SortedMap<Text, byte[]> results)
   throws IOException;
   
   /**
diff --git a/src/java/org/apache/hadoop/hbase/HTable.java b/src/java/org/apache/hadoop/hbase/HTable.java
index c999e4dad97..8d6bcc3c5d2 100644
--- a/src/java/org/apache/hadoop/hbase/HTable.java
+++ b/src/java/org/apache/hadoop/hbase/HTable.java
@@ -727,7 +727,7 @@ public class HTable implements HConstants {
     /**
      * {@inheritDoc}
      */
-    public boolean next(HStoreKey key, TreeMap<Text, byte[]> results) throws IOException {
+    public boolean next(HStoreKey key, SortedMap<Text, byte[]> results) throws IOException {
       checkClosed();
       if (this.closed) {
         return false;