From d93981ed8b7be1cd48ede47e532b20f4c46a0095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Paksy?= Date: Mon, 20 Jan 2025 11:33:19 +0100 Subject: [PATCH] HBASE-29026 Remove apache commons text, use org.apache.commons.text.StringEscapeUtils again to avoid having another dependency. --- hbase-server/pom.xml | 4 ---- .../hbase-webapps/master/procedures.jsp | 16 ++++++------- .../resources/hbase-webapps/master/rits.jsp | 4 ++-- .../resources/hbase-webapps/master/table.jsp | 24 +++++++++---------- .../hbase-webapps/master/tablesDetailed.jsp | 4 ++-- .../resources/hbase-webapps/master/zk.jsp | 2 +- pom.xml | 6 ----- 7 files changed, 25 insertions(+), 35 deletions(-) diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index b4853d72d501..7a1176c261da 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -210,10 +210,6 @@ org.apache.commons commons-lang3 - - org.apache.commons - commons-text - org.slf4j slf4j-api diff --git a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp index 0bc744150edc..accc9043e802 100644 --- 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 @@ <%= proc.getProcId() %> <%= proc.hasParent() ? proc.getParentProcId() : "" %> - <%= escapeXml10(proc.getState().toString() + (proc.isBypass() ? "(Bypass)" : "")) %> - <%= proc.hasOwner() ? escapeXml10(proc.getOwner()) : "" %> - <%= escapeXml10(proc.getProcName()) %> + <%= escapeXml(proc.getState().toString() + (proc.isBypass() ? "(Bypass)" : "")) %> + <%= proc.hasOwner() ? escapeXml(proc.getOwner()) : "" %> + <%= escapeXml(proc.getProcName()) %> <%= new Date(proc.getSubmittedTime()) %> <%= new Date(proc.getLastUpdate()) %> - <%= escapeXml10(proc.isFailed() ? proc.getException().unwrapRemoteIOException().getMessage() : "") %> - <%= escapeXml10(proc.toString()) %> + <%= escapeXml(proc.isFailed() ? proc.getException().unwrapRemoteIOException().getMessage() : "") %> + <%= escapeXml(proc.toString()) %> <% } %> <% @@ -192,7 +192,7 @@ case EXCLUSIVE: %>

Lock type: EXCLUSIVE

-

Owner procedure: <%= escapeXml10(lockedResource.getExclusiveLockOwnerProcedure().toStringDetails()) %>

+

Owner procedure: <%= escapeXml(lockedResource.getExclusiveLockOwnerProcedure().toStringDetails()) %>

<% break; case SHARED: @@ -211,7 +211,7 @@ <% for (Procedure proc : procedures) { %> - + <% } %>
<%= escapeXml10(proc.toStringDetails()) %><%= escapeXml(proc.toStringDetails()) %>
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp index 3b5129eb0e17..802a66b58906 100644 --- 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 @@ <% } else { %> <%= procedure.getProcId() %> - <%= escapeXml10(procedure.getState().toString() + (procedure.isBypass() ? "(Bypassed)" : "")) %> + <%= escapeXml(procedure.getState().toString() + (procedure.isBypass() ? "(Bypassed)" : "")) %> <% } %> <% 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 index 368d8e1ca376..9d1bf2039610 100644 --- 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,7 +371,7 @@ } %> - <%= escapeXml10(meta.getRegionNameAsString()) %> + <%= escapeXml(meta.getRegionNameAsString()) %> <%= StringEscapeUtils.escapeHtml4(hostAndPort) %> <%= readReq%> <%= writeReq%> @@ -379,8 +379,8 @@ <%= fileSize%> <%= fileCount%> <%= memSize%> - <%= escapeXml10(Bytes.toString(meta.getStartKey())) %> - <%= escapeXml10(Bytes.toString(meta.getEndKey())) %> + <%= escapeXml(Bytes.toString(meta.getStartKey())) %> + <%= escapeXml(Bytes.toString(meta.getEndKey())) %> <%= meta.getReplicaId() %> <% } %> @@ -428,7 +428,7 @@ } %> - <%= escapeXml10(meta.getRegionNameAsString()) %> + <%= escapeXml(meta.getRegionNameAsString()) %> <%= StringEscapeUtils.escapeHtml4(hostAndPort) %> <%= locality%> <%= localityForSsd%> @@ -485,7 +485,7 @@ } %> - <%= escapeXml10(meta.getRegionNameAsString()) %> + <%= escapeXml(meta.getRegionNameAsString()) %> <%= StringEscapeUtils.escapeHtml4(hostAndPort) %> <%= String.format("%,1d", compactingCells)%> <%= String.format("%,1d", compactedCells)%> @@ -1021,7 +1021,7 @@ numRegionsRendered++; %> - <%= escapeXml10(Bytes.toStringBinary(regionInfo.getRegionName())) %> + <%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %> <%= buildRegionDeployedServerTag(regionInfo, master, regionsToServer) %> <%= readReq%> <%= writeReq%> @@ -1029,8 +1029,8 @@ <%= regionSize%> <%= fileCount%> <%= memSize%> - <%= escapeXml10(Bytes.toStringBinary(regionInfo.getStartKey()))%> - <%= escapeXml10(Bytes.toStringBinary(regionInfo.getEndKey()))%> + <%= escapeXml(Bytes.toStringBinary(regionInfo.getStartKey()))%> + <%= escapeXml(Bytes.toStringBinary(regionInfo.getEndKey()))%> <%= state%> <%= regionInfo.getReplicaId() %> @@ -1067,7 +1067,7 @@ numRegionsRendered++; %> - <%= escapeXml10(Bytes.toStringBinary(regionInfo.getRegionName())) %> + <%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %> <%= buildRegionDeployedServerTag(regionInfo, master, regionsToServer) %> <%= locality%> <%= localityForSsd%> @@ -1113,7 +1113,7 @@ numRegionsRendered++; %> - <%= escapeXml10(Bytes.toStringBinary(regionInfo.getRegionName())) %> + <%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %> <%= buildRegionDeployedServerTag(regionInfo, master, regionsToServer) %> <%= String.format("%,1d", compactingCells)%> <%= String.format("%,1d", compactedCells)%> diff --git a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp index 3384724414a5..b2f3938f56ff 100644 --- 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) { %> - <%= escapeXml10( + <%= escapeXml( htDesc.getTableName().getNameAsString()) %> <%= 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 index 2da9cd28a641..c6ae44fc86d4 100644 --- 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 index d99ef57596b8..e69da8b9fde3 100644 --- a/pom.xml +++ b/pom.xml @@ -849,7 +849,6 @@ 1.7 2.14.0 3.9 - 1.10.0 3.6.1 1.5.0 3.4.4 @@ -1476,11 +1475,6 @@ commons-lang3 ${commons-lang3.version} - - org.apache.commons - commons-text - ${commons-text.version} - org.apache.commons commons-math3