Fix deprecated calls

pinterest · Jul 23, 2024 · 545d185 · 545d185
1 parent b3cdacf
commit 545d185
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/deploy-service/common/pom.xml b/deploy-service/common/pom.xml
@@ -83,6 +83,10 @@
             <artifactId>commons-collections4</artifactId>
             <version>4.5.0-M1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

diff --git a/deploy-service/common/src/main/java/com/pinterest/deployservice/bean/EnvironBean.java b/deploy-service/common/src/main/java/com/pinterest/deployservice/bean/EnvironBean.java
@@ -18,7 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.hibernate.validator.constraints.Range;
 
 import java.io.Serializable;
@@ -273,7 +273,7 @@ public String getDescription() {
 
     public void setDescription(String description) {
         // Escape user input which could contain injected Javascript
-        this.description = StringEscapeUtils.escapeHtml(description);
+        this.description = StringEscapeUtils.escapeHtml4(description);
     }
 
     public String getBuild_name() {

diff --git a/...vice/common/src/main/java/com/pinterest/deployservice/buildtags/BuildTagsManagerImpl.java b/...vice/common/src/main/java/com/pinterest/deployservice/buildtags/BuildTagsManagerImpl.java
@@ -59,7 +59,7 @@ public List<BuildTagBean> load(String buildName) { // no checked exception
                     }
                     catch (Exception ex){
                         LOG.error(ExceptionUtils.getRootCauseMessage(ex));
-                        LOG.error(ExceptionUtils.getFullStackTrace(ex));
+                        LOG.error(ExceptionUtils.getStackTrace(ex));
                     }
                     return new ArrayList<BuildTagBean>();
                 }

diff --git a/...oy-service/teletraanservice/src/main/java/com/pinterest/teletraan/resource/EnvAlerts.java b/...oy-service/teletraanservice/src/main/java/com/pinterest/teletraan/resource/EnvAlerts.java
@@ -166,7 +166,7 @@ public Response alertsTriggered(@PathParam("envName") String envName,
                   userName));
         } catch (Exception ex) {
           LOG.error("Failed to perform action {}", ExceptionUtils.getRootCauseMessage(ex));
-          LOG.error(ExceptionUtils.getFullStackTrace(ex));
+          LOG.error(ExceptionUtils.getStackTrace(ex));
         }
       }