HBASE-29026 Remove apache commons text, use org.apache.commons.text.S…

…tringEscapeUtils again to avoid having another dependency.
apache · Jan 20, 2025 · d93981e · d93981e
1 parent 67e6f75
commit d93981e
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 35 deletions.
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
@@ -210,10 +210,6 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp
@@ -18,7 +18,7 @@
  */
 --%>
 <%@ page contentType="text/html;charset=UTF-8"
-  import="static org.apache.commons.text.StringEscapeUtils.escapeXml10"
+  import="static org.apache.commons.lang3.StringEscapeUtils.escapeXml"
   import="java.util.Collections"
   import="java.util.Comparator"
   import="java.util.Date"
@@ -152,13 +152,13 @@
       <tr>
         <td><%= proc.getProcId() %></td>
         <td><%= proc.hasParent() ? proc.getParentProcId() : "" %></td>
-        <td><%= escapeXml10(proc.getState().toString() + (proc.isBypass() ? "(Bypass)" : "")) %></td>
-        <td><%= proc.hasOwner() ? escapeXml10(proc.getOwner()) : "" %></td>
-        <td><%= escapeXml10(proc.getProcName()) %></td>
+        <td><%= escapeXml(proc.getState().toString() + (proc.isBypass() ? "(Bypass)" : "")) %></td>
+        <td><%= proc.hasOwner() ? escapeXml(proc.getOwner()) : "" %></td>
+        <td><%= escapeXml(proc.getProcName()) %></td>
         <td><%= new Date(proc.getSubmittedTime()) %></td>
         <td><%= new Date(proc.getLastUpdate()) %></td>
-        <td><%= escapeXml10(proc.isFailed() ? proc.getException().unwrapRemoteIOException().getMessage() : "") %></td>
-        <td><%= escapeXml10(proc.toString()) %></td>
+        <td><%= escapeXml(proc.isFailed() ? proc.getException().unwrapRemoteIOException().getMessage() : "") %></td>
+        <td><%= escapeXml(proc.toString()) %></td>
       </tr>
     <% } %>
     <%
@@ -192,7 +192,7 @@
       case EXCLUSIVE:
     %>
     <p>Lock type: EXCLUSIVE</p>
-    <p>Owner procedure: <%= escapeXml10(lockedResource.getExclusiveLockOwnerProcedure().toStringDetails()) %></p>
+    <p>Owner procedure: <%= escapeXml(lockedResource.getExclusiveLockOwnerProcedure().toStringDetails()) %></p>
     <%
         break;
       case SHARED:
@@ -211,7 +211,7 @@
         <table class="table table-striped" width="90%" >
         <% for (Procedure<?> proc : procedures) { %>
          <tr>
-            <td><%= escapeXml10(proc.toStringDetails()) %></td>
+            <td><%= escapeXml(proc.toStringDetails()) %></td>
           </tr>
         <% } %>
         </table>

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
@@ -18,7 +18,7 @@
  */
 --%>
 <%@ page contentType="text/html;charset=UTF-8"
-         import="static org.apache.commons.text.StringEscapeUtils.escapeXml10"
+         import="static org.apache.commons.lang3.StringEscapeUtils.escapeXml"
          import="java.util.Collections"
          import="java.util.Comparator"
          import="java.util.ArrayList"
@@ -107,7 +107,7 @@
                     <td></td>
                 <% } else { %>
                     <td><%= procedure.getProcId() %></td>
-                    <td><%= escapeXml10(procedure.getState().toString() + (procedure.isBypass() ? "(Bypassed)" : "")) %></td>
+                    <td><%= escapeXml(procedure.getState().toString() + (procedure.isBypass() ? "(Bypassed)" : "")) %></td>
                 <% } %>
 
                 <% RegionState rs = regionStateNode.toRegionState(); %>

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -18,7 +18,7 @@
  */
 --%>
 <%@ page contentType="text/html;charset=UTF-8"
-  import="static org.apache.commons.text.StringEscapeUtils.escapeXml10"
+  import="static org.apache.commons.lang3.StringEscapeUtils.escapeXml"
   import="java.net.URLEncoder"
   import="java.util.ArrayList"
   import="java.util.HashMap"
@@ -30,7 +30,7 @@
   import="java.util.Optional"
   import="java.util.TreeMap"
   import="java.util.concurrent.TimeUnit"
-  import="org.apache.commons.text.StringEscapeUtils"
+  import="org.apache.commons.lang3.StringEscapeUtils"
   import="org.apache.hadoop.conf.Configuration"
   import="org.apache.hadoop.hbase.HConstants"
   import="org.apache.hadoop.hbase.HRegionLocation"
@@ -371,16 +371,16 @@
                   }
                 %>
               <tr>
-                <td><%= escapeXml10(meta.getRegionNameAsString()) %></td>
+                <td><%= escapeXml(meta.getRegionNameAsString()) %></td>
                 <td><a href="http://<%= hostAndPort %>/rs-status"><%= StringEscapeUtils.escapeHtml4(hostAndPort) %></a></td>
                 <td><%= readReq%></td>
                 <td><%= writeReq%></td>
                 <td><%= fileSizeUncompressed%></td>
                 <td><%= fileSize%></td>
                 <td><%= fileCount%></td>
                 <td><%= memSize%></td>
