[CODEC-124] Remove deprecated code for 2.0.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1125236 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

pom.xml

@@ -249,6 +249,7 @@
         <configuration>
           <xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
           <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
+          <!-- TODO: <onlyCurrentVersion>true</onlyCurrentVersion> -->
         </configuration>
         <reportSets>
           <reportSet>

src/java/org/apache/commons/codec/StringEncoderComparator.java

@@ -34,17 +34,6 @@ public class StringEncoderComparator implements Comparator {
      */
     private final StringEncoder stringEncoder;
 
-    /**
-     * Constructs a new instance.
-     * 
-     * @deprecated Creating an instance without a {@link StringEncoder} leads to a {@link NullPointerException}. Will be
-     *             removed in 2.0.
-     */
-    @Deprecated
-    public StringEncoderComparator() {
-        this.stringEncoder = null; // Trying to use this will cause things to break
-    }
-
     /**
      * Constructs a new instance with the given algorithm.
      * 

src/java/org/apache/commons/codec/binary/Base64.java

@@ -492,21 +492,6 @@ public static boolean isBase64(byte octet) {
     public static boolean isBase64(String base64) {
         return isBase64(StringUtils.getBytesUtf8(base64));
     }
-
-    /**
-     * Tests a given byte array to see if it contains only valid characters within the Base64 alphabet. Currently the
-     * method treats whitespace as valid.
-     * 
-     * @param arrayOctet
-     *            byte array to test
-     * @return <code>true</code> if all bytes are valid characters in the Base64 alphabet or if the byte array is empty;
-     *         <code>false</code>, otherwise
-     * @deprecated 1.5 Use {@link #isBase64(byte[])}, will be removed in 2.0.
-     */
-    @Deprecated
-    public static boolean isArrayByteBase64(byte[] arrayOctet) {
-        return isBase64(arrayOctet);
-    }
 
     /**
      * Tests a given byte array to see if it contains only valid characters within the Base64 alphabet. Currently the

src/java/org/apache/commons/codec/language/Caverphone.java

@@ -80,14 +80,6 @@ public int difference(String s1, String s2) throws EncoderException {
         return SoundexUtils.difference(this, s1, s2);
     }
 
-    /**
-     * The maximum length of a Soundex code - Soundex codes are only four characters by definition.
-     * 
-     * @deprecated This feature is not needed since the encoding size must be constant. Will be removed in 2.0.
-     */
-    @Deprecated
-    private int maxLength = 4;
-
     /**
      * Every letter of the alphabet is "mapped" to a numerical value. This char array holds the values to which each
      * letter is mapped. This implementation contains a default map for US_ENGLISH
@@ -194,17 +186,6 @@ private char getMappingCode(String str, int index) {
         return mappedChar;
     }
 
-    /**
-     * Returns the maxLength. Standard Soundex
-     * 
-     * @deprecated This feature is not needed since the encoding size must be constant. Will be removed in 2.0.
-     * @return int
-     */
-    @Deprecated
-    public int getMaxLength() {
-        return this.maxLength;
-    }
-
     /**
      * Returns the soundex mapping.
      * 
@@ -231,18 +212,6 @@ private char map(char ch) {
         return this.getSoundexMapping()[index];
     }
 
-    /**
-     * Sets the maxLength.
-     * 
-     * @deprecated This feature is not needed since the encoding size must be constant. Will be removed in 2.0.
-     * @param maxLength
-     *                  The maxLength to set
-     */
-    @Deprecated
-    public void setMaxLength(int maxLength) {
-        this.maxLength = maxLength;
-    }
-
     /**
      * Retrieves the Soundex code for a given String object.
      * 

src/java/org/apache/commons/codec/language/Soundex.java

@@ -338,18 +338,6 @@ public Object decode(Object pObject) throws DecoderException {
         }
     }
 
-    /**
-     * The <code>String</code> encoding used for decoding and encoding.
-     * 
-     * @return Returns the encoding.
-     * 
-     * @deprecated Use {@link #getDefaultCharset()}, will be removed in 2.0.
-     */
-    @Deprecated
-    public String getEncoding() {
-        return this.charset;
-    }
-
     /**
      * The default charset used for string decoding and encoding.
      *

src/java/org/apache/commons/codec/net/URLCodec.java

@@ -36,11 +36,6 @@
  */
 public class StringEncoderComparatorTest {
 
-    @Test
-    public void testComparatorNoArgCon() throws Exception {
-        new StringEncoderComparator();
-    }        
-
     @Test
     public void testComparatorWithSoundex() throws Exception {
         StringEncoderComparator sCompare =