You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2017/01/07 16:04:33 UTC
svn commit: r1777819 - in /maven/doxia/doxia/trunk/doxia-core/src:
main/java/org/apache/maven/doxia/util/DoxiaUtils.java
test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
Author: michaelo
Date: Sat Jan 7 16:04:33 2017
New Revision: 1777819
URL: http://svn.apache.org/viewvc?rev=1777819&view=rev
Log:
[DOXIA-546] DoxiaUtils#encodeId() produces invalid id
Simply use a dot instead of percent sign
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java?rev=1777819&r1=1777818&r2=1777819&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java Sat Jan 7 16:04:33 2017
@@ -259,16 +259,8 @@ public class DoxiaUtils
for ( int j = 0; j < bytes.length; ++j )
{
- String hex = byteToHex( bytes[j] );
-
- buffer.append( '%' );
-
- if ( hex.length() == 1 )
- {
- buffer.append( '0' );
- }
-
- buffer.append( hex );
+ buffer.append( '.' );
+ buffer.append( String.format( "%02X", bytes[j] ) );
}
}
}
Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java?rev=1777819&r1=1777818&r2=1777819&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java Sat Jan 7 16:04:33 2017
@@ -159,10 +159,10 @@ public class DoxiaUtilsTest
assertEquals( DoxiaUtils.encodeId( "a b-c123 " ), "a_b-c123" );
assertEquals( DoxiaUtils.encodeId( " anchor" ), "anchor" );
assertEquals( DoxiaUtils.encodeId( "myAnchor" ), "myAnchor" );
- assertEquals( DoxiaUtils.encodeId( "my&Anchor" ), "my%26Anchor" );
- assertEquals( DoxiaUtils.encodeId( "H\u00E5kon" ), "H%c3%a5kon" );
+ assertEquals( DoxiaUtils.encodeId( "my&Anchor" ), "my.26Anchor" );
+ assertEquals( DoxiaUtils.encodeId( "H\u00E5kon" ), "H.C3.A5kon" );
assertEquals( DoxiaUtils.encodeId( "H\u00E5kon", true ), "Hkon" );
- assertEquals( DoxiaUtils.encodeId( "Theu\u00DFl" ), "Theu%c3%9fl" );
+ assertEquals( DoxiaUtils.encodeId( "Theu\u00DFl" ), "Theu.C3.9Fl" );
assertEquals( DoxiaUtils.encodeId( "Theu\u00DFl", true ), "Theul" );
}
@@ -188,6 +188,8 @@ public class DoxiaUtilsTest
assertTrue( DoxiaUtils.isValidId( "a." ) );
assertTrue( DoxiaUtils.isValidId( "index.html" ) );
assertFalse( DoxiaUtils.isValidId( "Theu\u00DFl" ) );
+ assertTrue( DoxiaUtils.isValidId( "Theu.C3.9Fl" ) );
+ assertFalse( DoxiaUtils.isValidId( "Theu%C3%9Fl" ) );
}
/**