tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1459218 - in /tomcat/trunk/java/org/apache/tomcat/util/codec: ./ binary/ digest/ language/ net/
Date Thu, 21 Mar 2013 10:31:51 GMT
Author: markt
Date: Thu Mar 21 10:31:50 2013
New Revision: 1459218

URL: http://svn.apache.org/r1459218
Log:
Import a package renamed copy of Commons Codec with just those bits required for Base64 encoding/decoding

Added:
    tomcat/trunk/java/org/apache/tomcat/util/codec/
      - copied from r1459200, commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/
Removed:
    tomcat/trunk/java/org/apache/tomcat/util/codec/CharEncoding.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/Charsets.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/StringDecoder.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/StringEncoder.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/StringEncoderComparator.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base32.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base32InputStream.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base32OutputStream.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64InputStream.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64OutputStream.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodecInputStream.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodecOutputStream.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/BinaryCodec.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Hex.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/digest/
    tomcat/trunk/java/org/apache/tomcat/util/codec/language/
    tomcat/trunk/java/org/apache/tomcat/util/codec/net/
    tomcat/trunk/java/org/apache/tomcat/util/codec/overview.html
    tomcat/trunk/java/org/apache/tomcat/util/codec/package.html
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/codec/BinaryDecoder.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/BinaryEncoder.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/Decoder.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/DecoderException.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/Encoder.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/EncoderException.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/BinaryDecoder.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/BinaryDecoder.java?rev=1459218&r1=1459200&r2=1459218&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/codec/BinaryDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/BinaryDecoder.java Thu Mar 21 10:31:50
2013
@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.apache.commons.codec;
+package org.apache.tomcat.util.codec;
 
 /**
  * Defines common decoding methods for byte array decoders.

Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/BinaryEncoder.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/BinaryEncoder.java?rev=1459218&r1=1459200&r2=1459218&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/codec/BinaryEncoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/BinaryEncoder.java Thu Mar 21 10:31:50
2013
@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.apache.commons.codec;
+package org.apache.tomcat.util.codec;
 
 /**
  * Defines common encoding methods for byte array encoders.

Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/Decoder.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/Decoder.java?rev=1459218&r1=1459200&r2=1459218&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/codec/Decoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/Decoder.java Thu Mar 21 10:31:50 2013
@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.apache.commons.codec;
+package org.apache.tomcat.util.codec;
 
 /**
  * Provides the highest level of abstraction for Decoders.

Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/DecoderException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/DecoderException.java?rev=1459218&r1=1459200&r2=1459218&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/codec/DecoderException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/DecoderException.java Thu Mar 21 10:31:50
2013
@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.apache.commons.codec;
+package org.apache.tomcat.util.codec;
 
 /**
  * Thrown when there is a failure condition during the decoding process. This exception is
thrown when a {@link Decoder}

Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/Encoder.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/Encoder.java?rev=1459218&r1=1459200&r2=1459218&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/codec/Encoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/Encoder.java Thu Mar 21 10:31:50 2013
@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.apache.commons.codec;
+package org.apache.tomcat.util.codec;
 
 /**
  * Provides the highest level of abstraction for Encoders.

Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/EncoderException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/EncoderException.java?rev=1459218&r1=1459200&r2=1459218&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/codec/EncoderException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/EncoderException.java Thu Mar 21 10:31:50
2013
@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.apache.commons.codec;
+package org.apache.tomcat.util.codec;
 
 /**
  * Thrown when there is a failure condition during the encoding process. This exception is
thrown when an

Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java?rev=1459218&r1=1459200&r2=1459218&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java Thu Mar 21 10:31:50
2013
@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.apache.commons.codec.binary;
+package org.apache.tomcat.util.codec.binary;
 
 import java.math.BigInteger;
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java?rev=1459218&r1=1459200&r2=1459218&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java Thu Mar 21 10:31:50
2013
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.tomcat.util.codec.binary;
 
-package org.apache.commons.codec.binary;
-
-import org.apache.commons.codec.BinaryDecoder;
-import org.apache.commons.codec.BinaryEncoder;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.EncoderException;
+import org.apache.tomcat.util.codec.BinaryDecoder;
+import org.apache.tomcat.util.codec.BinaryEncoder;
+import org.apache.tomcat.util.codec.DecoderException;
+import org.apache.tomcat.util.codec.EncoderException;
 
 /**
  * Abstract superclass for Base-N encoders and decoders.

Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java?rev=1459218&r1=1459200&r2=1459218&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java Thu Mar 21 10:31:50
2013
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.tomcat.util.codec.binary;
 
-package org.apache.commons.codec.binary;
-
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 
-import org.apache.commons.codec.CharEncoding;
-import org.apache.commons.codec.Charsets;
+import org.apache.tomcat.util.buf.B2CConverter;
 
 /**
  * Converts String to and from bytes using the encodings required by the Java specification.
These encodings are
@@ -30,7 +27,6 @@ import org.apache.commons.codec.Charsets
  *
  * <p>This class is immutable and thread-safe.</p>
  *
- * @see CharEncoding
  * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
  * @version $Id$
  * @since 1.4
@@ -54,147 +50,16 @@ public class StringUtils {
     }
 
     /**
-     * Encodes the given string into a sequence of bytes using the ISO-8859-1 charset, storing
the result into a new
-     * byte array.
-     *
-     * @param string
-     *            the String to encode, may be {@code null}
-     * @return encoded bytes, or {@code null} if the input string was {@code null}
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#ISO_8859_1} is not initialized, which should
never happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
-     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
-     * @see #getBytesUnchecked(String, String)
-     */
-    public static byte[] getBytesIso8859_1(final String string) {
-        return getBytes(string, Charsets.ISO_8859_1);
-    }
-
-
-    /**
-     * Encodes the given string into a sequence of bytes using the named charset, storing
the result into a new byte
-     * array.
-     * <p>
-     * This method catches {@link UnsupportedEncodingException} and rethrows it as {@link
IllegalStateException}, which
-     * should never happen for a required charset name. Use this method when the encoding
is required to be in the JRE.
-     * </p>
-     *
-     * @param string
-     *            the String to encode, may be {@code null}
-     * @param charsetName
-     *            The name of a required {@link java.nio.charset.Charset}
-     * @return encoded bytes, or {@code null} if the input string was {@code null}
-     * @throws IllegalStateException
-     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should
never happen for a
-     *             required charset name.
-     * @see CharEncoding
-     * @see String#getBytes(String)
-     */
-    public static byte[] getBytesUnchecked(final String string, final String charsetName)
{
-        if (string == null) {
-            return null;
-        }
-        try {
-            return string.getBytes(charsetName);
-        } catch (final UnsupportedEncodingException e) {
-            throw StringUtils.newIllegalStateException(charsetName, e);
-        }
-    }
-
-    /**
-     * Encodes the given string into a sequence of bytes using the US-ASCII charset, storing
the result into a new byte
-     * array.
-     *
-     * @param string
-     *            the String to encode, may be {@code null}
-     * @return encoded bytes, or {@code null} if the input string was {@code null}
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#US_ASCII} is not initialized, which should never
happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
-     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
-     * @see #getBytesUnchecked(String, String)
-     */
-    public static byte[] getBytesUsAscii(final String string) {
-        return getBytes(string, Charsets.US_ASCII);
-    }
-
-    /**
-     * Encodes the given string into a sequence of bytes using the UTF-16 charset, storing
the result into a new byte
-     * array.
-     *
-     * @param string
-     *            the String to encode, may be {@code null}
-     * @return encoded bytes, or {@code null} if the input string was {@code null}
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#UTF_16} is not initialized, which should never
happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
-     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
-     * @see #getBytesUnchecked(String, String)
-     */
-    public static byte[] getBytesUtf16(final String string) {
-        return getBytes(string, Charsets.UTF_16);
-    }
-
-    /**
-     * Encodes the given string into a sequence of bytes using the UTF-16BE charset, storing
the result into a new byte
-     * array.
-     *
-     * @param string
-     *            the String to encode, may be {@code null}
-     * @return encoded bytes, or {@code null} if the input string was {@code null}
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#UTF_16BE} is not initialized, which should never
happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
-     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
-     * @see #getBytesUnchecked(String, String)
-     */
-    public static byte[] getBytesUtf16Be(final String string) {
-        return getBytes(string, Charsets.UTF_16BE);
-    }
-
-    /**
-     * Encodes the given string into a sequence of bytes using the UTF-16LE charset, storing
the result into a new byte
-     * array.
-     *
-     * @param string
-     *            the String to encode, may be {@code null}
-     * @return encoded bytes, or {@code null} if the input string was {@code null}
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#UTF_16LE} is not initialized, which should never
happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
-     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
-     * @see #getBytesUnchecked(String, String)
-     */
-    public static byte[] getBytesUtf16Le(final String string) {
-        return getBytes(string, Charsets.UTF_16LE);
-    }
-
-    /**
      * Encodes the given string into a sequence of bytes using the UTF-8 charset, storing
the result into a new byte
      * array.
      *
      * @param string
      *            the String to encode, may be {@code null}
      * @return encoded bytes, or {@code null} if the input string was {@code null}
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#UTF_8} is not initialized, which should never
happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
      * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
-     * @see #getBytesUnchecked(String, String)
      */
     public static byte[] getBytesUtf8(final String string) {
-        return getBytes(string, Charsets.UTF_8);
-    }
-
-    private static IllegalStateException newIllegalStateException(final String charsetName,
-                                                                  final UnsupportedEncodingException
e) {
-        return new IllegalStateException(charsetName + ": " + e);
+        return getBytes(string, B2CConverter.UTF_8);
     }
 
     /**
@@ -206,138 +71,21 @@ public class StringUtils {
      *            The {@link Charset} to encode the {@code String}
      * @return A new <code>String</code> decoded from the specified array of
bytes using the given charset,
      *         or {@code null} if the input byte array was {@code null}.
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#UTF_8} is not initialized, which should never
happen since it is
-     *             required by the Java platform specification.
      */
     private static String newString(final byte[] bytes, final Charset charset) {
         return bytes == null ? null : new String(bytes, charset);
     }
 
     /**
-     * Constructs a new <code>String</code> by decoding the specified array of
bytes using the given charset.
-     * <p>
-     * This method catches {@link UnsupportedEncodingException} and re-throws it as {@link
IllegalStateException}, which
-     * should never happen for a required charset name. Use this method when the encoding
is required to be in the JRE.
-     * </p>
-     *
-     * @param bytes
-     *            The bytes to be decoded into characters, may be {@code null}
-     * @param charsetName
-     *            The name of a required {@link java.nio.charset.Charset}
-     * @return A new <code>String</code> decoded from the specified array of
bytes using the given charset,
-     *         or {@code null} if the input byte array was {@code null}.
-     * @throws IllegalStateException
-     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should
never happen for a
-     *             required charset name.
-     * @see CharEncoding
-     * @see String#String(byte[], String)
-     */
-    public static String newString(final byte[] bytes, final String charsetName) {
-        if (bytes == null) {
-            return null;
-        }
-        try {
-            return new String(bytes, charsetName);
-        } catch (final UnsupportedEncodingException e) {
-            throw StringUtils.newIllegalStateException(charsetName, e);
-        }
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of
bytes using the ISO-8859-1 charset.
-     *
-     * @param bytes
-     *            The bytes to be decoded into characters, may be {@code null}
-     * @return A new <code>String</code> decoded from the specified array of
bytes using the ISO-8859-1 charset, or
-     *         {@code null} if the input byte array was {@code null}.
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#ISO_8859_1} is not initialized, which should
never happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
-     */
-    public static String newStringIso8859_1(final byte[] bytes) {
-        return new String(bytes, Charsets.ISO_8859_1);
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of
bytes using the US-ASCII charset.
-     *
-     * @param bytes
-     *            The bytes to be decoded into characters
-     * @return A new <code>String</code> decoded from the specified array of
bytes using the US-ASCII charset,
-     *         or {@code null} if the input byte array was {@code null}.
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#US_ASCII} is not initialized, which should never
happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
-     */
-    public static String newStringUsAscii(final byte[] bytes) {
-        return new String(bytes, Charsets.US_ASCII);
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of
bytes using the UTF-16 charset.
-     *
-     * @param bytes
-     *            The bytes to be decoded into characters
-     * @return A new <code>String</code> decoded from the specified array of
bytes using the UTF-16 charset
-     *         or {@code null} if the input byte array was {@code null}.
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#UTF_16} is not initialized, which should never
happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
-     */
-    public static String newStringUtf16(final byte[] bytes) {
-        return new String(bytes, Charsets.UTF_16);
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of
bytes using the UTF-16BE charset.
-     *
-     * @param bytes
-     *            The bytes to be decoded into characters
-     * @return A new <code>String</code> decoded from the specified array of
bytes using the UTF-16BE charset,
-     *         or {@code null} if the input byte array was {@code null}.
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#UTF_16BE} is not initialized, which should never
happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
-     */
-    public static String newStringUtf16Be(final byte[] bytes) {
-        return new String(bytes, Charsets.UTF_16BE);
-    }
-
-    /**
-     * Constructs a new <code>String</code> by decoding the specified array of
bytes using the UTF-16LE charset.
-     *
-     * @param bytes
-     *            The bytes to be decoded into characters
-     * @return A new <code>String</code> decoded from the specified array of
bytes using the UTF-16LE charset,
-     *         or {@code null} if the input byte array was {@code null}.
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#UTF_16LE} is not initialized, which should never
happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
-     */
-    public static String newStringUtf16Le(final byte[] bytes) {
-        return new String(bytes, Charsets.UTF_16LE);
-    }
-
-    /**
      * Constructs a new <code>String</code> by decoding the specified array of
bytes using the UTF-8 charset.
      *
      * @param bytes
      *            The bytes to be decoded into characters
      * @return A new <code>String</code> decoded from the specified array of
bytes using the UTF-8 charset,
      *         or {@code null} if the input byte array was {@code null}.
-     * @throws NullPointerException
-     *             Thrown if {@link Charsets#UTF_8} is not initialized, which should never
happen since it is
-     *             required by the Java platform specification.
-     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
      */
     public static String newStringUtf8(final byte[] bytes) {
-        return newString(bytes, Charsets.UTF_8);
+        return newString(bytes, B2CConverter.UTF_8);
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message