Return-Path: 
 <commons-dev-return-25497-qmlist-jakarta-archive-commons-dev=nagoya.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@apache.org
Received: (qmail 89166 invoked from network); 25 Feb 2003 04:18:05 -0000
Received: from exchange.sun.com (192.18.33.10)
  by daedalus.apache.org with SMTP; 25 Feb 2003 04:18:05 -0000
Received: (qmail 16816 invoked by uid 97); 25 Feb 2003 04:19:49 -0000
Delivered-To: qmlist-jakarta-archive-commons-dev@nagoya.betaversion.org
Received: (qmail 16809 invoked from network); 25 Feb 2003 04:19:48 -0000
Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12)
  by nagoya.betaversion.org with SMTP; 25 Feb 2003 04:19:48 -0000
Received: (qmail 88970 invoked by uid 500); 25 Feb 2003 04:18:03 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:commons-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 88957 invoked by uid 500); 25 Feb 2003 04:18:03 -0000
Received: (qmail 88954 invoked from network); 25 Feb 2003 04:18:03 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 25 Feb 2003 04:18:03 -0000
Received: (qmail 15246 invoked by uid 1628); 25 Feb 2003 04:18:02 -0000
Date: 25 Feb 2003 04:18:02 -0000
Message-ID: <20030225041802.15245.qmail@icarus.apache.org>
From: tobrien@apache.org
To: jakarta-commons-sandbox-cvs@apache.org
Subject: cvs commit:
 jakarta-commons-sandbox/codec/src/test/org/apache/commons/codec/binary
 TestBase64.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

