Author: ggregory
Date: Fri May 20 05:10:48 2011
New Revision: 1125236
URL: http://svn.apache.org/viewvc?rev=1125236&view=rev
Log:
[CODEC-124] Remove deprecated code for 2.0.
Added:
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java
- copied, changed from r1095931,
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/CaverphoneTest.java
Removed:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Caverphone.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/CaverphoneTest.java
Modified:
commons/proper/codec/trunk/pom.xml
commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/URLCodec.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/URLCodecTest.java
Modified: commons/proper/codec/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=1125236&r1=1125235&r2=1125236&view=diff
==============================================================================
--- commons/proper/codec/trunk/pom.xml (original)
+++ commons/proper/codec/trunk/pom.xml Fri May 20 05:10:48 2011
@@ -249,6 +249,7 @@
<configuration>
<xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
+ <!-- TODO: <onlyCurrentVersion>true</onlyCurrentVersion> -->
</configuration>
<reportSets>
<reportSet>
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java?rev=1125236&r1=1125235&r2=1125236&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java
Fri May 20 05:10:48 2011
@@ -35,17 +35,6 @@ public class StringEncoderComparator imp
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.
*
* @param stringEncoder
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java?rev=1125236&r1=1125235&r2=1125236&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
Fri May 20 05:10:48 2011
@@ -492,21 +492,6 @@ public class Base64 extends BaseNCodec {
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
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.java?rev=1125236&r1=1125235&r2=1125236&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.java
Fri May 20 05:10:48 2011
@@ -81,14 +81,6 @@ public class Soundex implements StringEn
}
/**
- * 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
*/
@@ -195,17 +187,6 @@ public class Soundex implements StringEn
}
/**
- * 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.
*
* @return soundexMapping.
@@ -232,18 +213,6 @@ public class Soundex implements StringEn
}
/**
- * 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.
*
* @param str
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/URLCodec.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/URLCodec.java?rev=1125236&r1=1125235&r2=1125236&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/URLCodec.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/URLCodec.java
Fri May 20 05:10:48 2011
@@ -339,18 +339,6 @@ public class URLCodec implements BinaryE
}
/**
- * 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.
*
* @return the default string charset.
Modified:
commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java?rev=1125236&r1=1125235&r2=1125236&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java
(original)
+++
commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java
Fri May 20 05:10:48 2011
@@ -37,11 +37,6 @@ import org.junit.Test;
public class StringEncoderComparatorTest {
@Test
- public void testComparatorNoArgCon() throws Exception {
- new StringEncoderComparator();
- }
-
- @Test
public void testComparatorWithSoundex() throws Exception {
StringEncoderComparator sCompare =
new StringEncoderComparator( new Soundex() );
Copied:
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java
(from r1095931,
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/CaverphoneTest.java)
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java?p2=commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java&p1=commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/CaverphoneTest.java&r1=1095931&r2=1125236&rev=1125236&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/CaverphoneTest.java
(original)
+++
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java
Fri May 20 05:10:48 2011
@@ -25,14 +25,17 @@ import org.apache.commons.codec.StringEn
import org.junit.Test;
/**
+ * Tests Caverphone2.
+ *
* @author Apache Software Foundation
* @version $Id$
+ * @since 1.5
*/
-public class CaverphoneTest extends StringEncoderAbstractTest {
+public class Caverphone2Test extends StringEncoderAbstractTest {
@Override
protected StringEncoder createStringEncoder() {
- return new Caverphone();
+ return new Caverphone2();
}
/**
@@ -342,10 +345,10 @@ public class CaverphoneTest extends Stri
// Caverphone Revisited
@Test
- public void testIsCaverphoneEquals() {
- Caverphone caverphone = new Caverphone();
- Assert.assertFalse("Caverphone encodings should not be equal",
caverphone.isCaverphoneEqual("Peter", "Stevenson"));
- Assert.assertTrue("Caverphone encodings should be equal",
caverphone.isCaverphoneEqual("Peter", "Peady"));
+ public void testIsCaverphoneEquals() throws EncoderException {
+ Caverphone2 caverphone = new Caverphone2();
+ Assert.assertFalse("Caverphone encodings should not be equal",
caverphone.isEncodeEqual("Peter", "Stevenson"));
+ Assert.assertTrue("Caverphone encodings should be equal",
caverphone.isEncodeEqual("Peter", "Peady"));
}
@Test
Modified:
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java?rev=1125236&r1=1125235&r2=1125236&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java
(original)
+++
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java
Fri May 20 05:10:48 2011
@@ -279,20 +279,6 @@ public class SoundexTest extends StringE
"SILLER"}));
}
- @Test
- public void testMaxLength() throws Exception {
- Soundex soundex = new Soundex();
- soundex.setMaxLength(soundex.getMaxLength());
- Assert.assertEquals("S460", this.getSoundexEncoder().encode("Sgler"));
- }
-
- @Test
- public void testMaxLengthLessThan3Fix() throws Exception {
- Soundex soundex = new Soundex();
- soundex.setMaxLength(2);
- Assert.assertEquals("S460", soundex.encode("SCHELLER"));
- }
-
/**
* Examples for MS SQLServer from
*
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/tsqlref/ts_setu-sus_3o6w.asp
Modified:
commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/URLCodecTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/URLCodecTest.java?rev=1125236&r1=1125235&r2=1125236&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/URLCodecTest.java
(original)
+++
commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/URLCodecTest.java
Fri May 20 05:10:48 2011
@@ -46,7 +46,7 @@ public class URLCodecTest {
};
private void validateState(URLCodec urlCodec) {
- assertEquals(urlCodec.getEncoding(), urlCodec.getDefaultCharset());
+ // no tests for now.
}
private String constructString(int [] unicodeChars) {
