improve readability

apache · Feb 28, 2024 · 5f4a25e · 5f4a25e
1 parent 45c8d2c
commit 5f4a25e
Showing 1 changed file with 31 additions and 36 deletions.
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
@@ -18,26 +18,6 @@
  */
 package org.apache.myfaces.context.servlet;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
-
 import jakarta.faces.FacesException;
 import jakarta.faces.FactoryFinder;
 import jakarta.faces.context.FacesContext;
@@ -56,14 +36,33 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
-
 import org.apache.myfaces.config.webparameters.MyfacesConfig;
 import org.apache.myfaces.context.flash.FlashImpl;
 import org.apache.myfaces.core.api.shared.lang.Assert;
-import org.apache.myfaces.util.lang.EnumerationIterator;
 import org.apache.myfaces.core.api.shared.lang.SharedStringBuilder;
+import org.apache.myfaces.util.lang.EnumerationIterator;
 import org.apache.myfaces.util.lang.StringUtils;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+
 /**
  * Implements the external context for servlet request. Faces 1.2, 6.1.3
  *
@@ -75,10 +74,6 @@ public final class ServletExternalContextImpl extends ServletExternalContextImpl
 {
     private static final Logger log = Logger.getLogger(ServletExternalContextImpl.class.getName());
 
-    private static final String URL_PARAM_SEPERATOR="&";
-    private static final char URL_QUERY_SEPERATOR='?';
-    private static final char URL_FRAGMENT_SEPERATOR='#';
-    private static final String URL_NAME_VALUE_PAIR_SEPERATOR="=";
     private static final String PUSHED_RESOURCE_URLS = "oam.PUSHED_RESOURCE_URLS";
     private static final String PUSH_SUPPORTED = "oam.PUSH_SUPPORTED";
     private static final String SB_ENCODE_URL = ServletExternalContextImpl.class.getName() + "#encodeURL";
@@ -875,23 +870,23 @@ private String encodeURL(String baseUrl, Map<String, List<String>> parameters)
         Map<String, List<String>> paramMap = null;
 
         //extract any URL fragment
-        int index = baseUrl.indexOf(URL_FRAGMENT_SEPERATOR);
+        int index = baseUrl.indexOf('#');
         if (index != -1)
         {
-            fragment = baseUrl.substring(index+1);
-            baseUrl = baseUrl.substring(0,index);
+            fragment = baseUrl.substring(index + 1);
+            baseUrl = baseUrl.substring(0, index);
         }
 
         //extract the current query string and add the params to the paramMap
-        index = baseUrl.indexOf(URL_QUERY_SEPERATOR);
+        index = baseUrl.indexOf('?');
         if (index != -1)
         {
             queryString = baseUrl.substring(index + 1);
             baseUrl = baseUrl.substring(0, index);
-            String[] nameValuePairs = queryString.split(URL_PARAM_SEPERATOR);
+            String[] nameValuePairs = queryString.split("&");
             for (int i = 0; i < nameValuePairs.length; i++)
             {
-                String[] currentPair = nameValuePairs[i].split(URL_NAME_VALUE_PAIR_SEPERATOR);
+                String[] currentPair = nameValuePairs[i].split("=");
                 String currentName = currentPair[0];
 
                 if (paramMap == null)
@@ -985,16 +980,16 @@ private String encodeURL(String baseUrl, Map<String, List<String>> parameters)
 
                     if (!isFirstPair)
                     {
-                        newUrl.append(URL_PARAM_SEPERATOR);
+                        newUrl.append('&');
                     }
                     else
                     {
-                        newUrl.append(URL_QUERY_SEPERATOR);
+                        newUrl.append('?');
                         isFirstPair = false;
                     }
 
                     newUrl.append(pair.getKey());
-                    newUrl.append(URL_NAME_VALUE_PAIR_SEPERATOR);
+                    newUrl.append('=');
                     if (value != null)
                     {
                         try
@@ -1015,7 +1010,7 @@ private String encodeURL(String baseUrl, Map<String, List<String>> parameters)
         //add the fragment back on (if any)
         if (fragment != null)
         {
-            newUrl.append(URL_FRAGMENT_SEPERATOR);
+            newUrl.append('#');
             newUrl.append(fragment);
         }