Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #724 from andrewgaul/hex-cut-and-paste 

Remove duplicated hexadecimal conversion code
This commit is contained in:
Adrian Cole 2012-07-17 15:24:21 -07:00
parent 007eba6d7c d82dd32c64
commit 62e8c59385
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/src/main/java/org/jclouds/crypto/CryptoStreams.java
View File

@ -49,20 +49,21 @@ import com.google.common.io.InputSupplier;
@Beta @Beta
public class CryptoStreams { public class CryptoStreams {
public static String hex(byte[] in) { private static char[] hex(byte[] in, int offset, int len) {
byte[] hex = new byte[2 * in.length]; char[] hex = new char[2 * len];
int index = 0; int index = 0;
for (byte b : in) { for (int i = offset; i < offset + len; ++i) {
byte b = in[i];
int v = b & 0xFF; int v = b & 0xFF;
hex[index++] = HEX_CHAR_TABLE[v >>> 4]; hex[index++] = HEX_CHAR_TABLE[v >>> 4];
hex[index++] = HEX_CHAR_TABLE[v & 0xF]; hex[index++] = HEX_CHAR_TABLE[v & 0xF];
} }
try { return hex;
return new String(hex, "ASCII"); }
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e); public static String hex(byte[] in) {
} return new String(hex(in, 0, in.length));
} }
public static byte[] hex(String s) { public static byte[] hex(String s) {
@ -295,9 +296,10 @@ public class CryptoStreams {
}); });
} }
final static byte[] HEX_CHAR_TABLE = { (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4', (byte) '5', private final static char[] HEX_CHAR_TABLE = {
(byte) '6', (byte) '7', (byte) '8', (byte) '9', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', '0', '1', '2', '3', '4', '5', '6', '7',
(byte) 'f' }; '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
};
/** /**
* Computes and returns the hex value for a supplied input stream. * Computes and returns the hex value for a supplied input stream.
@ -313,16 +315,7 @@ public class CryptoStreams {
final StringBuilder out = new StringBuilder(); final StringBuilder out = new StringBuilder();
return com.google.common.io.ByteStreams.readBytes(supplier, new ByteProcessor<String>() { return com.google.common.io.ByteStreams.readBytes(supplier, new ByteProcessor<String>() {
public boolean processBytes(byte[] buf, int off, int len) { public boolean processBytes(byte[] buf, int off, int len) {
char[] hex = new char[2 * len]; out.append(hex(buf, off, len));
int index = 0;
for (int i = off; i < off + len; i++) {
byte b = buf[i];
int v = b & 0xFF;
hex[index++] = (char) HEX_CHAR_TABLE[v >>> 4];
hex[index++] = (char) HEX_CHAR_TABLE[v & 0xF];
}
out.append(hex);
return true; return true;
} }