Fix #170 and #188 by taking @jasonculverhouse 's suggestion and making the

HBaseException#make() method abstract so we enforce it everywhere. Now the
multi-action processing won't throw the AssertionError.

Signed-off-by: Chris Larsen <clarsen@yahoo-inc.com>

Author: manolama

src/ConnectionResetException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012  The Async HBase Authors.  All rights reserved.
+ * Copyright (C) 2010-2018  The Async HBase Authors.  All rights reserved.
  * This file is part of Async HBase.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,12 @@ public final class ConnectionResetException extends RecoverableException {
   public Channel getChannel() {
     return chan;
   }
-
+  
+  @Override
+  ConnectionResetException make(final Object msg, final HBaseRpc rpc) {
+    return new ConnectionResetException(chan);
+  }
+  
   private static final long serialVersionUID = 1280644142;
-
+  
 }

src/HBaseException.java

@@ -55,12 +55,10 @@ public abstract class HBaseException extends RuntimeException {
    * one without having to resort to reflection, which is annoying to use.
    * Sub-classes that want to provide this internal functionality should
    * implement this method.
-   * @param arg Some arbitrary parameter to help build the new instance.
+   * @param msg Some arbitrary parameter to help build the new instance.
    * @param rpc The RPC that failed, if any.  Can be {@code null}.
    */
-  HBaseException make(final Object arg, final HBaseRpc rpc) {
-    throw new AssertionError("Must not be used.");
-  }
+  abstract HBaseException make(final Object msg, final HBaseRpc rpc);
 
   private static final long serialVersionUID = 1280638842;
 

src/HBaseRpc.java

@@ -639,7 +639,7 @@ public void run(final Timeout time_out) throws Exception {
 
       callback(new RpcTimedOutException("RPC ID [" + rpc_id + 
           "] timed out waiting for response from HBase on region client [" + 
-          region_client + " ] for over " + timeout + "ms"));
+          region_client + " ] for over " + timeout + "ms", HBaseRpc.this));
       timeout_task = null;
       timeout_handle = null;
     }

src/NonRecoverableException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012  The Async HBase Authors.  All rights reserved.
+ * Copyright (C) 2010-2018  The Async HBase Authors.  All rights reserved.
  * This file is part of Async HBase.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,20 @@ public class NonRecoverableException extends HBaseException {
     super(msg, cause);
   }
 
+  @Override
+  NonRecoverableException make(final Object msg, final HBaseRpc rpc) {
+    // Don't need to keep the RPC here.
+    if (msg == this || msg instanceof NonRecoverableException) {
+      final NonRecoverableException e = (NonRecoverableException) msg;
+      if (e.getCause() != null) {
+        return new NonRecoverableException(e.getMessage(), e.getCause());
+      } else {
+        return new NonRecoverableException(e.getMessage());
+      }
+    }
+    return new NonRecoverableException(msg.toString());
+  }
+  
   private static final long serialVersionUID = 1280638547;
 
 }

src/RegionOfflineException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012  The Async HBase Authors.  All rights reserved.
+ * Copyright (C) 2010-2018  The Async HBase Authors.  All rights reserved.
  * This file is part of Async HBase.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,11 @@ public byte[] getRegion() {
     return region;
   }
 
+  @Override
+  HBaseException make(final Object msg, final HBaseRpc rpc) {
+    return new RegionOfflineException(region);
+  }
+  
   private static final long serialVersionUID = 1280641842;
 
 }

src/RpcTimedOutException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  The Async HBase Authors.  All rights reserved.
+ * Copyright (C) 2015-2018  The Async HBase Authors.  All rights reserved.
  * This file is part of Async HBase.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,26 +32,53 @@
  */
 public class RpcTimedOutException extends HBaseException {
 
+  /** The RPC that failed */
+  final HBaseRpc failed_rpc;
+  
   /**
    * Constructor.
    * @param msg The message of the exception, potentially including a stack
    * trace.
+   * @param rpc The RPC that timed out.
    */
-  RpcTimedOutException(final String msg) {
+  RpcTimedOutException(final String msg, final HBaseRpc rpc) {
     super(msg);
+    failed_rpc = rpc;
   }
 
   /**
    * Constructor.
    * @param msg The message of the exception, potentially including a stack
    * trace.
    * @param cause The exception that caused this one to be thrown.
+   * @param rpc The RPC that timed out.
    */
-  RpcTimedOutException(final String msg, final Throwable cause) {
+  RpcTimedOutException(final String msg, 
+                       final Throwable cause, 
+                       final HBaseRpc rpc) {
     super(msg, cause);
+    failed_rpc = rpc;
   }
 
+  /** @return The RPC that timed out. */
+  public HBaseRpc getFailedRpc() {
+    return failed_rpc;
+  }
+  
+  @Override
+  RpcTimedOutException make(final Object msg, final HBaseRpc rpc) {
+    if (msg == this || msg instanceof RpcTimedOutException) {
+      final RpcTimedOutException e = (RpcTimedOutException) msg;
+      if (e.getCause() != null) {
+        return new RpcTimedOutException(e.getMessage(), e.getCause(), rpc);
+      } else {
+        return new RpcTimedOutException(e.getMessage(), rpc);
+      }
+    }
+    return new RpcTimedOutException(msg.toString(), rpc);
+  }
+  
   private static final long serialVersionUID = -6245448564580938789L;
-
+  
 }
 

test/TestRegionClientDecode.java

@@ -1531,6 +1531,11 @@ class TestingHBaseException extends HBaseException {
     TestingHBaseException(final String msg) {
       super(msg);
     }
+    
+    @Override
+    TestingHBaseException make(Object msg, HBaseRpc rpc) {
+      return new TestingHBaseException(getMessage());
+    }
   }
 
   /** Creates a new mock client that isn't spied. Necessary for the replay