diff --git a/mondrian/pom.xml b/mondrian/pom.xml index 50af525f08..101bf036c9 100644 --- a/mondrian/pom.xml +++ b/mondrian/pom.xml @@ -39,11 +39,6 @@ commons-dbcp ${commons-dbcp.version} - - commons-lang - commons-lang - ${commons-lang.version} - commons-io commons-io diff --git a/mondrian/src/it/java/mondrian/rolap/RolapConnectionTest.java b/mondrian/src/it/java/mondrian/rolap/RolapConnectionTest.java index 345cea373f..2f65f0150d 100644 --- 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 index faa3048cc5..5263503261 100644 --- 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 index 0e7c9c43c8..0713f29ae7 100644 --- 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 true 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 index db0bf419c0..e12c0e1ef8 100644 --- 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 index ce2c897383..925383627e 100644 --- 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 index 45377f1072..761b765abb 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,6 @@ 1.2.0 1.3.5 2.4 - 2.4 1.1