GTNPORTAL-3571: Improve as much as possible the performance of the Router

component/web/controller/src/main/java/org/exoplatform/web/controller/router/BitStack.java

@@ -29,16 +29,16 @@ class BitStack {
     private static class Frame {
 
         /** . */
-        private Frame previous;
+        Frame previous;
 
         /** . */
-        private Frame next;
+        Frame next;
 
         /** . */
-        private long bits;
+        long bits;
 
         /** . */
-        private int cardinality;
+        int cardinality;
 
         private Frame() {
             this(0, 0);

component/web/controller/src/main/java/org/exoplatform/web/controller/router/PercentEncoding.java

@@ -19,13 +19,13 @@
 
 package org.exoplatform.web.controller.router;
 
-import java.io.IOException;
-import java.util.BitSet;
-
 import org.exoplatform.commons.utils.CharEncoder;
 import org.exoplatform.commons.utils.CharsetCharEncoder;
 import org.gatein.common.io.UndeclaredIOException;
 
+import java.io.IOException;
+import java.util.BitSet;
+
 /**
  * @author <a href="mailto:[email protected]">Julien Viet</a>
  */
@@ -123,13 +123,15 @@ public final class PercentEncoding {
 
     /** . */
     private final BitSet allowed;
+    private final int length;
 
     private PercentEncoding(BitSet allowed) {
         this.allowed = allowed;
+        this.length = allowed.length();
     }
 
     boolean accept(char c) {
-        return c < allowed.length() && allowed.get(c);
+        return c < length && allowed.get(c);
     }
 
     public void encode(CharSequence s, Appendable appendable) throws IOException {

component/web/controller/src/main/java/org/exoplatform/web/controller/router/RenderContext.java

@@ -19,11 +19,11 @@
 
 package org.exoplatform.web.controller.router;
 
+import org.exoplatform.web.controller.QualifiedName;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import org.exoplatform.web.controller.QualifiedName;
-
 /**
  * The render context used to compute the rendering of a parameter map.
  *
@@ -75,7 +75,7 @@ public void remove(String match) {
     private final Map<QualifiedName, Parameter> parameters;
 
     /** . */
-    private BitStack stack = new BitStack();
+    BitStack stack = new BitStack();
 
     /** . */
     Regex.Matcher[] matchers;

component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java

@@ -135,10 +135,10 @@ public String toString() {
     private static final RequestParam[] EMPTY_REQUEST_PARAM_ARRAY = new RequestParam[0];
 
     /** . */
-    private final Router router;
+    final Router router;
 
     /** . */
-    private Route parent;
+    Route parent;
 
     /** . */
     private boolean terminal;
@@ -156,7 +156,7 @@ public String toString() {
     private Map<String, RequestParam> requestParamMap;
 
     /** . */
-    private RequestParam[] requestParamArray;
+    RequestParam[] requestParamArray;
 
     Route(Router router) {
         this.router = router;
@@ -325,8 +325,9 @@ private RouteMatch _find(RenderContext context) {
         // Match first the static parameteters
         for (RouteParam param : routeParamArray) {
             RenderContext.Parameter entry = context.getParameter(param.name);
-            if (entry != null && !entry.isMatched() && param.value.equals(entry.getValue())) {
-                entry.remove(entry.getValue());
+            String value;
+            if (entry != null && !entry.isMatched() && param.value.equals(value = entry.getValue())) {
+                entry.remove(value);
             } else {
                 return null;
             }
@@ -370,8 +371,9 @@ private RouteMatch _find(RenderContext context) {
                         case PRESERVE_PATH:
                             for (int j = 0; j < param.matchingRegex.length; j++) {
                                 Regex renderingRegex = param.matchingRegex[j];
-                                if (context.matcher(renderingRegex).matches(s.getValue())) {
-                                    matched = param.templatePrefixes[j] + s.getValue() + param.templateSuffixes[j];
+                                String value;
+                                if (context.matcher(renderingRegex).matches(value = s.getValue())) {
+                                    matched = param.templatePrefixes[j] + value + param.templateSuffixes[j];
                                     break;
                                 }
                             }