Merge pull request wiremock#2622 from pks-1981/StringUtils_replace

Replace org.apache.commons.lang3.StringUtils

build.gradle

@@ -87,12 +87,12 @@ dependencies {
   compileOnly(platform("org.junit:junit-bom:$versions.junitJupiter"))
   compileOnly("org.junit.jupiter:junit-jupiter")
 
-  api 'org.apache.commons:commons-lang3:3.14.0'
   api "com.github.jknack:handlebars:$versions.handlebars", {
     exclude group: 'org.mozilla', module: 'rhino'
   }
   api("com.github.jknack:handlebars-helpers:$versions.handlebars") {
     exclude group: 'org.mozilla', module: 'rhino'
+    exclude group: 'org.apache.commons', module: 'commons-lang3'
   }
 
   api 'commons-fileupload:commons-fileupload:1.5',  {

perf-test/src/main/java/wiremock/LoadTestConfiguration.java

@@ -20,7 +20,6 @@
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.commons.lang3.RandomStringUtils.randomAscii;
 
 public class LoadTestConfiguration {
 

src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2023 Thomas Akehurst
+ * Copyright (C) 2011-2024 Thomas Akehurst
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;
 import static com.github.tomakehurst.wiremock.common.HttpClientUtils.getEntityAsStringAndCloseStream;
+import static com.github.tomakehurst.wiremock.common.Strings.isNotBlank;
 import static com.github.tomakehurst.wiremock.security.NoClientAuthenticator.noClientAuthenticator;
 import static java.util.Objects.requireNonNull;
 import static org.apache.hc.core5.http.HttpHeaders.HOST;
@@ -49,7 +50,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.classic.methods.HttpPut;
@@ -438,7 +438,7 @@ public int port() {
   }
 
   private ProxySettings createProxySettings(String proxyHost, int proxyPort) {
-    if (StringUtils.isNotBlank(proxyHost)) {
+    if (isNotBlank(proxyHost)) {
       return new ProxySettings(proxyHost, proxyPort);
     }
     return ProxySettings.NO_PROXY;

src/main/java/com/github/tomakehurst/wiremock/common/ContentTypes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2023 Thomas Akehurst
+ * Copyright (C) 2016-2024 Thomas Akehurst
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 package com.github.tomakehurst.wiremock.common;
 
 import static com.github.tomakehurst.wiremock.common.Strings.stringFromBytes;
+import static com.github.tomakehurst.wiremock.common.Strings.substringAfterLast;
 import static com.github.tomakehurst.wiremock.common.TextType.JSON;
 import static java.util.Arrays.asList;
-import static org.apache.commons.lang3.StringUtils.substringAfterLast;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.tomakehurst.wiremock.common.xml.Xml;

src/main/java/com/github/tomakehurst/wiremock/common/Gzip.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2023 Thomas Akehurst
+ * Copyright (C) 2015-2024 Thomas Akehurst
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package com.github.tomakehurst.wiremock.common;
 
 import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;
-import static com.github.tomakehurst.wiremock.common.Strings.DEFAULT_CHARSET;
 import static com.github.tomakehurst.wiremock.common.Strings.bytesFromString;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -49,7 +49,7 @@ public static String unGzipToString(byte[] gzippedContent) {
   }
 
   public static byte[] gzip(String plainContent) {
-    return gzip(plainContent, DEFAULT_CHARSET);
+    return gzip(plainContent, UTF_8);
   }
 
   public static byte[] gzip(String plainContent, Charset charset) {

src/main/java/com/github/tomakehurst/wiremock/common/ParameterUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Thomas Akehurst
+ * Copyright (C) 2023-2024 Thomas Akehurst
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,16 @@ public static <T> T getFirstNonNull(T first, T second) {
     throw new NullPointerException("Both parameters are null");
   }
 
+  public static <T> T getFirstNonNull(T first, T second, String etr) {
+    if (first != null) {
+      return first;
+    }
+    if (second != null) {
+      return second;
+    }
+    throw new NullPointerException(etr);
+  }
+
   public static void checkParameter(boolean condition, String errorMessage) {
     if (!condition) {
       throw new IllegalArgumentException(errorMessage);

src/main/java/com/github/tomakehurst/wiremock/common/ProxySettings.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Thomas Akehurst
+ * Copyright (C) 2013-2024 Thomas Akehurst
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package com.github.tomakehurst.wiremock.common;
 
 import static com.github.tomakehurst.wiremock.common.ParameterUtils.checkParameter;
-import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static com.github.tomakehurst.wiremock.common.Strings.isNotEmpty;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -54,7 +54,7 @@ public static ProxySettings fromString(String config) {
       ProxySettings proxySettings =
           new ProxySettings(
               proxyUrl.getHost(), proxyUrl.getPort() == -1 ? DEFAULT_PORT : proxyUrl.getPort());
-      if (!isEmpty(proxyUrl.getUserInfo())) {
+      if (isNotEmpty(proxyUrl.getUserInfo())) {
         String[] userInfoArray = proxyUrl.getUserInfo().split(":");
         proxySettings.setUsername(userInfoArray[0]);
         if (userInfoArray.length > 1) {
@@ -99,6 +99,6 @@ public String toString() {
     }
 
     return String.format(
-        "%s:%s%s", host(), port(), (!isEmpty(this.username) ? " (with credentials)" : ""));
+        "%s:%s%s", host(), port(), (isNotEmpty(this.username) ? " (with credentials)" : ""));
   }
 }