Changed commons-lang version to commons-lang3

openjpa-jdbc/pom.xml

@@ -42,6 +42,11 @@
             <artifactId>openjpa-kernel</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -84,5 +89,10 @@
             <artifactId>jmock-junit3</artifactId>
             <scope>test</scope>
         </dependency>
+           <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.4</version>
+            </dependency>
     </dependencies>
 </project>

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java

@@ -25,7 +25,7 @@
 import java.security.PrivilegedActionException;
 import java.util.Properties;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
 import org.apache.openjpa.jdbc.meta.PropertiesReverseCustomizer;
@@ -254,9 +254,9 @@ protected ConfigurationImpl newConfiguration() {
     protected void executeOn(String[] files)
         throws Exception {
         ClassLoader loader = getClassLoader();
-        if (!StringUtils.isEmpty(dirName))
+        if (!StringUtils.isEmpty((CharSequence)dirName))
             flags.directory = Files.getFile(dirName, loader);
-        if (!StringUtils.isEmpty(typeMap))
+        if (!StringUtils.isEmpty((CharSequence)typeMap))
             flags.typeMap = Configurations.parseProperties(typeMap);
 
         // load customizer properties

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java

@@ -22,7 +22,7 @@
 import java.sql.ResultSet;
 import javax.sql.DataSource;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
 import org.apache.openjpa.jdbc.identifier.DBIdentifierUtil;
 import org.apache.openjpa.jdbc.kernel.BatchingConstraintUpdateManager;
@@ -575,7 +575,7 @@ public DBDictionary getDBDictionaryInstance() {
         if (dbdictionary == null) {
             String clsName = dbdictionaryPlugin.getClassName();
             String props = dbdictionaryPlugin.getProperties();
-            if (!StringUtils.isEmpty(clsName)) {
+            if (!StringUtils.isEmpty((CharSequence)clsName)) {
                 dbdictionary = DBDictionaryFactory.newDBDictionary
                     (this, clsName, props);
             } else {
@@ -798,7 +798,7 @@ public Object getConnectionFactory2() {
                 // the driver name is always required, so if not specified,
                 // then no connection factory 2
                 String driver = getConnection2DriverName();
-                if (!StringUtils.isEmpty(driver))
+                if (!StringUtils.isEmpty((CharSequence)driver))
                     ds = DataSourceFactory.newDataSource(this, true);
             }
             if (ds != null) {

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java

@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.jdbc.conf;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.jdbc.meta.MetaDataPlusMappingFactory;
 import org.apache.openjpa.lib.conf.Configuration;
@@ -92,15 +92,15 @@ public MetaDataFactory instantiateMetaDataFactory(Configuration conf,
         String metaProps = metaPlugin.getProperties();
 
         // if no mapping factory set, check for default for this factory
-        if (StringUtils.isEmpty(clsName)) {
+        if (StringUtils.isEmpty((CharSequence)clsName)) {
             String def;
-            if (!StringUtils.isEmpty(mapping)) {
+            if (!StringUtils.isEmpty((CharSequence)mapping)) {
                 def = unalias(metaPlugin.alias(metaClsName),
                     _mappedMetaFactoryDefaults, true);
                 if (def != null)
                     clsName = unalias(def);
             }
-            if (StringUtils.isEmpty(clsName)) {
+            if (StringUtils.isEmpty((CharSequence)clsName)) {
                 def = unalias(metaPlugin.alias(metaClsName),
                     _metaFactoryDefaults, true);
                 if (def != null)

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifier.java

@@ -20,7 +20,7 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.lib.identifier.Identifier;
 import org.apache.openjpa.lib.identifier.IdentifierImpl;
 
@@ -304,7 +304,7 @@ public static boolean isEmpty(DBIdentifier name) {
         if (isNull(name)) {
             return true;
         }
-        return StringUtils.isEmpty(name.getName());
+        return StringUtils.isEmpty((CharSequence)name.getName());
     }
 
 
@@ -674,7 +674,7 @@ private void assertNotNull() {
     public static DBIdentifier truncate(DBIdentifier name, int length) {
         DBIdentifier sName = name.clone();
         String strName = sName.getNameInternal();
-        if (StringUtils.isEmpty(strName)) {
+        if (StringUtils.isEmpty((CharSequence)strName)) {
             return sName;
         }
         strName = Normalizer.truncate(strName, length);

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtilImpl.java

@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.jdbc.identifier;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.jdbc.schema.Column;
@@ -451,7 +451,7 @@ private DBIdentifier makeName(String rule, DBIdentifier name, Table tbl, String
 
     private DBIdentifier makeName(String rule, DBIdentifier name, String prefix) {
         DBIdentifier sName = DBIdentifier.removeLeading(name, IdentifierUtil.UNDERSCORE);
-        if (!StringUtils.isEmpty(prefix)) {
+        if (!StringUtils.isEmpty((CharSequence)prefix)) {
             sName = DBIdentifier.preCombine(sName, prefix);
         }
         return sName;

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/Normalizer.java

@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.jdbc.identifier;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.lib.identifier.IdentifierConfiguration;
 import org.apache.openjpa.lib.identifier.IdentifierRule;
@@ -48,7 +48,7 @@ public static IdentifierConfiguration getNamingConfiguration() {
      * @return
      */
     public static String normalizeMulti(String name) {
-        if (StringUtils.isEmpty(name)) {
+        if (StringUtils.isEmpty((CharSequence)name)) {
             return name;
         }
         String[] names = normalizer.splitName(defaultRule, name);
@@ -61,7 +61,7 @@ public static String normalizeMulti(String name) {
      * @return
      */
     public static String normalizeString(String name) {
-        if (StringUtils.isEmpty(name)) {
+        if (StringUtils.isEmpty((CharSequence)name)) {
             return name;
         }
         if (!normalizer.isDelimited(defaultRule, name)) {
@@ -77,7 +77,7 @@ public static String normalizeString(String name) {
      * @return
      */
     public static boolean isDelimited(String name) {
-        if (StringUtils.isEmpty(name)) {
+        if (StringUtils.isEmpty((CharSequence)name)) {
             return false;
         }
         return normalizer.isDelimited(defaultRule, name);
@@ -91,7 +91,7 @@ public static boolean isDelimited(String name) {
      * @return
      */
     public static boolean fullNamesEqual(String name1, String name2) {
-        if (StringUtils.isEmpty(name1) && StringUtils.isEmpty(name2)) {
+        if (StringUtils.isEmpty((CharSequence)name1) && StringUtils.isEmpty((CharSequence)name2)) {
             return true;
         }
         // Split multi-part names into individual components and compare
@@ -124,7 +124,7 @@ public static boolean fullNamesEqual(String name1, String name2) {
      * @return
      */
     public static boolean namesEqual(String name1, String name2) {
-        if (StringUtils.isEmpty(name1) && StringUtils.isEmpty(name2)) {
+        if (StringUtils.isEmpty((CharSequence)name1) && StringUtils.isEmpty((CharSequence)name2)) {
             return true;
         }
         if (normalizer.isDelimited(defaultRule, name1)) {

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java

@@ -28,7 +28,7 @@
 import java.util.TreeMap;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.sql.Result;
 import org.apache.openjpa.jdbc.sql.SelectExecutor;
@@ -339,7 +339,7 @@ ClassMapping searchMappingByName(String cls) {
     public void setExcludes(String excludes) {
         lock();
         try {
-            if (StringUtils.isEmpty(excludes))
+            if (StringUtils.isEmpty((CharSequence)excludes))
                 return;
             if (_exclusionPatterns == null)
                 _exclusionPatterns = new ArrayList<String>();

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java

@@ -22,7 +22,7 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
 import org.apache.openjpa.jdbc.meta.MappingRepository;
@@ -134,7 +134,7 @@ protected BrokerImpl newBrokerImpl(String user, String pass) {
     protected void synchronizeMappings(ClassLoader loader, 
         JDBCConfiguration conf) {
         String action = conf.getSynchronizeMappings();
-        if (StringUtils.isEmpty(action))
+        if (StringUtils.isEmpty((CharSequence)action))
             return;
 
         MappingRepository repo = conf.getMappingRepositoryInstance();

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java

@@ -27,7 +27,7 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
@@ -324,7 +324,7 @@ public boolean hasJoin(String field) {
     }
 
     public JDBCFetchConfiguration addJoin(String join) {
-        if (StringUtils.isEmpty(join))
+        if (StringUtils.isEmpty((CharSequence)join))
             throw new UserException(_loc.get("null-join"));
 
         lock();
@@ -430,7 +430,7 @@ public boolean hasFetchInnerJoin(String field) {
     }
 
     public JDBCFetchConfiguration addFetchInnerJoin(String join) {
-        if (StringUtils.isEmpty(join))
+        if (StringUtils.isEmpty((CharSequence)join))
             throw new UserException(_loc.get("null-join"));
 
         lock();

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java

@@ -27,7 +27,7 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.kernel.FetchConfiguration;
 import org.apache.openjpa.kernel.PreparedQuery;
@@ -215,7 +215,7 @@ public Exclusion isExcluded(String id) {
 	public void setExcludes(String excludes) {
 		lock(false);
 		try {
-			if (StringUtils.isEmpty(excludes))
+			if (StringUtils.isEmpty((CharSequence)excludes))
 				return;
 			String[] patterns = excludes.split(PATTERN_SEPARATOR);
 			for (String pattern : patterns)

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java

@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.MappingRepository;
 import org.apache.openjpa.jdbc.meta.QueryResultMapping;

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java

@@ -28,7 +28,7 @@
 
 import javax.transaction.NotSupportedException;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
@@ -212,7 +212,7 @@ public void setInitialValue(int intValue) {
      * a '|' character. This method parses it back to array of Strings. 
      */
     public void setUniqueColumns(String columnNames) {
-    	_uniqueColumnNames = (StringUtils.isEmpty(columnNames)) 
+    	_uniqueColumnNames = (StringUtils.isEmpty((CharSequence)columnNames)) 
     		? null : DBIdentifier.split(columnNames, DBIdentifierType.COLUMN, IdentifierUtil.BAR);
     }
 

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java

@@ -24,7 +24,7 @@
 import java.util.LinkedList;
 import java.util.ListIterator;
 
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStoreQuery;
 import org.apache.openjpa.jdbc.meta.ClassMapping;

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java

@@ -20,7 +20,7 @@
 
 import java.lang.reflect.Modifier;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.jdbc.meta.strats.NoneDiscriminatorStrategy;
 import org.apache.openjpa.jdbc.meta.strats.SuperclassDiscriminatorStrategy;
 import org.apache.openjpa.jdbc.meta.strats.ValueMapDiscriminatorStrategy;
@@ -64,7 +64,7 @@ public void setValue(String value) {
     public Object getValue(Discriminator discrim, boolean adapt) {
         if (discrim.getValue() != null)
             return discrim.getValue();
-        if (StringUtils.isEmpty(_value)) {
+        if (StringUtils.isEmpty((CharSequence)_value)) {
             return discrim.getMappingRepository().getMappingDefaults().
                 getDiscriminatorValue(discrim, adapt);
         }

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java

@@ -24,7 +24,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
@@ -1413,7 +1413,7 @@ private void mergeJoinColumn(MetaDataContext context, String prefix,
             String[] names = Normalizer.splitName(fieldName);
             fullTarget = names.length > 1;
 
-            if (names.length > 1 && StringUtils.isEmpty(names[0])) {
+            if (names.length > 1 && StringUtils.isEmpty((CharSequence)names[0])) {
                 // allow use of '.' without prefix to mean "use expected local
                 // cls"; but if we already inversed no need to switch again
                 if (!inverse)

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/PropertiesReverseCustomizer.java

@@ -22,7 +22,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
 import org.apache.openjpa.jdbc.schema.Table;

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java

@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.sql.Joins;
 import org.apache.openjpa.lib.meta.SourceTracker;
@@ -310,7 +310,7 @@ public Object getMapping(String path) {
          * Map the given path to the given result id.
          */
         public void addMapping(String path, Object id) {
-            if (StringUtils.isEmpty(path))
+            if (StringUtils.isEmpty((CharSequence)path))
                 throw new MetaDataException(_loc.get("null-path",
                     QueryResultMapping.this, _candidate));