[CODEC-178] Deprecate Charsets Charset constants in favor of Java 7's java.nio.charset.StandardCharsets.

garydgregory · garydgregory · commit 66436373d83a · 2014-01-28T15:39:59.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1562097 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -43,6 +43,7 @@ The <action> type attribute can be add,update,fix,remove.
   </properties>
   <body>
     <release version="1.10" date="DD Mmmm 2014" description="Feature and fix release."> 
+      <action dev="ggregory" type="update" issue="CODEC-178">Deprecate Charsets Charset constants in favor of Java 7's java.nio.charset.StandardCharsets</action>   
     </release>
     <release version="1.9" date="20 December 2013" description="Feature and fix release."> 
       <action dev="ggregory" type="update" issue="CODEC-174" due-to="Thomas Champagne">Improve performance of Beider Morse encoder</action>   
diff --git a/src/main/java/org/apache/commons/codec/Charsets.java b/src/main/java/org/apache/commons/codec/Charsets.java
@@ -93,7 +93,9 @@ public static Charset toCharset(final String charset) {
      * Every implementation of the Java platform is required to support this character encoding.
      *
      * @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}
      */
+    @Deprecated
     public static final Charset ISO_8859_1 = Charset.forName(CharEncoding.ISO_8859_1);
 
     /**
@@ -102,7 +104,9 @@ public static Charset toCharset(final String charset) {
      * Every implementation of the Java platform is required to support this character encoding.
      *
      * @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}
      */
+    @Deprecated
     public static final Charset US_ASCII = Charset.forName(CharEncoding.US_ASCII);
 
     /**
@@ -112,7 +116,9 @@ public static Charset toCharset(final String charset) {
      * Every implementation of the Java platform is required to support this character encoding.
      *
      * @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}
      */
+    @Deprecated
     public static final Charset UTF_16 = Charset.forName(CharEncoding.UTF_16);
 
     /**
@@ -121,7 +127,9 @@ public static Charset toCharset(final String charset) {
      * Every implementation of the Java platform is required to support this character encoding.
      *
      * @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}
      */
+    @Deprecated
     public static final Charset UTF_16BE = Charset.forName(CharEncoding.UTF_16BE);
 
     /**
@@ -130,7 +138,9 @@ public static Charset toCharset(final String charset) {
      * Every implementation of the Java platform is required to support this character encoding.
      *
      * @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}
      */
+    @Deprecated
     public static final Charset UTF_16LE = Charset.forName(CharEncoding.UTF_16LE);
 
     /**
@@ -139,6 +149,8 @@ public static Charset toCharset(final String charset) {
      * Every implementation of the Java platform is required to support this character encoding.
      *
      * @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}
      */
+    @Deprecated
     public static final Charset UTF_8 = Charset.forName(CharEncoding.UTF_8);
 }
