[wicket] branch wicket-9.x updated: WICKET-6979 Cut back slightly on some String instance creation in PageInfo (#522)

[theigl]

This is an automated email from the ASF dual-hosted git repository.

theigl pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/wicket-9.x by this push:
     new 240623fb81 WICKET-6979 Cut back slightly on some String instance 
creation in PageInfo (#522)
240623fb81 is described below

commit 240623fb81996012bdb0be3275f1ce8b986a3e11
Author: Alan Stange <asta...@gmail.com>
AuthorDate: Mon May 16 16:39:37 2022 -0400

    WICKET-6979 Cut back slightly on some String instance creation in PageInfo 
(#522)
    
    (cherry picked from commit 69b2b0188a3081947829f1d424e1b2d19617ea1e)
---
 .../apache/wicket/request/mapper/info/ComponentInfo.java |  5 +++--
 .../wicket/request/mapper/info/PageComponentInfo.java    | 16 +++++-----------
 .../org/apache/wicket/request/mapper/info/PageInfo.java  | 13 ++++---------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git 
a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
 
b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
index 909d8dc1c3..fdbbef05ab 100644
--- 
a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
+++ 
b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
@@ -167,7 +167,8 @@ public class ComponentInfo
        @Override
        public String toString()
        {
-               StringBuilder result = new StringBuilder();
+               String path = encodeComponentPath(componentPath);
+               StringBuilder result = new StringBuilder(path.length() + 12);
 
                if (renderCount != null)
                {
@@ -183,7 +184,7 @@ public class ComponentInfo
                        result.append(behaviorId);
                }
                result.append(SEPARATOR);
-               result.append(encodeComponentPath(componentPath));
+               result.append(path);
 
                return result.toString();
        }
diff --git 
a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java
 
b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java
index 7575fe1daf..7a77cedff5 100644
--- 
a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java
+++ 
b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java
@@ -35,7 +35,7 @@ public class PageComponentInfo
 
        /**
         * Construct.
-        * 
+        *
         * @param pageInfo
         * @param componentInfo
         */
@@ -69,23 +69,18 @@ public class PageComponentInfo
        @Override
        public String toString()
        {
-               StringBuilder result = new StringBuilder();
-               if (pageInfo != null)
-               {
-                       result.append(pageInfo.toString());
-               }
+               String result = pageInfo.toString();
                if (componentInfo != null)
                {
-                       result.append(SEPARATOR);
-                       result.append(componentInfo);
+                       result = result + SEPARATOR + componentInfo;
                }
 
-               return result.toString();
+               return result;
        }
 
        /**
         * Parses the given string
-        * 
+        *
         * @param s
         * @return {@link PageComponentInfo} or <code>null</code> if the string 
is not in valid format.
         */
@@ -101,7 +96,6 @@ public class PageComponentInfo
 
                int i = s.indexOf(SEPARATOR);
                if (i == -1)
-
                {
                        pageInfo = PageInfo.parse(s);
                        componentInfo = null;
diff --git 
a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
 
b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
index 89ab035123..02603ec843 100644
--- 
a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
+++ 
b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
@@ -29,15 +29,17 @@ import org.apache.wicket.util.string.Strings;
 public class PageInfo
 {
        private final Integer pageId;
+       private final String stringId;
 
        /**
         * Construct.
-        * 
+        *
         * @param pageId
         */
        public PageInfo(final Integer pageId)
        {
                this.pageId = pageId;
+               stringId = (pageId == null) ? "" : pageId.toString();
        }
 
        /**
@@ -62,14 +64,7 @@ public class PageInfo
        @Override
        public String toString()
        {
-               if (getPageId() == null)
-               {
-                       return "";
-               }
-               else
-               {
-                       return getPageId().toString();
-               }
+               return stringId;
        }