MULE-12782: Contention on ExceptionUtils.getCause - Upgrade commons l…

…ang (mulesoft#19)
Teradata · Jun 14, 2017 · 94121ab · 94121ab
1 parent 871f634
commit 94121ab
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
         <c3p0Version>0.9.5.2</c3p0Version>
         <commonsCollectionsVersion>3.2.2</commonsCollectionsVersion>
         <commonsDbUtilsVersion>1.2</commonsDbUtilsVersion>
-        <commonsLangVersion>2.4</commonsLangVersion>
+        <commonsLangVersion>3.6</commonsLangVersion>
         <commonsIoVersion>2.4</commonsIoVersion>
         <derbyVersion>10.11.1.1</derbyVersion>
         <guavaVersion>18.0</guavaVersion>
@@ -39,8 +39,8 @@
             <version>${c3p0Version}</version>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
             <version>${commonsLangVersion}</version>
         </dependency>
         <dependency>

diff --git a/src/main/java/org/mule/extension/db/internal/domain/connection/DbConnectionProvider.java b/src/main/java/org/mule/extension/db/internal/domain/connection/DbConnectionProvider.java
@@ -54,7 +54,7 @@
 import javax.sql.DataSource;
 import javax.sql.XAConnection;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 
 /**

diff --git a/src/main/java/org/mule/extension/db/internal/domain/metadata/SelectMetadataResolver.java b/src/main/java/org/mule/extension/db/internal/domain/metadata/SelectMetadataResolver.java
@@ -7,7 +7,7 @@
 package org.mule.extension.db.internal.domain.metadata;
 
 import static java.lang.String.format;
-import static org.apache.commons.lang.StringUtils.isEmpty;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 import org.mule.metadata.api.builder.ObjectTypeBuilder;
 import org.mule.metadata.api.model.MetadataType;
 import org.mule.runtime.api.connection.ConnectionException;

diff --git a/src/main/java/org/mule/extension/db/internal/domain/query/QueryTemplate.java b/src/main/java/org/mule/extension/db/internal/domain/query/QueryTemplate.java
@@ -16,7 +16,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 /**
  * Defines a SQL query that could be executed against a database connection.

diff --git a/src/main/java/org/mule/extension/db/internal/domain/type/oracle/OracleXmlType.java b/src/main/java/org/mule/extension/db/internal/domain/type/oracle/OracleXmlType.java
@@ -92,6 +92,6 @@ private static <T> Object createXmlType(Connection connection, T xmlContent, Cla
    * @throws ClassNotFoundException if there required class in not in the classpath
    */
   public static Class<?> getXmlTypeClass() throws ClassNotFoundException {
-    return org.apache.commons.lang.ClassUtils.getClass(ORACLE_XMLTYPE_CLASS);
+    return org.apache.commons.lang3.ClassUtils.getClass(ORACLE_XMLTYPE_CLASS);
   }
 }
diff --git a/src/main/java/org/mule/extension/db/internal/operation/BulkOperations.java b/src/main/java/org/mule/extension/db/internal/operation/BulkOperations.java
@@ -8,7 +8,7 @@
 
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.toList;
-import static org.apache.commons.lang.StringUtils.isEmpty;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.mule.extension.db.internal.domain.query.QueryType.DELETE;
 import static org.mule.extension.db.internal.domain.query.QueryType.INSERT;
 import static org.mule.extension.db.internal.domain.query.QueryType.UPDATE;

diff --git a/src/main/java/org/mule/extension/db/internal/resolver/query/AbstractQueryResolver.java b/src/main/java/org/mule/extension/db/internal/resolver/query/AbstractQueryResolver.java
@@ -7,7 +7,7 @@
 package org.mule.extension.db.internal.resolver.query;
 
 import static org.apache.commons.collections.CollectionUtils.isEmpty;
-import static org.apache.commons.lang.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.mule.runtime.api.util.Preconditions.checkArgument;
 import org.mule.extension.db.api.param.ParameterType;
 import org.mule.extension.db.api.param.StatementDefinition;

diff --git a/src/test/java/org/mule/extension/db/integration/AbstractDbIntegrationTestCase.java b/src/test/java/org/mule/extension/db/integration/AbstractDbIntegrationTestCase.java
@@ -9,9 +9,9 @@
 
 import static java.lang.String.format;
 import static java.util.Collections.emptyMap;
-import static org.apache.commons.lang.StringUtils.endsWith;
-import static org.apache.commons.lang.StringUtils.replace;
-import static org.apache.commons.lang.StringUtils.startsWith;
+import static org.apache.commons.lang3.StringUtils.endsWith;
+import static org.apache.commons.lang3.StringUtils.replace;
+import static org.apache.commons.lang3.StringUtils.startsWith;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;

diff --git a/src/test/java/org/mule/extension/db/integration/model/OracleTestDatabase.java b/src/test/java/org/mule/extension/db/integration/model/OracleTestDatabase.java
@@ -151,7 +151,7 @@ public Class getIdFieldJavaClass() {
   @Override
   public Class getDefaultAutoGeneratedKeyClass() {
     try {
-      return org.apache.commons.lang.ClassUtils.getClass("oracle.sql.ROWID");
+      return org.apache.commons.lang3.ClassUtils.getClass("oracle.sql.ROWID");
     } catch (ClassNotFoundException e) {
       throw new IllegalStateException("Unable to load ROWDID class");
     }