hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject hbase git commit: HBASE-13422 remove use of StandardCharsets in 0.98
Date Wed, 08 Apr 2015 15:32:43 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 11fc5d65c -> 1dd4a8d96


HBASE-13422 remove use of StandardCharsets in 0.98


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1dd4a8d9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1dd4a8d9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1dd4a8d9

Branch: refs/heads/0.98
Commit: 1dd4a8d96e62dddd58d6181bd786effacccd224f
Parents: 11fc5d6
Author: Sean Busbey <busbey@apache.org>
Authored: Wed Apr 8 02:08:42 2015 -0500
Committer: Sean Busbey <busbey@apache.org>
Committed: Wed Apr 8 02:08:42 2015 -0500

----------------------------------------------------------------------
 .../hadoop/hbase/client/TestClientSmallReversedScanner.java   | 7 +++----
 .../apache/hadoop/hbase/client/TestClientSmallScanner.java    | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/1dd4a8d9/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientSmallReversedScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientSmallReversedScanner.java
b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientSmallReversedScanner.java
index 2cbe7ba..84932d0 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientSmallReversedScanner.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientSmallReversedScanner.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -186,7 +185,7 @@ public class TestClientSmallReversedScanner {
       for (int i = 3; i >= 1 && iter.hasNext(); i--) {
         Result result = iter.next();
         byte[] row = result.getRow();
-        assertEquals("row" + i, new String(row, StandardCharsets.UTF_8));
+        assertEquals("row" + i, new String(row, "UTF-8"));
         assertEquals(1, result.getMap().size());
       }
       assertTrue(csrs.closed);
@@ -263,7 +262,7 @@ public class TestClientSmallReversedScanner {
       for (int i = 3; i >= 2 && iter.hasNext(); i--) {
         Result result = iter.next();
         byte[] row = result.getRow();
-        assertEquals("row" + i, new String(row, StandardCharsets.UTF_8));
+        assertEquals("row" + i, new String(row, "UTF-8"));
         assertEquals(1, result.getMap().size());
       }
 
@@ -274,7 +273,7 @@ public class TestClientSmallReversedScanner {
 
       assertEquals(1, results.size());
       Result result = results.get(0);
-      assertEquals("row1", new String(result.getRow(), StandardCharsets.UTF_8));
+      assertEquals("row1", new String(result.getRow(), "UTF-8"));
       assertEquals(1, result.getMap().size());
 
       assertTrue(csrs.closed);

http://git-wip-us.apache.org/repos/asf/hbase/blob/1dd4a8d9/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientSmallScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientSmallScanner.java
b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientSmallScanner.java
index 89a3cca..971020b 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientSmallScanner.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientSmallScanner.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -180,7 +179,7 @@ public class TestClientSmallScanner {
       for (int i = 1; i <= 3; i++) {
         Result result = results.get(i - 1);
         byte[] row = result.getRow();
-        assertEquals("row" + i, new String(row, StandardCharsets.UTF_8));
+        assertEquals("row" + i, new String(row, "UTF-8"));
         assertEquals(1, result.getMap().size());
       }
 
@@ -251,7 +250,7 @@ public class TestClientSmallScanner {
       for (int i = 1; i <= 2; i++) {
         Result result = results.get(i - 1);
         byte[] row = result.getRow();
-        assertEquals("row" + i, new String(row, StandardCharsets.UTF_8));
+        assertEquals("row" + i, new String(row, "UTF-8"));
         assertEquals(1, result.getMap().size());
       }
 
@@ -262,7 +261,7 @@ public class TestClientSmallScanner {
 
       assertEquals(1, results.size());
       Result result = results.get(0);
-      assertEquals("row3", new String(result.getRow(), StandardCharsets.UTF_8));
+      assertEquals("row3", new String(result.getRow(), "UTF-8"));
       assertEquals(1, result.getMap().size());
       assertTrue(css.closed);
     } finally {


Mime
View raw message