tobrien     2003/02/24 20:18:02

  Modified:    codec/src/java/org/apache/commons/codec
                        StringEncoderComparator.java
               codec/src/java/org/apache/commons/codec/binary Base64.java
               codec/src/test/org/apache/commons/codec/binary
                        TestBase64.java
  Log:
  Removed isBase64(String) from Base64
  
  Revision  Changes    Path
  1.3       +1 -2      jakarta-commons-sandbox/codec/src/java/org/apache/commons/codec/StringEncoderComparator.java
  
  Index: StringEncoderComparator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/codec/src/java/org/apache/commons/codec/StringEncoderComparator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StringEncoderComparator.java	24 Feb 2003 11:53:29 -0000	1.2
  +++ StringEncoderComparator.java	25 Feb 2003 04:18:01 -0000	1.3
  @@ -91,7 +91,6 @@
        * strings using the StringEncoder this Comparator
        * was created with.
        */
  - 
       public int compare(Object o1, Object o2) {
   
           int compareCode = 0;
  
  
  
  1.5       +379 -379  jakarta-commons-sandbox/codec/src/java/org/apache/commons/codec/binary/Base64.java
  
  Index: Base64.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/codec/src/java/org/apache/commons/codec/binary/Base64.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Base64.java	24 Feb 2003 11:53:29 -0000	1.4
  +++ Base64.java	25 Feb 2003 04:18:01 -0000	1.5
  @@ -72,419 +72,419 @@
   import org.apache.commons.codec.EncoderException;
   
   /**
  -  * This class provides encode/decode for RFC 2045 Base64 as defined by
  -  * RFC 2045, N. Freed and N. Borenstein.  <a
  +  * This class provides encode/decode for RFC 2045 Base64 as 
  +  * defined by RFC 2045, N. Freed and N. Borenstein.  <a
     * href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>:
     * Multipurpose Internet Mail Extensions (MIME) Part One: Format of
     * Internet Message Bodies. Reference 1996
     *
     * @author Jeffrey Rodriguez
  -  * @author Daniel Rall
  +  * @author <a href="dlr@apache.org">Daniel Rall</a>
     * @author <a href="m.redington@ucl.ac.uk">Martin Redington</a>
  -  * @since 1.2
  +  * @since 1.0-dev
     */
  -public class Base64 implements BinaryEncoder, BinaryDecoder
  -{
  -     static final int CHUNK_SIZE = 76;
  -     static final byte[] CHUNK_SEPARATOR = "\n".getBytes();
  -
  -     static private final int  BASELENGTH         = 255;
  -     static private final int  LOOKUPLENGTH       = 64;
  -     static private final int  TWENTYFOURBITGROUP = 24;
  -     static private final int  EIGHTBIT           = 8;
  -     static private final int  SIXTEENBIT         = 16;
  -     static private final int  SIXBIT             = 6;
  -     static private final int  FOURBYTE           = 4;
  -     static private final int  SIGN               = -128;
  -     static private final byte PAD                = (byte) '=';
  -     static private byte [] base64Alphabet       = new byte[BASELENGTH];
  -     static private byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
  -     //static private final Log log = LogSource.getInstance("org.apache.commons.util.Base64");
  -
  -     static
  -     {
  -         for (int i = 0; i < BASELENGTH; i++ )
  -         {
  -             base64Alphabet[i] = -1;
  -         }
  -         for (int i = 'Z'; i >= 'A'; i--)
  -         {
  -             base64Alphabet[i] = (byte) (i - 'A');
  -         }
  -         for (int i = 'z'; i>= 'a'; i--)
  -         {
  -             base64Alphabet[i] = (byte) (i - 'a' + 26);
  -         }
  -         for (int i = '9'; i >= '0'; i--)
  -         {
  -             base64Alphabet[i] = (byte) (i - '0' + 52);
  -         }
  -
  -         base64Alphabet['+']  = 62;
  -         base64Alphabet['/']  = 63;
  -
  -         for (int i = 0; i <= 25; i++ )
  -             lookUpBase64Alphabet[i] = (byte) ('A' + i);
  -
  -         for (int i = 26,  j = 0; i <= 51; i++, j++ )
  -             lookUpBase64Alphabet[i] = (byte) ('a'+ j);
  -
  -         for (int i = 52,  j = 0; i <= 61; i++, j++ )
  -             lookUpBase64Alphabet[i] = (byte) ('0' + j);
  -
  -         lookUpBase64Alphabet[62] = (byte) '+';
  -         lookUpBase64Alphabet[63] = (byte) '/';
  -     }
  -
  -     public static boolean isBase64( String isValidString )
  -     {
  -         return isArrayByteBase64(isValidString.getBytes());
  -     }
  -
  -     public static boolean isBase64( byte octect )
  -     {
  -         //shall we ignore white space? JEFF??
  -         return (octect == PAD || base64Alphabet[octect] != -1);
  -     }
  -
  -     public static boolean isArrayByteBase64( byte[] arrayOctect )
  -     {
  -	 arrayOctect = discardWhitespace( arrayOctect );
  -
  -         int length = arrayOctect.length;
  -         if (length == 0)
  -         {
  -             // shouldn't a 0 length array be valid base64 data?
  -             // return false;
  -             return true;
  -         }
  -         for (int i=0; i < length; i++)
  -         {
  -             if ( !Base64.isBase64(arrayOctect[i]) )
  -                 return false;
  -         }
  -         return true;
  -     }
  +public class Base64 implements BinaryEncoder, BinaryDecoder {
   
  -    public Object encode(Object pObject) throws EncoderException {
  +    // Create constants pertaining to the chunk requirement
  +    static final int CHUNK_SIZE = 76;
  +    static final byte[] CHUNK_SEPARATOR = "\n".getBytes();
  +
  +    // Create numerical and byte constants 
  +    static private final int BASELENGTH = 255;
  +    static private final int LOOKUPLENGTH = 64;
  +    static private final int TWENTYFOURBITGROUP = 24;
  +    static private final int EIGHTBIT = 8;
  +    static private final int SIXTEENBIT = 16;
  +    static private final int SIXBIT = 6;
  +    static private final int FOURBYTE = 4;
  +    static private final int SIGN = -128;
  +    static private final byte PAD = (byte) '=';
  +
  +    // Create arrays to hold the base64 characters and a 
  +    // lookup for base64 chars
  +    static private byte[] base64Alphabet = new byte[BASELENGTH];
  +    static private byte[] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
  +
  +    // Populating the lookup and character arrays
  +    static {
  +        for (int i = 0; i < BASELENGTH; i++) {
  +            base64Alphabet[i] = -1;
  +        }
  +        for (int i = 'Z'; i >= 'A'; i--) {
  +            base64Alphabet[i] = (byte) (i - 'A');
  +        }
  +        for (int i = 'z'; i >= 'a'; i--) {
  +            base64Alphabet[i] = (byte) (i - 'a' + 26);
  +        }
  +        for (int i = '9'; i >= '0'; i--) {
  +            base64Alphabet[i] = (byte) (i - '0' + 52);
  +        }
  +
  +        base64Alphabet['+'] = 62;
  +        base64Alphabet['/'] = 63;
  +
  +        for (int i = 0; i <= 25; i++)
  +            lookUpBase64Alphabet[i] = (byte) ('A' + i);
   
  -	Object result;
  +        for (int i = 26, j = 0; i <= 51; i++, j++)
  +            lookUpBase64Alphabet[i] = (byte) ('a' + j);
   
  -	if( !(pObject instanceof byte[]) ) {
  -	    throw new EncoderException( "Parameter supplied to " +
  -					"Base64 " +
  -				   "encode is not a byte[]" ); 
  -	} else {
  -	    result = encode( (byte[]) pObject );
  -	}
  +        for (int i = 52, j = 0; i <= 61; i++, j++)
  +            lookUpBase64Alphabet[i] = (byte) ('0' + j);
   
  -	return result;
  +        lookUpBase64Alphabet[62] = (byte) '+';
  +        lookUpBase64Alphabet[63] = (byte) '/';
  +    }
   
  +    private static boolean isBase64(byte octect) {
  +        //shall we ignore white space? JEFF??
  +        return (octect == PAD || base64Alphabet[octect] != -1);
       }
   
  -    public byte[] encode(byte[] pArray) throws EncoderException {
  -	return( base64( pArray, false ) );
  +    public static boolean isArrayByteBase64(byte[] arrayOctect) {
  +        arrayOctect = discardWhitespace(arrayOctect);
  +
  +        int length = arrayOctect.length;
  +        if (length == 0) {
  +            // shouldn't a 0 length array be valid base64 data?
  +            // return false;
  +            return true;
  +        }
  +        for (int i = 0; i < length; i++) {
  +            if (!Base64.isBase64(arrayOctect[i]))
  +                return false;
  +        }
  +        return true;
       }
   
  -    public static byte[] base64( byte[] binaryData ) {
  -	return( base64( binaryData, false ) );
  +
  +    public static byte[] base64(byte[] binaryData) {
  +        return (base64(binaryData, false));
       }
   
  -    public static byte[] base64Chunked( byte[] binaryData ) {
  -	return( base64( binaryData, true ) );
  +    public static byte[] base64Chunked(byte[] binaryData) {
  +        return (base64(binaryData, true));
       }
   
       public Object decode(Object pObject) throws DecoderException {
   
  -	Object result;
  +        Object result;
   
  -	if( !(pObject instanceof byte[]) ) {
  -	    throw new DecoderException( "Parameter supplied to " +
  -					"Base64 " +
  -				   "decode is not a byte[]" ); 
  -	} else {
  -	    result = decode( (byte[]) pObject );
  -	}
  +        if (!(pObject instanceof byte[])) {
  +            throw new DecoderException(
  +                "Parameter supplied to "
  +                    + "Base64 "
  +                    + "decode is not a byte[]");
  +        } else {
  +            result = decode((byte[]) pObject);
  +        }
   
  -	return result;
  +        return result;
   
       }
   
       public byte[] decode(byte[] pArray) throws DecoderException {
  -	
  -	byte[] result;
   
  -	if( !isArrayByteBase64(pArray) ) {
  -	    throw new DecoderException( "Parameter supplied to " +
  -					"Base64 " +
  -				   "decode is not a valid base64 data." ); 
  -	} else {
  -	    result = base64decode( (byte[]) pArray );
  -	}
  -
  -	return( result );
  -    }
  -
  -     /**
  -      * Encodes hex octects into Base64.
  -      *
  -      * @param binaryData Array containing binary data to encode.
  -      * @return Base64-encoded data.
  -      */
  -     public static byte[] base64( byte[] binaryData, boolean isChunked )
  -     {
  -         int      lengthDataBits    = binaryData.length*EIGHTBIT;
  -         int      fewerThan24bits   = lengthDataBits%TWENTYFOURBITGROUP;
  -         int      numberTriplets    = lengthDataBits/TWENTYFOURBITGROUP;
  -         byte     encodedData[]     = null;
  -         int      encodedDataLength = 0;
  -	 int      nbrChunks = 0;
  -
  -         if (fewerThan24bits != 0)
  -         {
  -             //data not divisible by 24 bit
  -             encodedDataLength = (numberTriplets + 1 ) * 4;
  -         }
  -         else
  -         {
  -             // 16 or 8 bit
  -             encodedDataLength = numberTriplets * 4;
  -         }
  -
  -	 // If the output is to be "chunked" into 76 character sections, 
  -	 // for compliance with RFC 2045 MIME, then it is important to 
  -	 // allow for extra length to account for the separator(s)
  -	 if( isChunked ) {
  -
  -	     nbrChunks = (CHUNK_SEPARATOR.length == 0 ? 0 :
  -                          (int) Math.ceil((float) encodedDataLength / 
  -					  CHUNK_SIZE));
  -	     encodedDataLength += nbrChunks * CHUNK_SEPARATOR.length;
  -	 }
  -
  -         encodedData = new byte[encodedDataLength];
  -
  -         byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
  -
  -         int encodedIndex = 0;
  -         int dataIndex   = 0;
  -         int i           = 0;
  -         int nextSeparatorIndex = CHUNK_SIZE;
  -         int chunksSoFar = 0;
  -
  -         //log.debug("number of triplets = " + numberTriplets);
  -         for ( i = 0; i<numberTriplets; i++ )
  -         {
  -             dataIndex = i*3;
  -             b1 = binaryData[dataIndex];
  -             b2 = binaryData[dataIndex + 1];
  -             b3 = binaryData[dataIndex + 2];
  -
  -             //log.debug("b1= " + b1 +", b2= " + b2 + ", b3= " + b3);
  -
  -             l  = (byte)(b2 & 0x0f);
  -             k  = (byte)(b1 & 0x03);
  -
  -             byte val1 = ((b1 & SIGN)==0)?(byte)(b1>>2):(byte)((b1)>>2^0xc0);
  -             byte val2 = ((b2 & SIGN)==0)?(byte)(b2>>4):(byte)((b2)>>4^0xf0);
  -             byte val3 = ((b3 & SIGN)==0)?(byte)(b3>>6):(byte)((b3)>>6^0xfc);
  -
  -             encodedData[encodedIndex]   = lookUpBase64Alphabet[ val1 ];
  -             //log.debug( "val2 = " + val2 );
  -             //log.debug( "k4   = " + (k<<4) );
  -             //log.debug(  "vak  = " + (val2 | (k<<4)) );
  -             encodedData[encodedIndex+1] =
  -                 lookUpBase64Alphabet[ val2 | ( k<<4 )];
  -             encodedData[encodedIndex+2] =
  -                 lookUpBase64Alphabet[ (l <<2 ) | val3 ];
  -             encodedData[encodedIndex+3] = lookUpBase64Alphabet[ b3 & 0x3f ];
  -
  -             encodedIndex += 4;
  -
  -	     // If we are chunking, let's put a chunk separator down.
  -	     if( isChunked ) {
  -		 // this assumes that CHUNK_SIZE % 4 == 0
  -		 if(encodedIndex == nextSeparatorIndex){
  -		     System.arraycopy(CHUNK_SEPARATOR, 0, encodedData,
  -                                  encodedIndex, CHUNK_SEPARATOR.length);
  -		     chunksSoFar++;
  -		     nextSeparatorIndex = (CHUNK_SIZE * (chunksSoFar + 1)) +
  -                                      (chunksSoFar * CHUNK_SEPARATOR.length);
  -		     encodedIndex += CHUNK_SEPARATOR.length;
  -		 }
  -	     }
  -         }
  -
  -         // form integral number of 6-bit groups
  -         dataIndex    = i*3;
  -
  -         if (fewerThan24bits == EIGHTBIT )
  -         {
  -             b1 = binaryData[dataIndex];
  -             k = (byte) ( b1 &0x03 );
  -             //log.debug("b1=" + b1);
  -             //log.debug("b1<<2 = " + (b1>>2) );
  -             byte val1 = ((b1 & SIGN)==0)?(byte)(b1>>2):(byte)((b1)>>2^0xc0);
  -             encodedData[encodedIndex]     = lookUpBase64Alphabet[ val1 ];
  -             encodedData[encodedIndex + 1] = lookUpBase64Alphabet[ k<<4 ];
  -             encodedData[encodedIndex + 2] = PAD;
  -             encodedData[encodedIndex + 3] = PAD;
  -         }
  -         else if (fewerThan24bits == SIXTEENBIT)
  -         {
  -
  -             b1 = binaryData[dataIndex];
  -             b2 = binaryData[dataIndex +1 ];
  -             l = (byte) (b2 & 0x0f);
  -             k = (byte) (b1 & 0x03);
  -
  -             byte val1 = ((b1 & SIGN) == 0)?(byte)(b1>>2):(byte)((b1)>>2^0xc0);
  -             byte val2 = ((b2 & SIGN) == 0)?(byte)(b2>>4):(byte)((b2)>>4^0xf0);
  -
  -             encodedData[encodedIndex]     = lookUpBase64Alphabet[ val1 ];
  -             encodedData[encodedIndex + 1] =
  -                 lookUpBase64Alphabet[ val2 | ( k<<4 )];
  -             encodedData[encodedIndex + 2] = lookUpBase64Alphabet[ l<<2 ];
  -             encodedData[encodedIndex + 3] = PAD;
  -         }
  -
  -	 if( isChunked ) {
  -	     // we also add a separator to the end of the final chunk.
  -	     if(chunksSoFar < nbrChunks)
  -		 System.arraycopy(CHUNK_SEPARATOR, 0, encodedData,
  -                              encodedDataLength - 
  -			      CHUNK_SEPARATOR.length, CHUNK_SEPARATOR.length);
  -	 }
  -
  -         return encodedData;
  -     }
  -
  -     /**
  -      * Decodes Base64 data into octects
  -      *
  -      * @param binaryData Byte array containing Base64 data
  -      * @return Array containing decoded data.
  -      */
  -     public static byte[] base64decode( byte[] base64Data )
  -     {
  -         // RFC 2045 suggests line wrapping at (no more than) 76
  -         // characters -- we may have embedded whitespace.
  -         base64Data = discardWhitespace(base64Data);
  -
  -         // handle the edge case, so we don't have to worry about it later
  -         if(base64Data.length == 0) { return new byte[0]; }
  -
  -         int      numberQuadruple    = base64Data.length/FOURBYTE;
  -         byte     decodedData[]      = null;
  -         byte     b1=0,b2=0,b3=0, b4=0, marker0=0, marker1=0;
  -
  -         // Throw away anything not in base64Data
  -
  -         int encodedIndex = 0;
  -         int dataIndex    = 0;
  -         {
  -             // this sizes the output array properly - rlw
  -             int lastData = base64Data.length;
  -             // ignore the '=' padding
  -             while (base64Data[lastData-1] == PAD)
  -             {
  -                 if (--lastData == 0)
  -                 {
  -                     return new byte[0];
  -                 }
  -             }
  -             decodedData = new byte[ lastData - numberQuadruple ];
  -         }
  -
  -         for (int i = 0; i < numberQuadruple; i++)
  -         {
  -             dataIndex = i * 4;
  -             marker0   = base64Data[dataIndex + 2];
  -             marker1   = base64Data[dataIndex + 3];
  -
  -             b1 = base64Alphabet[base64Data[dataIndex]];
  -             b2 = base64Alphabet[base64Data[dataIndex +1]];
  -
  -             if (marker0 != PAD && marker1 != PAD)
  -             {
  -                 //No PAD e.g 3cQl
  -                 b3 = base64Alphabet[ marker0 ];
  -                 b4 = base64Alphabet[ marker1 ];
  -
  -                 decodedData[encodedIndex]   = (byte)(  b1 <<2 | b2>>4 );
  -                 decodedData[encodedIndex + 1] =
  -                     (byte)(((b2 & 0xf)<<4 ) |( (b3>>2) & 0xf) );
  -                 decodedData[encodedIndex + 2] = (byte)( b3<<6 | b4 );
  -             }
  -             else if (marker0 == PAD)
  -             {
  -                 //Two PAD e.g. 3c[Pad][Pad]
  -                 decodedData[encodedIndex]   = (byte)(  b1 <<2 | b2>>4 );
  -             }
  -             else if (marker1 == PAD)
  -             {
  -                 //One PAD e.g. 3cQ[Pad]
  -                 b3 = base64Alphabet[ marker0 ];
  -
  -                 decodedData[encodedIndex]   = (byte)(  b1 <<2 | b2>>4 );
  -                 decodedData[encodedIndex + 1] =
  -                     (byte)(((b2 & 0xf)<<4 ) |( (b3>>2) & 0xf) );
  -             }
  -             encodedIndex += 3;
  -         }
  -         return decodedData;
  -     }
  -
  -     /**
  -      * Discards any whitespace from a base-64 encoded block.
  -      *
  -      * Any other non-base-64 characters will be silently
  -      * discarded. This complies with the RFC, although a warning or
  -      * exception would also be RFC compliant (and is actually
  -      * recommended).
  -      *
  -      * @param data The base-64 encoded data to discard the whitespace
  -      * from.
  -      * @return The data, less whitespace (see RFC 2045).
  -      */
  -     static byte[] discardWhitespace(byte[] data)
  -     {
  -         byte groomedData[] = new byte[data.length];
  -         int bytesCopied = 0;
  -
  -         for (int i = 0; i < data.length; i++)
  -         {
  -             switch (data[i])
  -             {
  -             case (byte) ' ':
  -             case (byte) '\n':
  -             case (byte) '\r':
  -             case (byte) '\t':
  -                 break;
  -             default:
  -                 if(isBase64(data[i])){
  -                    groomedData[bytesCopied++] = data[i];
  -                 }
  -                 else{
  -                     // according to the RFC, we could raise a warning
  -                     // or exception here
  -                 }
  -             }
  -         }
  +        byte[] result;
   
  -         byte packedData[] = new byte[bytesCopied];
  +        if (!isArrayByteBase64(pArray)) {
  +            throw new DecoderException(
  +                "Parameter supplied to "
  +                    + "Base64 "
  +                    + "decode is not a valid base64 data.");
  +        } else {
  +            result = base64decode((byte[]) pArray);
  +        }
   
  -         System.arraycopy(groomedData, 0, packedData,
  -                              0, bytesCopied);
  +        return (result);
  +    }
   
  -         return packedData;
  -     }
  -}
  +    /**
  +     * Encodes hex octects into Base64.
  +     *
  +     * @param binaryData Array containing binary data to encode.
  +     * @return Base64-encoded data.
  +     */
  +    public static byte[] base64(byte[] binaryData, boolean isChunked) {
  +        int lengthDataBits = binaryData.length * EIGHTBIT;
  +        int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
  +        int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
  +        byte encodedData[] = null;
  +        int encodedDataLength = 0;
  +        int nbrChunks = 0;
  +
  +        if (fewerThan24bits != 0) {
  +            //data not divisible by 24 bit
  +            encodedDataLength = (numberTriplets + 1) * 4;
  +        } else {
  +            // 16 or 8 bit
  +            encodedDataLength = numberTriplets * 4;
  +        }
  +
  +        // If the output is to be "chunked" into 76 character sections, 
  +        // for compliance with RFC 2045 MIME, then it is important to 
  +        // allow for extra length to account for the separator(s)
  +        if (isChunked) {
  +
  +            nbrChunks =
  +                (CHUNK_SEPARATOR.length == 0
  +                    ? 0
  +                    : (int) Math.ceil((float) encodedDataLength / CHUNK_SIZE));
  +            encodedDataLength += nbrChunks * CHUNK_SEPARATOR.length;
  +        }
  +
  +        encodedData = new byte[encodedDataLength];
  +
  +        byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
  +
  +        int encodedIndex = 0;
  +        int dataIndex = 0;
  +        int i = 0;
  +        int nextSeparatorIndex = CHUNK_SIZE;
  +        int chunksSoFar = 0;
  +
  +        //log.debug("number of triplets = " + numberTriplets);
  +        for (i = 0; i < numberTriplets; i++) {
  +            dataIndex = i * 3;
  +            b1 = binaryData[dataIndex];
  +            b2 = binaryData[dataIndex + 1];
  +            b3 = binaryData[dataIndex + 2];
  +
  +            //log.debug("b1= " + b1 +", b2= " + b2 + ", b3= " + b3);
  +
  +            l = (byte) (b2 & 0x0f);
  +            k = (byte) (b1 & 0x03);
  +
  +            byte val1 =
  +                ((b1 & SIGN) == 0)
  +                    ? (byte) (b1 >> 2)
  +                    : (byte) ((b1) >> 2 ^ 0xc0);
  +            byte val2 =
  +                ((b2 & SIGN) == 0)
  +                    ? (byte) (b2 >> 4)
  +                    : (byte) ((b2) >> 4 ^ 0xf0);
  +            byte val3 =
  +                ((b3 & SIGN) == 0)
  +                    ? (byte) (b3 >> 6)
  +                    : (byte) ((b3) >> 6 ^ 0xfc);
  +
  +            encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
  +            //log.debug( "val2 = " + val2 );
  +            //log.debug( "k4   = " + (k<<4) );
  +            //log.debug(  "vak  = " + (val2 | (k<<4)) );
  +            encodedData[encodedIndex + 1] =
  +                lookUpBase64Alphabet[val2 | (k << 4)];
  +            encodedData[encodedIndex + 2] =
  +                lookUpBase64Alphabet[(l << 2) | val3];
  +            encodedData[encodedIndex + 3] = lookUpBase64Alphabet[b3 & 0x3f];
  +
  +            encodedIndex += 4;
  +
  +            // If we are chunking, let's put a chunk separator down.
  +            if (isChunked) {
  +                // this assumes that CHUNK_SIZE % 4 == 0
  +                if (encodedIndex == nextSeparatorIndex) {
  +                    System.arraycopy(
  +                        CHUNK_SEPARATOR,
  +                        0,
  +                        encodedData,
  +                        encodedIndex,
  +                        CHUNK_SEPARATOR.length);
  +                    chunksSoFar++;
  +                    nextSeparatorIndex =
  +                        (CHUNK_SIZE * (chunksSoFar + 1))
  +                            + (chunksSoFar * CHUNK_SEPARATOR.length);
  +                    encodedIndex += CHUNK_SEPARATOR.length;
  +                }
  +            }
  +        }
  +
  +        // form integral number of 6-bit groups
  +        dataIndex = i * 3;
  +
  +        if (fewerThan24bits == EIGHTBIT) {
  +            b1 = binaryData[dataIndex];
  +            k = (byte) (b1 & 0x03);
  +            //log.debug("b1=" + b1);
  +            //log.debug("b1<<2 = " + (b1>>2) );
  +            byte val1 =
  +                ((b1 & SIGN) == 0)
  +                    ? (byte) (b1 >> 2)
  +                    : (byte) ((b1) >> 2 ^ 0xc0);
  +            encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
  +            encodedData[encodedIndex + 1] = lookUpBase64Alphabet[k << 4];
  +            encodedData[encodedIndex + 2] = PAD;
  +            encodedData[encodedIndex + 3] = PAD;
  +        } else if (fewerThan24bits == SIXTEENBIT) {
  +
  +            b1 = binaryData[dataIndex];
  +            b2 = binaryData[dataIndex + 1];
  +            l = (byte) (b2 & 0x0f);
  +            k = (byte) (b1 & 0x03);
  +
  +            byte val1 =
  +                ((b1 & SIGN) == 0)
  +                    ? (byte) (b1 >> 2)
  +                    : (byte) ((b1) >> 2 ^ 0xc0);
  +            byte val2 =
  +                ((b2 & SIGN) == 0)
  +                    ? (byte) (b2 >> 4)
  +                    : (byte) ((b2) >> 4 ^ 0xf0);
  +
  +            encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
  +            encodedData[encodedIndex + 1] =
  +                lookUpBase64Alphabet[val2 | (k << 4)];
  +            encodedData[encodedIndex + 2] = lookUpBase64Alphabet[l << 2];
  +            encodedData[encodedIndex + 3] = PAD;
  +        }
  +
  +        if (isChunked) {
  +            // we also add a separator to the end of the final chunk.
  +            if (chunksSoFar < nbrChunks)
  +                System.arraycopy(
  +                    CHUNK_SEPARATOR,
  +                    0,
  +                    encodedData,
  +                    encodedDataLength - CHUNK_SEPARATOR.length,
  +                    CHUNK_SEPARATOR.length);
  +        }
   
  +        return encodedData;
  +    }
   
  +    /**
  +     * Decodes Base64 data into octects
  +     *
  +     * @param binaryData Byte array containing Base64 data
  +     * @return Array containing decoded data.
  +     */
  +    public static byte[] base64decode(byte[] base64Data) {
  +        // RFC 2045 suggests line wrapping at (no more than) 76
  +        // characters -- we may have embedded whitespace.
  +        base64Data = discardWhitespace(base64Data);
  +
  +        // handle the edge case, so we don't have to worry about it later
  +        if (base64Data.length == 0) {
  +            return new byte[0];
  +        }
  +
  +        int numberQuadruple = base64Data.length / FOURBYTE;
  +        byte decodedData[] = null;
  +        byte b1 = 0, b2 = 0, b3 = 0, b4 = 0, marker0 = 0, marker1 = 0;
  +
  +        // Throw away anything not in base64Data
  +
  +        int encodedIndex = 0;
  +        int dataIndex = 0;
  +        {
  +            // this sizes the output array properly - rlw
  +            int lastData = base64Data.length;
  +            // ignore the '=' padding
  +            while (base64Data[lastData - 1] == PAD) {
  +                if (--lastData == 0) {
  +                    return new byte[0];
  +                }
  +            }
  +            decodedData = new byte[lastData - numberQuadruple];
  +        }
  +
  +        for (int i = 0; i < numberQuadruple; i++) {
  +            dataIndex = i * 4;
  +            marker0 = base64Data[dataIndex + 2];
  +            marker1 = base64Data[dataIndex + 3];
  +
  +            b1 = base64Alphabet[base64Data[dataIndex]];
  +            b2 = base64Alphabet[base64Data[dataIndex + 1]];
  +
  +            if (marker0 != PAD && marker1 != PAD) {
  +                //No PAD e.g 3cQl
  +                b3 = base64Alphabet[marker0];
  +                b4 = base64Alphabet[marker1];
  +
  +                decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
  +                decodedData[encodedIndex + 1] =
  +                    (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
  +                decodedData[encodedIndex + 2] = (byte) (b3 << 6 | b4);
  +            } else if (marker0 == PAD) {
  +                //Two PAD e.g. 3c[Pad][Pad]
  +                decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
  +            } else if (marker1 == PAD) {
  +                //One PAD e.g. 3cQ[Pad]
  +                b3 = base64Alphabet[marker0];
  +
  +                decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
  +                decodedData[encodedIndex + 1] =
  +                    (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
  +            }
  +            encodedIndex += 3;
  +        }
  +        return decodedData;
  +    }
   
  +    /**
  +     * Discards any whitespace from a base-64 encoded block.
  +     *
  +     * Any other non-base-64 characters will be silently
  +     * discarded. This complies with the RFC, although a warning or
  +     * exception would also be RFC compliant (and is actually
  +     * recommended).
  +     *
  +     * @param data The base-64 encoded data to discard the whitespace
  +     * from.
  +     * @return The data, less whitespace (see RFC 2045).
  +     */
  +    static byte[] discardWhitespace(byte[] data) {
  +        byte groomedData[] = new byte[data.length];
  +        int bytesCopied = 0;
  +
  +        for (int i = 0; i < data.length; i++) {
  +            switch (data[i]) {
  +                case (byte) ' ' :
  +                case (byte) '\n' :
  +                case (byte) '\r' :
  +                case (byte) '\t' :
  +                    break;
  +                default :
  +                    if (isBase64(data[i])) {
  +                        groomedData[bytesCopied++] = data[i];
  +                    } else {
  +                        // according to the RFC, we could raise a warning
  +                        // or exception here
  +                    }
  +            }
  +        }
   
  +        byte packedData[] = new byte[bytesCopied];
   
  +        System.arraycopy(groomedData, 0, packedData, 0, bytesCopied);
   
  +        return packedData;
  +    }
   
  +    // Implementation of the Encoder Interface
   
  +    /**
  +     * encode an Object
  +     */
  +    public Object encode(Object pObject) throws EncoderException {
  +
  +        Object result;
  +
  +        if (!(pObject instanceof byte[])) {
  +            throw new EncoderException(
  +                "Parameter supplied to "
  +                    + "Base64 "
  +                    + "encode is not a byte[]");
  +        } else {
  +            result = encode((byte[]) pObject);
  +        }
  +
  +        return result;
  +
  +    }
  +
  +    public byte[] encode(byte[] pArray) throws EncoderException {
  +        return (base64(pArray, false));
  +    }
  +
  +}
  
  
  
  1.4       +6 -6      jakarta-commons-sandbox/codec/src/test/org/apache/commons/codec/binary/TestBase64.java
  
  Index: TestBase64.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/codec/src/test/org/apache/commons/codec/binary/TestBase64.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestBase64.java	16 Feb 2003 19:04:04 -0000	1.3
  +++ TestBase64.java	25 Feb 2003 04:18:01 -0000	1.4
  @@ -121,7 +121,7 @@
               byte[] data = new byte[i];
               _random.nextBytes(data);
               byte[] enc =  Base64.base64(data);
  -            assertTrue("\"" + (new String(enc)) + "\" is Base64 data.",Base64.isBase64((new String(enc))));
  +            assertTrue("\"" + (new String(enc)) + "\" is Base64 data.",Base64.isArrayByteBase64(enc) );
               byte[] data2 = Base64.base64decode(enc);
               assertTrue(toString(data) + " equals " + toString(data2),Arrays.equals(data,data2));
           }
  @@ -133,7 +133,7 @@
               byte[] data = new byte[_random.nextInt(10000)+1];
               _random.nextBytes(data);
               byte[] enc =  Base64.base64(data);
  -            assertTrue(Base64.isBase64(new String(enc)));
  +            assertTrue(Base64.isArrayByteBase64(enc));
               byte[] data2 = Base64.base64decode(enc);
               assertTrue(Arrays.equals(data,data2));
           }
  
  
  

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