Remove commons-lang dependency

Author: Santiago Gala

core/pom.xml

@@ -93,10 +93,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

core/src/main/groovy/noe/common/utils/VerifyURLBuilder.groovy

@@ -4,7 +4,6 @@ import com.gargoylesoftware.htmlunit.Page
 import com.gargoylesoftware.htmlunit.WebClient
 import com.gargoylesoftware.htmlunit.WebResponse
 import groovy.util.logging.Slf4j
-import org.apache.commons.lang3.StringUtils
 
 import java.util.regex.Pattern
 
@@ -252,7 +251,7 @@ public final class VerifyURLBuilder {
    */
   private Map build() {
     if (url == null) throw new IllegalArgumentException("URL must not be null.")
-    if (StringUtils.isBlank(reqKey) != StringUtils.isBlank(reqValue)) {
+    if (reqKey?.allWhitespace != reqValue?.allWhitespace) {
       throw new IllegalArgumentException("ReqKey and ReqValue have to have to be either both set or both empty.")
     }
 

core/src/main/groovy/noe/common/utils/XmlUtils.groovy

@@ -9,6 +9,8 @@ import groovy.xml.XmlUtil
  */
 class XmlUtils {
 
+  //FIXME: write a escapeXml10 or similar method and use it for StringEscapeUtils.escapeXml10
+
   static void writeXmlToFile(File file, GPathResult xml) {
     file.withWriter { outWriter ->
       XmlUtil.serialize(new StreamingMarkupBuilder().bind {

core/src/main/groovy/noe/eap/utils/CLILib.groovy

@@ -3,7 +3,7 @@ package noe.eap.utils
 import noe.common.DefaultProperties
 import noe.common.utils.Library
 import noe.eap.server.as7.AS7Properties
-import org.apache.commons.lang3.StringEscapeUtils
+import groovy.xml.XmlUtil
 
 import javax.xml.transform.Transformer
 import javax.xml.transform.TransformerFactory
@@ -52,7 +52,7 @@ class XSLTStaticLib {
    */
   def static addOrUpdateSystemProperties(String propertyName = "evilprop", String propertyValue = "something", String absolutePathToConfig) {
     def xslt = Library.retrieveResourceAsFile(RELATIVE_XSLT_PATH + "/system-properties.xsl").getText().replace("@SYSTEM_PROPERTY_NAME@", propertyName)
-    xslt = xslt.replace("@SYSTEM_PROPERTY_VALUE@", StringEscapeUtils.escapeXml10(propertyValue))
+    xslt = xslt.replace("@SYSTEM_PROPERTY_VALUE@", XmlUtil.escapeXml(propertyValue))
     transformIt(xslt, new File(absolutePathToConfig))
   }
 
@@ -132,9 +132,9 @@ class XSLTStaticLib {
     xslt = xslt.replace("@ENABLED@", enabled.toString())
     xslt = xslt.replace("@SCHEME@", scheme)
     xslt = xslt.replace("@SECURE@", secure.toString())
-    xslt = xslt.replace("@CA_CERTIFICATE_FILE@", StringEscapeUtils.escapeXml10(caCertificateFile))
-    xslt = xslt.replace("@CERTIFICATE_KEY_FILE@", StringEscapeUtils.escapeXml10(certificateKeyFile))
-    xslt = xslt.replace("@CERTIFICATE_FILE@", StringEscapeUtils.escapeXml10(certificateFile))
+    xslt = xslt.replace("@CA_CERTIFICATE_FILE@", XmlUtil.escapeXml(caCertificateFile))
+    xslt = xslt.replace("@CERTIFICATE_KEY_FILE@", XmlUtil.escapeXml(certificateKeyFile))
+    xslt = xslt.replace("@CERTIFICATE_FILE@", XmlUtil.escapeXml(certificateFile))
     xslt = xslt.replace("@PASSWORD@", password)
     xslt = xslt.replace("@VERIFY_CLIENT@", verifyClient.toString())
     xslt = xslt.replace("@KEY_ALIAS@", keyAlias)
@@ -348,8 +348,8 @@ class XSLTStaticLib {
       String ssl_protocol = "TLS",
       String absolutePathToConfig) {
     def xslt = Library.retrieveResourceAsFile(RELATIVE_XSLT_PATH + "/mod-cluster-ssl-config.xsl").getText()
-    xslt = xslt.replace("@CA_CERTIFICATE_FILE@", StringEscapeUtils.escapeXml10(caCertificateFile))
-    xslt = xslt.replace("@CERTIFICATE_KEY_FILE@", StringEscapeUtils.escapeXml10(certificateKeyFile))
+    xslt = xslt.replace("@CA_CERTIFICATE_FILE@", XmlUtil.escapeXml(caCertificateFile))
+    xslt = xslt.replace("@CERTIFICATE_KEY_FILE@", XmlUtil.escapeXml(certificateKeyFile))
     xslt = xslt.replace("@PASSWORD@", password)
     xslt = xslt.replace("@KEY_ALIAS@", keyAlias)
     xslt = xslt.replace("@CIPHER_SUITE@", cipherSuite)

core/src/main/groovy/noe/eap/utils/XSLTStaticLib.groovy

@@ -6,7 +6,6 @@ import noe.common.utils.Library
 import noe.common.utils.Version
 import noe.ews.server.ServerEws
 import noe.server.Tomcat
-import org.apache.commons.lang3.StringUtils
 /**
  * EWS Tomcat server on Windows
  *
@@ -116,7 +115,7 @@ class TomcatWindows extends Tomcat {
    */
   private String configureTomcatWindowTitle() {
     boolean success = false
-    if (StringUtils.isNotEmpty(this.processCode) && this.processCode != '0' && this.processCode != this.windowTitle) {
+    if (this.processCode && this.processCode != '0' && this.processCode != this.windowTitle) {
       if (version == new Version("6")) {
         success = updateBinReplaceRegExp('catalina.bat', "set _EXECJAVA=start \"[^\"]*\"", "set _EXECJAVA=start \"${this.processCode}\"", true, false)
       }

core/src/main/groovy/noe/ews/server/tomcat/TomcatWindows.groovy

@@ -126,7 +126,6 @@
         <org.jboss.as.creaper.dependencies.version>7.5.23.Final-redhat-00002</org.jboss.as.creaper.dependencies.version>
 
         <commons-collections4.version>4.4</commons-collections4.version>
-        <commons-lang3.version>3.4</commons-lang3.version>
         <commons-io.version>2.7</commons-io.version>
 
         <xml-apis.version>1.4.01</xml-apis.version>
@@ -242,11 +241,6 @@
                 <artifactId>commons-collections4</artifactId>
                 <version>${commons-collections4.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons-lang3.version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>