Migrates common-lang to common-lang3

Author: wgzhao

core/pom.xml

@@ -54,9 +54,9 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons.lang3.version}</version>
         </dependency>
 
         <dependency>

core/src/main/java/com/wgzhao/datax/core/AbstractContainer.java

@@ -21,7 +21,7 @@
 
 import com.wgzhao.datax.common.util.Configuration;
 import com.wgzhao.datax.core.statistics.container.communicator.AbstractContainerCommunicator;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 /**
  * 执行容器的抽象类，持有该容器全局的配置 configuration
@@ -34,6 +34,7 @@ public abstract class AbstractContainer
 
     public AbstractContainer(Configuration configuration)
     {
+
         Validate.notNull(configuration, "Configuration can not be null.");
 
         this.configuration = configuration;

core/src/main/java/com/wgzhao/datax/core/container/util/JobAssignUtil.java

@@ -22,7 +22,7 @@
 import com.wgzhao.datax.common.constant.CommonConstant;
 import com.wgzhao.datax.common.util.Configuration;
 import com.wgzhao.datax.core.util.container.CoreConstant;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;

core/src/main/java/com/wgzhao/datax/core/job/JobContainer.java

@@ -46,7 +46,7 @@
 import com.wgzhao.datax.core.util.container.CoreConstant;
 import com.wgzhao.datax.core.util.container.LoadUtil;
 import com.alibaba.fastjson.JSON;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.concurrent.FutureCallback;

core/src/main/java/com/wgzhao/datax/core/job/scheduler/AbstractScheduler.java

@@ -28,7 +28,7 @@
 import com.wgzhao.datax.core.util.ErrorRecordChecker;
 import com.wgzhao.datax.core.util.FrameworkErrorCode;
 import com.wgzhao.datax.core.util.container.CoreConstant;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/com/wgzhao/datax/core/statistics/communication/Communication.java

@@ -21,8 +21,8 @@
 
 import com.wgzhao.datax.common.base.BaseObject;
 import com.wgzhao.datax.core.meta.State;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
 
 import java.util.ArrayList;
 import java.util.List;

core/src/main/java/com/wgzhao/datax/core/statistics/communication/CommunicationTool.java

@@ -21,7 +21,7 @@
 
 import com.wgzhao.datax.common.statistics.PerfTrace;
 import com.wgzhao.datax.common.util.StrUtil;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import java.text.DecimalFormat;
 

core/src/main/java/com/wgzhao/datax/core/statistics/container/communicator/taskgroup/AbstractTGContainerCommunicator.java

@@ -25,7 +25,7 @@
 import com.wgzhao.datax.core.statistics.container.collector.ProcessInnerCollector;
 import com.wgzhao.datax.core.statistics.container.communicator.AbstractContainerCommunicator;
 import com.wgzhao.datax.core.util.container.CoreConstant;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import java.util.List;
 import java.util.Map;

core/src/main/java/com/wgzhao/datax/core/taskgroup/runner/AbstractRunner.java

@@ -25,7 +25,7 @@
 import com.wgzhao.datax.core.meta.State;
 import com.wgzhao.datax.core.statistics.communication.Communication;
 import com.wgzhao.datax.core.statistics.communication.CommunicationTool;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 public abstract class AbstractRunner
 {

core/src/main/java/com/wgzhao/datax/core/transport/channel/Channel.java

@@ -25,7 +25,7 @@
 import com.wgzhao.datax.core.statistics.communication.CommunicationTool;
 import com.wgzhao.datax.core.transport.record.TerminateRecord;
 import com.wgzhao.datax.core.util.container.CoreConstant;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/com/wgzhao/datax/core/transport/exchanger/BufferedRecordExchanger.java

@@ -30,7 +30,7 @@
 import com.wgzhao.datax.core.transport.record.TerminateRecord;
 import com.wgzhao.datax.core.util.FrameworkErrorCode;
 import com.wgzhao.datax.core.util.container.CoreConstant;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import java.util.ArrayList;
 import java.util.List;

core/src/main/java/com/wgzhao/datax/core/transport/exchanger/BufferedRecordTransformerExchanger.java

@@ -32,7 +32,7 @@
 import com.wgzhao.datax.core.transport.transformer.TransformerExecution;
 import com.wgzhao.datax.core.util.FrameworkErrorCode;
 import com.wgzhao.datax.core.util.container.CoreConstant;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import java.util.ArrayList;
 import java.util.List;

core/src/main/java/com/wgzhao/datax/core/util/ConfigParser.java

@@ -23,7 +23,7 @@
 import com.wgzhao.datax.common.util.Configuration;
 import com.wgzhao.datax.core.util.container.CoreConstant;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.HttpGet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/com/wgzhao/datax/core/util/ConfigurationValidate.java

@@ -20,7 +20,7 @@
 package com.wgzhao.datax.core.util;
 
 import com.wgzhao.datax.common.util.Configuration;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 /**
  * Created by jingxing on 14-9-16.

core/src/main/java/com/wgzhao/datax/core/util/container/CoreConstant.java

@@ -19,7 +19,7 @@
 
 package com.wgzhao.datax.core.util.container;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 

core/src/main/java/com/wgzhao/datax/core/util/container/JarLoader.java

@@ -21,8 +21,8 @@
 
 import com.wgzhao.datax.common.exception.DataXException;
 import com.wgzhao.datax.core.util.FrameworkErrorCode;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
 
 import java.io.File;
 import java.io.FileFilter;