Author: ggregory
Date: Mon May 16 21:46:36 2016
New Revision: 1744153
URL: http://svn.apache.org/viewvc?rev=1744153&view=rev
Log:
[CODEC-219] Don't deprecate Charsets Charset constants in favor of Java 7's
java.nio.charset.StandardCharsets
Modified:
commons/proper/codec/trunk/src/changes/changes.xml
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/Charsets.java
Modified: commons/proper/codec/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/changes/changes.xml?rev=1744153&r1=1744152&r2=1744153&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/changes/changes.xml (original)
+++ commons/proper/codec/trunk/src/changes/changes.xml Mon May 16 21:46:36 2016
@@ -47,6 +47,7 @@ The <action> type attribute can be add,u
<action dev="ggregory" type="fix" issue="CODEC-207" due-to="Gary
Gregory">Charsets Javadoc breaks build when using Java 8</action>
<action dev="ggregory" type="fix" issue="CODEC-199" due-to="Yossi
Tamari">Bug in HW rule in Soundex</action>
<action dev="ggregory" type="fix" issue="CODEC-209" due-to="Gary
Gregory">Javadoc for SHA-224 DigestUtils methods should mention Java 1.8.0
restriction instead of 1.4.0.</action>
+ <action dev="ggregory" type="fix" issue="CODEC-219" due-to="Gary
Gregory">Don't deprecate Charsets Charset constants in favor of Java 7's
java.nio.charset.StandardCharsets</action>
<action dev="ggregory" type="add" issue="CODEC-218" due-to="Gary
Gregory">Refactor HmacUtils methods into the HmacAlgorithms enum</action>
<action dev="ggregory" type="add" issue="CODEC-217" due-to="Gary
Gregory">Add HmacAlgorithms.HMAC_SHA_224 (Java 8 only)</action>
<action dev="ggregory" type="add" issue="CODEC-213" due-to="Gary
Gregory">Support JEP 287: SHA-3 Hash Algorithms</action>
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/Charsets.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/Charsets.java?rev=1744153&r1=1744152&r2=1744153&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/Charsets.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/Charsets.java
Mon May 16 21:46:36 2016
@@ -91,22 +91,26 @@ public class Charsets {
* CharEncodingISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1.
* <p>
* Every implementation of the Java platform is required to support this
character encoding.
+ * </p>
+ * <p>
+ * On Java, use {@link java.nio.charset.StandardCharsets#ISO_8859_1}
instead.
+ * </p>
*
* @see <a
href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html";>Standard
charsets</a>
- * @deprecated Use Java 7's {@link
java.nio.charset.StandardCharsets#ISO_8859_1} instead
*/
- @Deprecated
public static final Charset ISO_8859_1 =
Charset.forName(CharEncoding.ISO_8859_1);
/**
* Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin
block of the Unicode character set.
* <p>
* Every implementation of the Java platform is required to support this
character encoding.
+ * </p>
+ * <p>
+ * On Java, use {@link java.nio.charset.StandardCharsets#ISO_8859_1}
instead.
+ * </p>
*
* @see <a
href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html";>Standard
charsets</a>
- * @deprecated Use Java 7's {@link
java.nio.charset.StandardCharsets#US_ASCII} instead
*/
- @Deprecated
public static final Charset US_ASCII =
Charset.forName(CharEncoding.US_ASCII);
/**
@@ -114,43 +118,51 @@ public class Charsets {
* (either order accepted on input, big-endian used on output)
* <p>
* Every implementation of the Java platform is required to support this
character encoding.
+ * </p>
+ * <p>
+ * On Java, use {@link java.nio.charset.StandardCharsets#ISO_8859_1}
instead.
+ * </p>
*
* @see <a
href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html";>Standard
charsets</a>
- * @deprecated Use Java 7's {@link
java.nio.charset.StandardCharsets#UTF_16} instead
*/
- @Deprecated
public static final Charset UTF_16 = Charset.forName(CharEncoding.UTF_16);
/**
* Sixteen-bit Unicode Transformation Format, big-endian byte order.
* <p>
* Every implementation of the Java platform is required to support this
character encoding.
+ * </p>
+ * <p>
+ * On Java, use {@link java.nio.charset.StandardCharsets#ISO_8859_1}
instead.
+ * </p>
*
* @see <a
href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html";>Standard
charsets</a>
- * @deprecated Use Java 7's {@link
java.nio.charset.StandardCharsets#UTF_16BE} instead
*/
- @Deprecated
public static final Charset UTF_16BE =
Charset.forName(CharEncoding.UTF_16BE);
/**
* Sixteen-bit Unicode Transformation Format, little-endian byte order.
* <p>
* Every implementation of the Java platform is required to support this
character encoding.
+ * </p>
+ * <p>
+ * On Java, use {@link java.nio.charset.StandardCharsets#ISO_8859_1}
instead.
+ * </p>
*
* @see <a
href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html";>Standard
charsets</a>
- * @deprecated Use Java 7's {@link
java.nio.charset.StandardCharsets#UTF_16LE} instead
*/
- @Deprecated
public static final Charset UTF_16LE =
Charset.forName(CharEncoding.UTF_16LE);
/**
* Eight-bit Unicode Transformation Format.
* <p>
* Every implementation of the Java platform is required to support this
character encoding.
+ * </p>
+ * <p>
+ * On Java, use {@link java.nio.charset.StandardCharsets#ISO_8859_1}
instead.
+ * </p>
*
* @see <a
href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html";>Standard
charsets</a>
- * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets#UTF_8}
*/
- @Deprecated
public static final Charset UTF_8 = Charset.forName(CharEncoding.UTF_8);
}
