[DOXIA-549] Deprecate and replace DoxiaUtils#byteToHex() with String#format()
git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia/trunk@1777821 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java b/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
index b50c4b6..3fb4dee 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
@@ -275,7 +275,9 @@
* @return the result of Integer.toHexString( b & 0xFF ).
*
* @since 1.1.1
+ * @deprecated Use {@code String.format( "%02X", bytes[j] )}
*/
+ @Deprecated
public static String byteToHex( final byte b )
{
return Integer.toHexString( b & MINUS_ONE );
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
index 39fceb0..6e045db 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
@@ -366,14 +366,8 @@
for ( int j = 0; j < bytes.length; ++j )
{
- String hex = DoxiaUtils.byteToHex( bytes[j] );
-
encoded.append( '%' );
- if ( hex.length() == 1 )
- {
- encoded.append( '0' );
- }
- encoded.append( hex );
+ encoded.append( String.format( "%02X", bytes[j] ) );
}
}
}
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
index 923e9ef..153bde9 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/util/HtmlToolsTest.java
@@ -124,7 +124,7 @@
"http://www.example.com/?This%20is%20a%20simple%20&%20short%20test." );
String url = "\uD808\uDF45";
- assertEquals( HtmlTools.encodeURL( url ), URLEncoder.encode( url, "UTF-8" ).toLowerCase( Locale.ENGLISH ) );
+ assertEquals( HtmlTools.encodeURL( url ), URLEncoder.encode( url, "UTF-8" ) );
}
/**
