From ac415f85f3dd0ecf01a655f3b72351a4b5c675bd Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Fri, 21 Oct 2016 17:23:07 -0700
Subject: [PATCH] HBASE-16929 Move default method of shipped to Shipper
 interface

---
 .../apache/hadoop/hbase/regionserver/RegionScanner.java  | 9 ---------
 .../org/apache/hadoop/hbase/regionserver/Shipper.java    | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java
index 8d8c051c4ec..fb1fe5d8669 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java
@@ -115,13 +115,4 @@ public interface RegionScanner extends InternalScanner, Shipper {
    */
   boolean nextRaw(List<Cell> result, ScannerContext scannerContext)
       throws IOException;
-
-  /**
-   * Empty implementation to provide compatibility for user migrating from 1.X
-   * @see <a href="https://issues.apache.org/jira/browse/HBASE-16626">HBASE-16626</a>
-   */
-  @Override
-  default void shipped() throws IOException {
-    // do nothing
-  }
 }
\ No newline at end of file
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Shipper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Shipper.java
index fb66f51f62e..8fa393b1864 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Shipper.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Shipper.java
@@ -33,5 +33,5 @@ public interface Shipper {
    * Called after a batch of rows scanned and set to be returned to client. Any in between cleanup
    * can be done here.
    */
-  void shipped() throws IOException;
+  default void shipped() throws IOException { }
 }