remove commons-lang dependency, use and simplify Util.isBlank(String)

Signed-off-by: Stefan Bischof <[email protected]>
pentaho · Dec 2, 2021 · 4e539d2 · 4e539d2
1 parent b9f0309
commit 4e539d2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 28 deletions.
diff --git a/mondrian/pom.xml b/mondrian/pom.xml
@@ -39,11 +39,6 @@
       <artifactId>commons-dbcp</artifactId>
       <version>${commons-dbcp.version}</version>
     </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>${commons-lang.version}</version>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>

diff --git a/mondrian/src/it/java/mondrian/rolap/RolapConnectionTest.java b/mondrian/src/it/java/mondrian/rolap/RolapConnectionTest.java
@@ -18,11 +18,9 @@
 import mondrian.olap.Util;
 import mondrian.spi.Dialect;
 import mondrian.test.TestContext;
-import mondrian.util.Pair;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.lang.StringUtils;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -493,7 +491,7 @@ public void testGetJdbcConnectionWhenJdbcIsNull() {
         } catch (RuntimeException ex) {
             assertTrue(
                 connectInfo.toString(),
-                StringUtils.isBlank(connectInfo.toString()));
+                Util.isBlank(connectInfo.toString()));
         }
     }
 
@@ -511,7 +509,7 @@ public void testJdbcConnectionString() {
         DataSource dataSource =
             RolapConnection.createDataSource(null, properties, connectInfo);
 
-        assertFalse(StringUtils.isBlank(connectInfo.toString()));
+        assertFalse(Util.isBlank(connectInfo.toString()));
 
         String[] parseconnectInfo = connectInfo.toString().split(";");
         for (String parseconnectInfoVals : parseconnectInfo) {
@@ -535,7 +533,7 @@ public void testJdbcConnectionStringWithoutDatabase() {
         DataSource dataSource =
             RolapConnection.createDataSource(null, properties, connectInfo);
 
-        assertFalse(StringUtils.isBlank(connectInfo.toString()));
+        assertFalse(Utils.isBlank(connectInfo.toString()));
         assertFalse(connectInfo.toString().contains("databaseName"));
     }
 
@@ -549,7 +547,7 @@ public void testJdbcConnectionStringWithoutIntegratedSecurity() {
         DataSource dataSource =
             RolapConnection.createDataSource(null, properties, connectInfo);
 
-        assertFalse(StringUtils.isBlank(connectInfo.toString()));
+        assertFalse(Utils.isBlank(connectInfo.toString()));
         assertFalse(connectInfo.toString().contains("integratedSecurity"));
     }
 }

diff --git a/mondrian/src/it/java/mondrian/test/loader/MondrianFoodMartLoader.java b/mondrian/src/it/java/mondrian/test/loader/MondrianFoodMartLoader.java
@@ -16,7 +16,6 @@
 import mondrian.spi.Dialect;
 import mondrian.spi.DialectManager;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.*;
 
 import java.io.*;
@@ -352,7 +351,7 @@ public static void main(String[] args) {
      * populating tables and creating indexes
      */
     private void load() throws Exception {
-        if (!StringUtils.isBlank(jdbcDrivers)) {
+        if (!Util.isBlank(jdbcDrivers)) {
             RolapUtil.loadDrivers(jdbcDrivers);
         }
 

diff --git a/mondrian/src/main/java/mondrian/olap/Util.java b/mondrian/src/main/java/mondrian/olap/Util.java
@@ -3883,16 +3883,7 @@ public static String convertOlap4jConnectStringToNativeMondrian(
      * @return <code>true</code> if the String is null, empty or whitespace
      */
     public static boolean isBlank(String str) {
-        final int strLen;
-        if (str == null || (strLen = str.length()) == 0) {
-            return true;
-        }
-        for (int i = 0; i < strLen; i++) {
-            if (!Character.isWhitespace(str.charAt(i))) {
-                return false;
-            }
-        }
-        return true;
+        return str == null || str.isBlank();
     }
 
     /**

diff --git a/mondrian/src/main/java/mondrian/rolap/RolapConnection.java b/mondrian/src/main/java/mondrian/rolap/RolapConnection.java
@@ -20,7 +20,6 @@
 import mondrian.spi.impl.JndiDataSourceResolver;
 import mondrian.util.*;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 import org.eigenbase.util.property.StringProperty;
@@ -1136,11 +1135,11 @@ private static String getJdbcConnectionString( Util.PropertyList connectInfo ) {
 
     String jdbc = connectInfo.get( RolapConnectionProperties.Jdbc.name() );
 
-    if ( StringUtils.isBlank( jdbc ) ) {
+    if ( Util.isBlank( jdbc ) ) {
       return null;
     }
 
-    String database = StringUtils.isBlank( connectInfo.get( "databaseName" ) )
+    String database = Util.isBlank( connectInfo.get( "databaseName" ) )
       ? "" : ";databaseName=" + connectInfo.get( "databaseName" );
     String integratedSecurity = Boolean.parseBoolean( connectInfo.get( "integratedSecurity" ) )
       ? ";integratedSecurity=true" : "";

diff --git a/mondrian/src/main/java/mondrian/rolap/aggmatcher/Recognizer.java b/mondrian/src/main/java/mondrian/rolap/aggmatcher/Recognizer.java
@@ -17,7 +17,6 @@
 import mondrian.rolap.*;
 import mondrian.rolap.sql.SqlQuery;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 import java.util.*;

diff --git a/pom.xml b/pom.xml
@@ -47,7 +47,6 @@
     <olap4j-xmlaserver.version>1.2.0</olap4j-xmlaserver.version>
     <eigenbase-xom.version>1.3.5</eigenbase-xom.version>
     <servlet-api.version>2.4</servlet-api.version>
-    <commons-lang.version>2.4</commons-lang.version>
     <xmlunit.version>1.1</xmlunit.version>
   </properties>
   <profiles>