Author: david.lloyd(a)jboss.com Date: 2008-06-30 23:44:29 -0400 (Mon, 30 Jun 2008) New Revision: 4337 Added: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/Base64Util.java Removed: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java Log: More reorg Copied: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/Base64Util.java (from rev 4025, remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java) =================================================================== --- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/Base64Util.java (rev 0) +++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/Base64Util.java 2008-07-01 03:44:29 UTC (rev 4337) @@ -0,0 +1,151 @@ +package org.jboss.cx.remoting.util; + +import java.nio.ByteBuffer; +import java.nio.CharBuffer; + +/** + * + */ +public final class Base64Util { + + private Base64Util() { + } + + /** + * Base-64 decode a character buffer into a byte buffer. + * + * @param source the base-64 encoded source material + * @param target the target for the decoded data + * @throws Base64DecodingException if the source data is not in base-64 format + */ + public static void base64Decode(CharBuffer source, ByteBuffer target) throws Base64DecodingException { + int triad; + while (source.hasRemaining()) { + triad = 0; + char ch = source.get(); + if (ch >= 'A' && ch <= 'Z') { + triad |= (ch - 'A') << 18; + } else if (ch >= 'a' && ch <= 'z') { + triad |= (ch - 'a' + 26) << 18; + } else if (ch >= '0' && ch <= '9') { + triad |= (ch - '0' + 52) << 18; + } else if (ch == '+' || ch == '-') { + triad |= 62 << 18; + } else if (ch == '/' || ch == '_') { + triad |= 63 << 18; + } else if (ch == '=') { + throw new Base64DecodingException("Unexpected padding encountered"); + } + if (! source.hasRemaining()) { + throw new Base64DecodingException("Unexpected end of source data"); + } + + ch = source.get(); + if (ch >= 'A' && ch <= 'Z') { + triad |= (ch - 'A') << 12; + } else if (ch >= 'a' && ch <= 'z') { + triad |= (ch - 'a' + 26) << 12; + } else if (ch >= '0' && ch <= '9') { + triad |= (ch - '0' + 52) << 12; + } else if (ch == '+' || ch == '-') { + triad |= 62 << 12; + } else if (ch == '/' || ch == '_') { + triad |= 63 << 12; + } else if (ch == '=') { + throw new Base64DecodingException("Unexpected padding encountered"); + } + if (! source.hasRemaining()) { + throw new Base64DecodingException("Unexpected end of source data"); + } + + ch = source.get(); + if (ch >= 'A' && ch <= 'Z') { + triad |= (ch - 'A') << 6; + } else if (ch >= 'a' && ch <= 'z') { + triad |= (ch - 'a' + 26) << 6; + } else if (ch >= '0' && ch <= '9') { + triad |= (ch - '0' + 52) << 6; + } else if (ch == '+' || ch == '-') { + triad |= 62 << 6; + } else if (ch == '/' || ch == '_') { + triad |= 63 << 6; + } else if (ch == '=') { + if (source.hasRemaining() && source.get() == '=') { + if (! source.hasRemaining()) { + target.put((byte) (triad >> 16)); + return; + } else { + throw new Base64DecodingException("Extra data after padding"); + } + } else { + throw new Base64DecodingException("Unexpected end of source data"); + } + } + + ch = source.get(); + if (ch >= 'A' && ch <= 'Z') { + triad |= ch - 'A'; + } else if (ch >= 'a' && ch <= 'z') { + triad |= ch - 'a' + 26; + } else if (ch >= '0' && ch <= '9') { + triad |= ch - '0' + 52; + } else if (ch == '+' || ch == '-') { + triad |= 62; + } else if (ch == '/' || ch == '_') { + triad |= 63; + } else if (ch == '=') { + if (! source.hasRemaining()) { + target.putShort((short) (triad >> 8)); + return; + } else { + throw new Base64DecodingException("Extra data after padding"); + } + } + + target.put((byte) (triad >> 16)); + target.putShort((short) triad); + } + } + + private static final char[] base64table = new char[] { + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', + 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', + 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', + 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', + 'w', 'x', 'y', 'z', '0', '1', '2', '3', + '4', '5', '6', '7', '8', '9', '+', '/', + }; + + /** + * Base-64 encode a byte buffer into a character buffer. + * + * @param source the binary data to encode + * @param target the target for the encoded material + */ + public static void base64Encode(ByteBuffer source, CharBuffer target) { + int idx = 0; + while (source.hasRemaining()) { + int b = source.get() & 0xff; + target.put(base64table[b >>> 2]); + idx = b << 4 & 0x3f; + if (! source.hasRemaining()) { + target.put(base64table[idx]); + target.put("=="); + return; + } + b = source.get() & 0xff; + target.put(base64table[idx | (b >>> 4)]); + idx = b << 2 & 0x3f; + if (! source.hasRemaining()) { + target.put(base64table[idx]); + target.put('='); + return; + } + b = source.get() & 0xff; + target.put(base64table[idx | (b >>> 6)]); + target.put(base64table[b & 0x3f]); + } + } +} Deleted: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java =================================================================== --- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java 2008-07-01 03:12:13 UTC (rev 4336) +++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java 2008-07-01 03:44:29 UTC (rev 4337) @@ -1,165 +0,0 @@ -package org.jboss.cx.remoting.util; - -import java.io.Closeable; -import java.nio.ByteBuffer; -import java.nio.CharBuffer; -import org.jboss.cx.remoting.log.Logger; - -/** - * - */ -public final class IoUtil { - private static final Logger log = Logger.getLogger(IoUtil.class); - - /** - * Base-64 decode a character buffer into a byte buffer. - * - * @param source the base-64 encoded source material - * @param target the target for the decoded data - * @throws Base64DecodingException if the source data is not in base-64 format - */ - public static void base64Decode(CharBuffer source, ByteBuffer target) throws Base64DecodingException { - int triad; - while (source.hasRemaining()) { - triad = 0; - char ch = source.get(); - if (ch >= 'A' && ch <= 'Z') { - triad |= (ch - 'A') << 18; - } else if (ch >= 'a' && ch <= 'z') { - triad |= (ch - 'a' + 26) << 18; - } else if (ch >= '0' && ch <= '9') { - triad |= (ch - '0' + 52) << 18; - } else if (ch == '+' || ch == '-') { - triad |= 62 << 18; - } else if (ch == '/' || ch == '_') { - triad |= 63 << 18; - } else if (ch == '=') { - throw new Base64DecodingException("Unexpected padding encountered"); - } - if (! source.hasRemaining()) { - throw new Base64DecodingException("Unexpected end of source data"); - } - - ch = source.get(); - if (ch >= 'A' && ch <= 'Z') { - triad |= (ch - 'A') << 12; - } else if (ch >= 'a' && ch <= 'z') { - triad |= (ch - 'a' + 26) << 12; - } else if (ch >= '0' && ch <= '9') { - triad |= (ch - '0' + 52) << 12; - } else if (ch == '+' || ch == '-') { - triad |= 62 << 12; - } else if (ch == '/' || ch == '_') { - triad |= 63 << 12; - } else if (ch == '=') { - throw new Base64DecodingException("Unexpected padding encountered"); - } - if (! source.hasRemaining()) { - throw new Base64DecodingException("Unexpected end of source data"); - } - - ch = source.get(); - if (ch >= 'A' && ch <= 'Z') { - triad |= (ch - 'A') << 6; - } else if (ch >= 'a' && ch <= 'z') { - triad |= (ch - 'a' + 26) << 6; - } else if (ch >= '0' && ch <= '9') { - triad |= (ch - '0' + 52) << 6; - } else if (ch == '+' || ch == '-') { - triad |= 62 << 6; - } else if (ch == '/' || ch == '_') { - triad |= 63 << 6; - } else if (ch == '=') { - if (source.hasRemaining() && source.get() == '=') { - if (! source.hasRemaining()) { - target.put((byte) (triad >> 16)); - return; - } else { - throw new Base64DecodingException("Extra data after padding"); - } - } else { - throw new Base64DecodingException("Unexpected end of source data"); - } - } - - ch = source.get(); - if (ch >= 'A' && ch <= 'Z') { - triad |= ch - 'A'; - } else if (ch >= 'a' && ch <= 'z') { - triad |= ch - 'a' + 26; - } else if (ch >= '0' && ch <= '9') { - triad |= ch - '0' + 52; - } else if (ch == '+' || ch == '-') { - triad |= 62; - } else if (ch == '/' || ch == '_') { - triad |= 63; - } else if (ch == '=') { - if (! source.hasRemaining()) { - target.putShort((short) (triad >> 8)); - return; - } else { - throw new Base64DecodingException("Extra data after padding"); - } - } - - target.put((byte) (triad >> 16)); - target.putShort((short) triad); - } - } - - private static final char[] base64table = new char[] { - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', - 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', - 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', - 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', - 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', - 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', - 'w', 'x', 'y', 'z', '0', '1', '2', '3', - '4', '5', '6', '7', '8', '9', '+', '/', - }; - - /** - * Base-64 encode a byte buffer into a character buffer. - * - * @param source the binary data to encode - * @param target the target for the encoded material - */ - public static void base64Encode(ByteBuffer source, CharBuffer target) { - int idx = 0; - while (source.hasRemaining()) { - int b = source.get() & 0xff; - target.put(base64table[b >>> 2]); - idx = b << 4 & 0x3f; - if (! source.hasRemaining()) { - target.put(base64table[idx]); - target.put("=="); - return; - } - b = source.get() & 0xff; - target.put(base64table[idx | (b >>> 4)]); - idx = b << 2 & 0x3f; - if (! source.hasRemaining()) { - target.put(base64table[idx]); - target.put('='); - return; - } - b = source.get() & 0xff; - target.put(base64table[idx | (b >>> 6)]); - target.put(base64table[b & 0x3f]); - } - } - - /** - * Close a resource without throwing an exception. If the underlying {@code close} throws an exception, log - * it. For use in {@code finally} blocks. - * - * @param c the resource to close - */ - public static void closeSafely(Closeable c) { - try { - c.close(); - } catch (Throwable t) { - log.trace(t, "Closing %s failed", c); - } - } -}