-                <td><%= escapeXml10(Bytes.toString(meta.getStartKey())) %></td>
-                <td><%= escapeXml10(Bytes.toString(meta.getEndKey())) %></td>
+                <td><%= escapeXml(Bytes.toString(meta.getStartKey())) %></td>
+                <td><%= escapeXml(Bytes.toString(meta.getEndKey())) %></td>
                 <td><%= meta.getReplicaId() %></td>
               </tr>
             <%  } %>
@@ -428,7 +428,7 @@
                    }
                  %>
                <tr>
-                 <td><%= escapeXml10(meta.getRegionNameAsString()) %></td>
+                 <td><%= escapeXml(meta.getRegionNameAsString()) %></td>
                  <td><a href="http://<%= hostAndPort %>/rs-status"><%= StringEscapeUtils.escapeHtml4(hostAndPort) %></a></td>
                  <td><%= locality%></td>
                  <td><%= localityForSsd%></td>
@@ -485,7 +485,7 @@
                   }
             %>
               <tr>
-                <td><%= escapeXml10(meta.getRegionNameAsString()) %></td>
+                <td><%= escapeXml(meta.getRegionNameAsString()) %></td>
                 <td><a href="http://<%= hostAndPort %>/rs-status"><%= StringEscapeUtils.escapeHtml4(hostAndPort) %></a></td>
                 <td><%= String.format("%,1d", compactingCells)%></td>
                 <td><%= String.format("%,1d", compactedCells)%></td>
@@ -1021,16 +1021,16 @@
                     numRegionsRendered++;
               %>
               <tr>
-                <td><%= escapeXml10(Bytes.toStringBinary(regionInfo.getRegionName())) %></td>
+                <td><%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %></td>
                 <%= buildRegionDeployedServerTag(regionInfo, master, regionsToServer) %>
                 <td><%= readReq%></td>
                 <td><%= writeReq%></td>
                 <td><%= regionSizeUncompressed%></td>
                 <td><%= regionSize%></td>
                 <td><%= fileCount%></td>
                 <td><%= memSize%></td>
-                <td><%= escapeXml10(Bytes.toStringBinary(regionInfo.getStartKey()))%></td>
-                <td><%= escapeXml10(Bytes.toStringBinary(regionInfo.getEndKey()))%></td>
+                <td><%= escapeXml(Bytes.toStringBinary(regionInfo.getStartKey()))%></td>
+                <td><%= escapeXml(Bytes.toStringBinary(regionInfo.getEndKey()))%></td>
                 <td><%= state%></td>
                 <td><%= regionInfo.getReplicaId() %></td>
               </tr>
@@ -1067,7 +1067,7 @@
                     numRegionsRendered++;
               %>
               <tr>
-                <td><%= escapeXml10(Bytes.toStringBinary(regionInfo.getRegionName())) %></td>
+                <td><%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %></td>
                 <%= buildRegionDeployedServerTag(regionInfo, master, regionsToServer) %>
                 <td><%= locality%></td>
                 <td><%= localityForSsd%></td>
@@ -1113,7 +1113,7 @@
                     numRegionsRendered++;
               %>
               <tr>
-                <td><%= escapeXml10(Bytes.toStringBinary(regionInfo.getRegionName())) %></td>
+                <td><%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %></td>
                 <%= buildRegionDeployedServerTag(regionInfo, master, regionsToServer) %>
                 <td><%= String.format("%,1d", compactingCells)%></td>
                 <td><%= String.format("%,1d", compactedCells)%></td>

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
@@ -18,7 +18,7 @@
  */
 --%>
 <%@ page contentType="text/html;charset=UTF-8"
-         import="static org.apache.commons.text.StringEscapeUtils.escapeXml10"
+         import="static org.apache.commons.lang3.StringEscapeUtils.escapeXml"
          import="java.util.ArrayList"
          import="java.util.List"
 %>
@@ -54,7 +54,7 @@
     <% for (TableDescriptor htDesc : tables) { %>
     <tr>
       <td>
-        <a href="/table.jsp?name=<%= escapeXml10(htDesc.getTableName().getNameAsString()) %>"><%= escapeXml10(
+        <a href="/table.jsp?name=<%= escapeXml(htDesc.getTableName().getNameAsString()) %>"><%= escapeXml(
             htDesc.getTableName().getNameAsString()) %>
         </a></td>
       <td><%= htDesc.toString() %>

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp b/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp
@@ -18,7 +18,7 @@
  */
 --%>
 <%@ page contentType="text/html;charset=UTF-8"
-  import="org.apache.commons.text.StringEscapeUtils"
+  import="org.apache.commons.lang3.StringEscapeUtils"
   import="org.apache.hadoop.hbase.master.HMaster"
   import="org.apache.hadoop.hbase.zookeeper.ZKDump"
   import="org.apache.hadoop.hbase.zookeeper.ZKWatcher"

diff --git a/pom.xml b/pom.xml
@@ -849,7 +849,6 @@
     <commons-validator.version>1.7</commons-validator.version>
     <commons-io.version>2.14.0</commons-io.version>
     <commons-lang3.version>3.9</commons-lang3.version>
-    <commons-text.version>1.10.0</commons-text.version>
     <commons-math.version>3.6.1</commons-math.version>
     <commons-cli.version>1.5.0</commons-cli.version>
     <disruptor.version>3.4.4</disruptor.version>
@@ -1476,11 +1475,6 @@
         <artifactId>commons-lang3</artifactId>
         <version>${commons-lang3.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-text</artifactId>
-        <version>${commons-text.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-math3</artifactId>