XWIKI-16181: DefaultHTMLDisplayer#getTemplate shouldn't create path with special characters

  * Use a more easy to read replacement path

xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-html/src/main/java/org/xwiki/rendering/display/html/internal/DefaultTemplateHTMLDisplayer.java

@@ -64,16 +64,6 @@ public class DefaultTemplateHTMLDisplayer implements HTMLDisplayer<Object>
      */
     public static final String TEMPLATE_EXTENSION = ".vm";
 
-    /**
-     * A regular expression specifying what are the special characters that have to be replaced in created paths.
-     */
-    private static final String SPECIAL_CHARACTERS_TO_REPLACE = "[<>? ]";
-
-    /**
-     * The replacement character used to clean paths from special characters.
-     */
-    private static final String REPLACEMENT_CHARACTER = ".";
-
     @Inject
     protected TemplateManager templateManager;
 
@@ -164,7 +154,7 @@ private Template getTemplate(Type type, String mode)
 
     private String cleanPath(String path)
     {
-        return path.replaceAll(SPECIAL_CHARACTERS_TO_REPLACE, REPLACEMENT_CHARACTER);
+        return path.replaceAll("<", "(").replaceAll(">", ")").replaceAll("\\?", "_").replaceAll(" ", "");
     }
 
     private List<String> getTemplatePaths(Type type, String mode)

xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-html/src/test/java/org/xwiki/rendering/display/html/internal/DefaultTemplateHTMLDisplayerTest.java

@@ -123,8 +123,8 @@ public void getTemplateWithNullValueAndSpecialTypeTest() throws Exception
     {
         this.defaultTemplateHTMLDisplayer.display(new DefaultParameterizedType(null, List.class, Block.class), null);
         verify(this.templateManager)
-            .getTemplate("html_displayer/java.util.list.org.xwiki.rendering.block.block./view.vm");
-        verify(this.templateManager).getTemplate("html_displayer/java.util.list.org.xwiki.rendering.block.block..vm");
+            .getTemplate("html_displayer/java.util.list(org.xwiki.rendering.block.block)/view.vm");
+        verify(this.templateManager).getTemplate("html_displayer/java.util.list(org.xwiki.rendering.block.block).vm");
         verify(this.templateManager).getTemplate("html_displayer/view.vm");
         verify(this.templateManager).getTemplate("html_displayer/default.vm");
     }