Throw IllegalArgumentException when trying to delete a row with an empty row key.
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/0ca1fd2f Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/0ca1fd2f Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/0ca1fd2f Branch: refs/heads/master Commit: 0ca1fd2fa8d8cc7b2e9cdad20485ece626f44a0c Parents: 146277c Author: Arjan Seijkens <[email protected]> Authored: Wed Jun 13 14:49:15 2018 +0200 Committer: Arjan Seijkens <[email protected]> Committed: Wed Jun 13 14:49:15 2018 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/metamodel/hbase/HBaseClient.java | 2 +- .../test/java/org/apache/metamodel/hbase/DeleteRowTest.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/0ca1fd2f/hbase/src/main/java/org/apache/metamodel/hbase/HBaseClient.java ---------------------------------------------------------------------- diff --git a/hbase/src/main/java/org/apache/metamodel/hbase/HBaseClient.java b/hbase/src/main/java/org/apache/metamodel/hbase/HBaseClient.java index a868a93..0594a5b 100644 --- a/hbase/src/main/java/org/apache/metamodel/hbase/HBaseClient.java +++ b/hbase/src/main/java/org/apache/metamodel/hbase/HBaseClient.java @@ -118,7 +118,7 @@ final class HBaseClient { throw new MetaModelException(e); } } else { - logger.info("Have not deleted a row, which has an empty (\"\") rowKey."); + throw new IllegalArgumentException("Can't delete a row without an empty rowKey."); } } http://git-wip-us.apache.org/repos/asf/metamodel/blob/0ca1fd2f/hbase/src/test/java/org/apache/metamodel/hbase/DeleteRowTest.java ---------------------------------------------------------------------- diff --git a/hbase/src/test/java/org/apache/metamodel/hbase/DeleteRowTest.java b/hbase/src/test/java/org/apache/metamodel/hbase/DeleteRowTest.java index 2eefb06..4e588ca 100644 --- a/hbase/src/test/java/org/apache/metamodel/hbase/DeleteRowTest.java +++ b/hbase/src/test/java/org/apache/metamodel/hbase/DeleteRowTest.java @@ -103,7 +103,7 @@ public class DeleteRowTest extends HBaseUpdateCallbackTest { } /** - * Goodflow. Deleting a row, which has an empty rowKey value, should not throw an exception + * Deleting a row, which has an empty rowKey value, should throw an exception * * @throws IOException */ @@ -115,9 +115,12 @@ public class DeleteRowTest extends HBaseUpdateCallbackTest { checkRows(false, false); final HBaseRowDeletionBuilder rowDeletionBuilder = (HBaseRowDeletionBuilder) getUpdateCallback().deleteFrom( existingTable); + + exception.expect(IllegalArgumentException.class); + exception.expectMessage("Can't delete a row without an empty rowKey."); + rowDeletionBuilder.where(HBaseDataContext.FIELD_ID).eq(""); rowDeletionBuilder.execute(); - checkRows(false, false); } /**
