From 1f303a41fee355af8079a8409f155959d6314acf Mon Sep 17 00:00:00 2001 From: Ajay Paul Date: Wed, 5 Nov 2025 18:00:15 +0530 Subject: [PATCH 1/2] Changed the imports to commons lang 3 and also casted the charsequences --- .../jdbc/ant/ReverseMappingToolTask.java | 6 +- .../jdbc/conf/JDBCConfigurationImpl.java | 6 +- .../jdbc/conf/MappingFactoryValue.java | 8 +- .../openjpa/jdbc/identifier/DBIdentifier.java | 6 +- .../jdbc/identifier/DBIdentifierUtilImpl.java | 4 +- .../openjpa/jdbc/identifier/Normalizer.java | 12 +- .../openjpa/jdbc/kernel/FinderCacheImpl.java | 4 +- .../jdbc/kernel/JDBCBrokerFactory.java | 4 +- .../kernel/JDBCFetchConfigurationImpl.java | 6 +- .../jdbc/kernel/PreparedQueryCacheImpl.java | 4 +- .../openjpa/jdbc/kernel/SQLStoreQuery.java | 2 +- .../openjpa/jdbc/kernel/TableJDBCSeq.java | 4 +- .../openjpa/jdbc/kernel/exps/PCPath.java | 2 +- .../jdbc/meta/DiscriminatorMappingInfo.java | 4 +- .../apache/openjpa/jdbc/meta/MappingInfo.java | 4 +- .../meta/PropertiesReverseCustomizer.java | 2 +- .../openjpa/jdbc/meta/QueryResultMapping.java | 4 +- .../openjpa/jdbc/meta/ReverseMappingTool.java | 4 +- .../openjpa/jdbc/meta/SequenceMapping.java | 2 +- .../ClassNameDiscriminatorStrategy.java | 4 +- .../strats/MultiColumnVersionStrategy.java | 4 +- .../apache/openjpa/jdbc/schema/Column.java | 2 +- .../jdbc/schema/DataSourceFactory.java | 4 +- .../openjpa/jdbc/schema/ForeignKey.java | 4 +- .../apache/openjpa/jdbc/schema/NameSet.java | 4 +- .../openjpa/jdbc/schema/SchemaTool.java | 4 +- .../apache/openjpa/jdbc/schema/Schemas.java | 4 +- .../jdbc/schema/XMLSchemaSerializer.java | 4 +- .../apache/openjpa/jdbc/sql/DBDictionary.java | 16 +-- .../openjpa/jdbc/sql/DBDictionaryFactory.java | 6 +- .../apache/openjpa/jdbc/sql/H2Dictionary.java | 4 +- .../openjpa/jdbc/sql/HSQLDictionary.java | 4 +- .../org/apache/openjpa/jdbc/sql/JoinSet.java | 2 +- .../openjpa/jdbc/sql/MySQLDictionary.java | 4 +- .../apache/openjpa/jdbc/sql/PrimaryRow.java | 2 +- .../apache/openjpa/jdbc/sql/SQLBuffer.java | 2 +- .../openjpa/jdbc/sql/SQLErrorCodeReader.java | 4 +- .../apache/openjpa/jdbc/sql/SelectImpl.java | 6 +- .../openjpa/jdbc/sql/SolidDBDictionary.java | 4 +- .../openjpa/jdbc/sql/SybaseDictionary.java | 4 +- .../conf/OpenJPAConfigurationImpl.java | 2 +- .../conf/RemoteCommitProviderValue.java | 2 +- .../apache/openjpa/conf/Specification.java | 2 +- .../openjpa/datacache/AbstractDataCache.java | 6 +- .../datacache/DelegatingDataCache.java | 2 +- .../datacache/DelegatingQueryCache.java | 2 +- .../apache/openjpa/datacache/QueryKey.java | 4 +- .../TypeBasedCacheDistributionPolicy.java | 4 +- .../openjpa/enhance/ApplicationIdTool.java | 2 +- .../apache/openjpa/enhance/CodeGenerator.java | 4 +- .../enhance/DynamicStorageGenerator.java | 2 +- .../openjpa/enhance/PCDataGenerator.java | 2 +- .../apache/openjpa/enhance/PCEnhancer.java | 2 +- .../openjpa/enhance/PCSubclassValidator.java | 2 +- .../apache/openjpa/enhance/Reflection.java | 2 +- .../openjpa/kernel/AbstractBrokerFactory.java | 2 +- .../apache/openjpa/kernel/AttachStrategy.java | 2 +- .../org/apache/openjpa/kernel/BrokerImpl.java | 2 +- .../kernel/FetchConfigurationImpl.java | 6 +- .../openjpa/kernel/MethodStoreQuery.java | 4 +- .../org/apache/openjpa/kernel/QueryImpl.java | 6 +- .../apache/openjpa/kernel/ResultPacker.java | 4 +- .../openjpa/kernel/StateManagerImpl.java | 2 +- .../openjpa/kernel/exps/CandidatePath.java | 2 +- .../exps/InMemoryExpressionFactory.java | 2 +- .../meta/AbstractCFMetaDataFactory.java | 10 +- .../openjpa/meta/AbstractMetaDataFactory.java | 4 +- .../apache/openjpa/meta/ClassMetaData.java | 6 +- .../org/apache/openjpa/meta/Extensions.java | 2 +- .../org/apache/openjpa/meta/FetchGroup.java | 6 +- .../apache/openjpa/meta/FieldMetaData.java | 6 +- .../openjpa/meta/InterfaceImplGenerator.java | 2 +- .../openjpa/meta/MetaDataRepository.java | 2 +- .../apache/openjpa/meta/QueryMetaData.java | 4 +- .../apache/openjpa/meta/SequenceMetaData.java | 4 +- .../apache/openjpa/meta/XMLClassMetaData.java | 2 +- .../apache/openjpa/meta/XMLFieldMetaData.java | 2 +- .../apache/openjpa/util/ArrayStateImage.java | 2 +- .../apache/openjpa/util/ProxyManagerImpl.java | 2 +- .../org/apache/openjpa/util/StringId.java | 2 +- openjpa-lib/pom.xml | 4 +- .../apache/openjpa/lib/ant/AbstractTask.java | 4 +- .../openjpa/lib/conf/ConfigurationImpl.java | 2 +- .../openjpa/lib/conf/Configurations.java | 33 +++-- .../apache/openjpa/lib/conf/DoubleValue.java | 4 +- .../apache/openjpa/lib/conf/FileValue.java | 2 +- .../org/apache/openjpa/lib/conf/IntValue.java | 4 +- .../apache/openjpa/lib/conf/ObjectValue.java | 2 +- .../openjpa/lib/conf/PluginListValue.java | 6 +- .../apache/openjpa/lib/conf/PluginValue.java | 2 +- .../openjpa/lib/conf/ProductDerivations.java | 6 +- .../openjpa/lib/conf/StringListValue.java | 2 +- .../apache/openjpa/lib/conf/StringValue.java | 2 +- .../org/apache/openjpa/lib/conf/Value.java | 2 +- .../lib/identifier/IdentifierRule.java | 6 +- .../lib/identifier/IdentifierUtilImpl.java | 8 +- .../openjpa/lib/meta/CFMetaDataParser.java | 10 +- .../openjpa/lib/meta/ClassArgParser.java | 7 +- .../rop/AbstractNonSequentialResultList.java | 2 +- .../lib/rop/AbstractSequentialResultList.java | 2 +- .../lib/rop/ListResultObjectProvider.java | 3 +- .../lib/rop/MergedResultObjectProvider.java | 3 +- .../org/apache/openjpa/lib/util/Files.java | 21 ++-- .../org/apache/openjpa/lib/util/Options.java | 6 +- .../openjpa/lib/util/ParseException.java | 4 +- .../openjpa/lib/util/UUIDGenerator.java | 3 +- .../apache/openjpa/lib/xml/XMLFactory.java | 9 +- .../AnnotationPersistenceMappingParser.java | 118 +++++++++--------- ...nnotationPersistenceMappingSerializer.java | 8 +- .../jdbc/XMLPersistenceMappingParser.java | 44 +++---- .../jdbc/XMLPersistenceMappingSerializer.java | 8 +- .../jdbc/meta/strats/AbstractLobTest.java | 2 +- .../persistence/event/TestBeforeCommit.java | 2 +- .../query/TestXMLCustomerOrder.java | 2 +- .../persistence/AnnotationBuilder.java | 2 +- .../AnnotationPersistenceMetaDataParser.java | 42 +++---- ...notationPersistenceMetaDataSerializer.java | 2 +- ...nnotationPersistenceXMLMetaDataParser.java | 2 +- .../persistence/EntityManagerFactoryImpl.java | 2 +- .../persistence/EntityManagerImpl.java | 2 +- .../openjpa/persistence/JPAProperties.java | 2 +- .../PersistenceMetaDataDefaults.java | 2 +- .../PersistenceProductDerivation.java | 16 +-- .../XMLPersistenceMetaDataParser.java | 42 +++---- .../XMLPersistenceMetaDataSerializer.java | 2 +- .../persistence/validation/ValidatorImpl.java | 2 +- pom.xml | 6 +- 127 files changed, 383 insertions(+), 392 deletions(-) diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java index 174ddedaf7..2b58b0c90b 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java +++ b/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 diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java index 626559bbf4..07e270609f 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java +++ b/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) { diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java index b03d7f60d0..b51fe9e238 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java +++ b/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) diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifier.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifier.java index 873e3226b1..74b2989822 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifier.java +++ b/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); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtilImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtilImpl.java index d4d59cdfed..b95fab3320 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtilImpl.java +++ b/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; diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/Normalizer.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/Normalizer.java index 5c8a2824f0..8622814061 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/Normalizer.java +++ b/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)) { diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java index 2970b608c7..17d100c28a 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java +++ b/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(); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java index 71f97afda7..8126a0f218 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java +++ b/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(); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java index c9af34caa7..9a86124cc1 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java +++ b/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(); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java index 81c1124ccc..d48ba3e32b 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java +++ b/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) diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java index 9b849da0d4..6823347301 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java +++ b/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; diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java index 9c221f8afd..3227e1f497 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java +++ b/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); } diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java index de38bfd90e..9c8b80bf41 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java +++ b/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; diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java index cdced7af34..10b3fb9273 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java +++ b/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); } diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java index c5c591a663..faf8e0af8a 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java +++ b/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) diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/PropertiesReverseCustomizer.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/PropertiesReverseCustomizer.java index 608c0a8d5d..5a97955d4d 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/PropertiesReverseCustomizer.java +++ b/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; diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java index e303bc4fc9..738e7f9741 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java +++ b/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)); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java index 9a30a41f0f..fe6339be29 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java @@ -42,7 +42,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.conf.OpenJPAConfiguration; import org.apache.openjpa.enhance.ApplicationIdTool; import org.apache.openjpa.enhance.CodeGenerator; @@ -1568,7 +1568,7 @@ private static boolean allUpperCase(String str) { * package-private for testing. */ static String replaceInvalidCharacters(String str) { - if (StringUtils.isEmpty(str)) + if (StringUtils.isEmpty((CharSequence)str)) return str; StringBuilder buf = new StringBuilder(str); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/SequenceMapping.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/SequenceMapping.java index ae59eb2307..2a01cde759 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/SequenceMapping.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/SequenceMapping.java @@ -20,7 +20,7 @@ import java.io.File; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.conf.JDBCSeqValue; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType; diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClassNameDiscriminatorStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClassNameDiscriminatorStrategy.java index 2c81abe648..95c23ccc72 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClassNameDiscriminatorStrategy.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClassNameDiscriminatorStrategy.java @@ -23,7 +23,7 @@ import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration; import org.apache.openjpa.jdbc.kernel.JDBCStore; @@ -95,7 +95,7 @@ fetch, new SQLBuffer(dict).append(col.getTable()), null, null, String className; while (rs.next()) { className = dict.getString(rs, 1); - if (StringUtils.isEmpty(className)) + if (StringUtils.isEmpty((CharSequence)className)) throw new ClassNotFoundException(_loc.get("no-class-name", disc.getClassMapping(), col).getMessage()); Class.forName(className, true, loader); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java index cf9d125f8f..2b5db40644 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.jdbc.meta.strats; -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.Schemas; import org.apache.openjpa.meta.JavaTypes; @@ -81,7 +81,7 @@ protected int getJavaType(int i) { } if (_javaTypes[i] == null) { Column col = (Column)vers.getMappingInfo().getColumns().get(i); - if (!StringUtils.isEmpty(col.getTypeName())) { + if (!StringUtils.isEmpty((CharSequence)col.getTypeName())) { Class javaType = Schemas.getJavaType(col.getType(), col.getSize(), col.getDecimalDigits()); _javaTypes[i] = JavaTypes.getTypeCode(javaType); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java index 1b25cf71dd..ddc8565693 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java @@ -28,7 +28,7 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier; import org.apache.openjpa.jdbc.meta.JavaSQLTypes; diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java index 617fa31751..83fade5749 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java @@ -29,7 +29,7 @@ import javax.sql.DataSource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; import org.apache.openjpa.lib.conf.Configurations; @@ -68,7 +68,7 @@ public static DataSource newDataSource(JDBCConfiguration conf, boolean factory2) { String driver = (factory2) ? conf.getConnection2DriverName() : conf.getConnectionDriverName(); - if (StringUtils.isEmpty(driver)) + if (StringUtils.isEmpty((CharSequence)driver)) throw new UserException(_loc.get("no-driver", conf)). setFatal(true); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java index 485d64ec40..2645a0fc32 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java @@ -25,8 +25,8 @@ import java.util.LinkedHashMap; import java.util.List; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.identifier.Normalizer; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.sql.DBDictionary; diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java index 3cdcea3265..0fa28d6c59 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType; import org.apache.openjpa.lib.util.Localizer; @@ -74,7 +74,7 @@ protected void addName(String name, boolean validate) { * @param validate if true, null or empty names will not be accepted */ protected void addName(DBIdentifier name, boolean validate) { - if (DBIdentifier.isNull(name) || StringUtils.isEmpty(name.getName())) { + if (DBIdentifier.isNull(name) || StringUtils.isEmpty((CharSequence)name.getName())) { if (validate) throw new IllegalArgumentException(_loc.get("bad-name", name) .getMessage()); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java index ecdfc86829..37ee07e228 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java @@ -35,7 +35,7 @@ import java.util.Set; import javax.sql.DataSource; -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.conf.JDBCConfigurationImpl; @@ -1462,7 +1462,7 @@ public static boolean run(JDBCConfiguration conf, String[] args, gen.setOpenJPATables(flags.openjpaTables); String schemas = conf.getSchemas(); - if (StringUtils.isEmpty(schemas)) + if (StringUtils.isEmpty((CharSequence)schemas)) schemas = "all"; log.info(_loc.get("sch-reflect", schemas)); gen.generateSchemas(); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schemas.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schemas.java index 21b0614dea..70ae61e127 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schemas.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schemas.java @@ -21,7 +21,7 @@ import java.sql.Types; import java.util.Date; -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; @@ -57,7 +57,7 @@ public static DBIdentifier getNewTableSchemaIdentifier(JDBCConfiguration conf) { if (schemas.length == 0) return DBIdentifier.NULL; String[] names = Normalizer.splitName(schemas[0]); - if (names.length == 0 || StringUtils.isEmpty(names[0])) { + if (names.length == 0 || StringUtils.isEmpty((CharSequence)names[0])) { return DBIdentifier.NULL; } return DBIdentifier.newSchema(names[0]); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java index b45e9e75cc..3e88d250a3 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.lib.meta.XMLMetaDataSerializer; import org.apache.openjpa.lib.util.Localizer; @@ -265,7 +265,7 @@ private void serializeColumn(Column col) throws SAXException { addAttribute("name", col.getName()); addAttribute("type", Schemas.getJDBCName(col.getType())); - if (!StringUtils.isEmpty(col.getTypeName()) + if (!StringUtils.isEmpty((CharSequence)col.getTypeName()) && !col.getTypeName().equalsIgnoreCase (Schemas.getJDBCName(col.getType()))) addAttribute("type-name", col.getTypeName()); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java index a13e8c168b..7dba487980 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java @@ -63,7 +63,7 @@ import javax.sql.DataSource; -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.ColumnDefIdentifierRule; import org.apache.openjpa.jdbc.identifier.DBIdentifier; @@ -766,7 +766,7 @@ public char getChar(ResultSet rs, int column) return (char) getInt(rs, column); String str = getString(rs, column); - return (StringUtils.isEmpty(str)) ? 0 : str.charAt(0); + return (StringUtils.isEmpty((CharSequence)str)) ? 0 : str.charAt(0); } /** @@ -882,7 +882,7 @@ public int getInt(ResultSet rs, int column) public Locale getLocale(ResultSet rs, int column) throws SQLException { String str = getString(rs, column); - if (StringUtils.isEmpty(str)) + if (StringUtils.isEmpty((CharSequence)str)) return null; String[] params = Strings.split(str, "_", 3); @@ -1862,7 +1862,7 @@ protected String appendSize(Column col, String typeName) { * size clause will be inserted appropriately. */ protected String insertSize(String typeName, String size) { - if (StringUtils.isEmpty(size)) { + if (StringUtils.isEmpty((CharSequence)size)) { int idx = typeName.indexOf("{0}"); if (idx != -1) { return typeName.substring(0, idx); @@ -1917,7 +1917,7 @@ else if ("traditional".equals(syntax)) joinSyntax = SYNTAX_TRADITIONAL; else if ("database".equals(syntax)) joinSyntax = SYNTAX_DATABASE; - else if (!StringUtils.isEmpty(syntax)) + else if (!StringUtils.isEmpty((CharSequence)syntax)) throw new IllegalArgumentException(syntax); } @@ -2715,7 +2715,7 @@ private SQLBuffer toOperation(String op, SQLBuffer selects, SQLBuffer from, buf.append(" ").append(selects).append(" FROM ").append(from); if (checkTableForUpdate - && (StringUtils.isEmpty(forUpdateClause) && !StringUtils + && (StringUtils.isEmpty((CharSequence)forUpdateClause) && !StringUtils .isEmpty(tableForUpdateClause))) { buf.append(" ").append(tableForUpdateClause); } @@ -4222,7 +4222,7 @@ protected Column newColumn(ResultSet colMeta) == DatabaseMetaData.columnNoNulls); String def = colMeta.getString("COLUMN_DEF"); - if (!StringUtils.isEmpty(def) && !"null".equalsIgnoreCase(def)) + if (!StringUtils.isEmpty((CharSequence)def) && !"null".equalsIgnoreCase(def)) c.setDefaultString(def); return c; } @@ -4911,7 +4911,7 @@ public Connection decorate(Connection conn) throws SQLException { if (!connected) connectedConfiguration(conn); - if (!StringUtils.isEmpty(initializationSQL)) { + if (!StringUtils.isEmpty((CharSequence)initializationSQL)) { PreparedStatement stmnt = null; try { stmnt = conn.prepareStatement(initializationSQL); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java index 169f107f10..3c96829aa9 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java @@ -25,7 +25,7 @@ import java.sql.SQLException; import javax.sql.DataSource; -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.lib.conf.Configurations; @@ -119,7 +119,7 @@ public static DBDictionary newDBDictionary(JDBCConfiguration conf, */ static String getProtocol(String url) { String protocol = null; - if (!StringUtils.isEmpty(url)) { + if (!StringUtils.isEmpty((CharSequence)url)) { if (url.startsWith("jdbc:")) { int colonCount = 1; int next = "jdbc:".length(); @@ -212,7 +212,7 @@ private static DBDictionary newDBDictionary(JDBCConfiguration conf, */ private static String dictionaryClassForString(String prod , JDBCConfiguration conf) { - if (StringUtils.isEmpty(prod)) + if (StringUtils.isEmpty((CharSequence)prod)) return null; prod = prod.toLowerCase(); diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java index 0bedcff84a..fb29b2e0f3 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java @@ -25,7 +25,7 @@ import java.util.Arrays; import java.util.Locale; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.kernel.exps.FilterValue; import org.apache.openjpa.jdbc.schema.Column; @@ -140,7 +140,7 @@ public String[] getCreateTableSQL(Table table) { String pkStr; if (pk != null) { pkStr = getPrimaryKeyConstraintSQL(pk); - if (!StringUtils.isEmpty(pkStr)) + if (!StringUtils.isEmpty((CharSequence)pkStr)) buf.append(", ").append(pkStr); } diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java index 9b8644afc6..5695649088 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java @@ -26,7 +26,7 @@ import java.sql.Types; import java.util.Arrays; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hsqldb.Trace; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.kernel.exps.FilterValue; @@ -197,7 +197,7 @@ public String[] getCreateTableSQL(Table table) { String pkStr; if (pk != null) { pkStr = getPrimaryKeyConstraintSQL(pk); - if (!StringUtils.isEmpty(pkStr)) + if (!StringUtils.isEmpty((CharSequence)pkStr)) buf.append(", ").append(pkStr); } diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSet.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSet.java index e603fcba36..f91221579c 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSet.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSet.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; /** * Set type that recognizes that inner joins should take precedence diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java index 309c74a43f..7dbc7c0d44 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType; import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration; @@ -239,7 +239,7 @@ private static int[] getMajorMinorVersions(String versionStr) @Override public String[] getCreateTableSQL(Table table) { String[] sql = super.getCreateTableSQL(table); - if (!StringUtils.isEmpty(tableType)) + if (!StringUtils.isEmpty((CharSequence)tableType)) sql[0] = sql[0] + " ENGINE = " + tableType; return sql; } diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java index 7a5e9e67e6..2b1b9681df 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java @@ -20,7 +20,7 @@ import java.sql.SQLException; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.openjpa.jdbc.meta.ClassMapping; import org.apache.openjpa.jdbc.meta.RelationId; import org.apache.openjpa.jdbc.schema.Column; diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java index c86f611ecb..54c419abe0 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration; import org.apache.openjpa.jdbc.kernel.exps.CollectionParam; diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLErrorCodeReader.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLErrorCodeReader.java index 47144f44a7..04fc5f5aa9 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLErrorCodeReader.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLErrorCodeReader.java @@ -27,7 +27,7 @@ import javax.xml.parsers.DocumentBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; import org.apache.openjpa.lib.log.Log; @@ -141,7 +141,7 @@ static void readErrorCodes(Node node, DBDictionary dict) { Node textNode = child.getFirstChild(); if (storeErrorTypes.containsKey(errorType) && textNode != null){ String errorCodes = textNode.getNodeValue(); - if (!StringUtils.isEmpty(errorCodes)) { + if (!StringUtils.isEmpty((CharSequence)errorCodes)) { String[] codes = errorCodes.split(ERROR_CODE_DELIMITER); for (String code : codes) { dict.addErrorCode(storeErrorTypes.get(errorType), diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java index 1be016389b..2dc65dd0d0 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java @@ -39,7 +39,7 @@ import java.util.TreeMap; import org.apache.commons.collections.iterators.EmptyIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.kernel.EagerFetchModes; import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration; @@ -1486,7 +1486,7 @@ public void where(String sql, Joins joins) { */ private void where(String sql, PathJoins pj) { // no need to use joins... - if (StringUtils.isEmpty(sql)) + if (StringUtils.isEmpty((CharSequence)sql)) return; if (_where == null) @@ -1532,7 +1532,7 @@ public void having(String sql, Joins joins) { */ private void having(String sql, PathJoins pj) { // no need to use joins... - if (StringUtils.isEmpty(sql)) + if (StringUtils.isEmpty((CharSequence)sql)) return; if (_having == null) diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SolidDBDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SolidDBDictionary.java index f64b11c370..a59dd1c106 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SolidDBDictionary.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SolidDBDictionary.java @@ -27,7 +27,7 @@ import java.util.Arrays; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.kernel.exps.FilterValue; import org.apache.openjpa.jdbc.kernel.exps.Lit; @@ -161,7 +161,7 @@ public String[] getCreateTableSQL(Table table, SchemaGroup group) { String pkStr; if (pk != null) { pkStr = getPrimaryKeyConstraintSQL(pk); - if (!StringUtils.isEmpty(pkStr)) + if (!StringUtils.isEmpty((CharSequence)pkStr)) buf.append(", ").append(pkStr); } diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java index 890e47c832..35013f9b1b 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java @@ -28,7 +28,7 @@ import java.sql.Types; import java.util.Arrays; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType; import org.apache.openjpa.jdbc.kernel.exps.FilterValue; import org.apache.openjpa.jdbc.schema.Column; @@ -302,7 +302,7 @@ public void endConfiguration() { // warn about jdbc compliant flag String url = conf.getConnectionURL(); - if (!StringUtils.isEmpty(url) + if (!StringUtils.isEmpty((CharSequence)url) && url.toLowerCase().indexOf("jdbc:sybase:tds") != -1 && url.toLowerCase().indexOf("be_as_jdbc_compliant_as_possible=") == -1) { diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java index d3a186c8fe..101b8a42cb 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.audit.AuditLogger; import org.apache.openjpa.audit.Auditor; import org.apache.openjpa.datacache.CacheDistributionPolicy; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java index 58a371283f..4b5770250c 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.conf; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.event.RemoteCommitEventManager; import org.apache.openjpa.event.RemoteCommitProvider; import org.apache.openjpa.lib.conf.Configuration; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Specification.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Specification.java index b3dfde43d6..1ea129bab6 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Specification.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Specification.java @@ -20,7 +20,7 @@ import java.text.MessageFormat; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.conf.Configurable; import org.apache.openjpa.lib.conf.Configuration; import org.apache.openjpa.lib.util.Localizer; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java index f784b4c999..02cd9797db 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java @@ -30,7 +30,7 @@ import java.util.Map; 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.event.RemoteCommitEvent; import org.apache.openjpa.event.RemoteCommitListener; @@ -530,7 +530,7 @@ public void setTypes(Set types) { public void setTypes(String types) { _includedTypes = - StringUtils.isEmpty(types) ? null : new HashSet(Arrays.asList(Strings.split(types, ";", 0))); + StringUtils.isEmpty((CharSequence)types) ? null : new HashSet(Arrays.asList(Strings.split(types, ";", 0))); if (log.isWarnEnabled()) log.warn(s_loc.get("recommend_jpa2_caching", new Object[]{"Types", DataCacheMode.ENABLE_SELECTIVE.toString()})); @@ -545,7 +545,7 @@ public void setExcludedTypes(Set types) { public void setExcludedTypes(String types) { _excludedTypes = - StringUtils.isEmpty(types) ? null : new HashSet(Arrays.asList(Strings.split(types, ";", 0))); + StringUtils.isEmpty((CharSequence)types) ? null : new HashSet(Arrays.asList(Strings.split(types, ";", 0))); if (log.isWarnEnabled()) log.warn(s_loc.get("recommend_jpa2_caching", new Object[]{"ExcludeTypes", DataCacheMode.DISABLE_SELECTIVE.toString()})); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java index 0c50094249..6310656581 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.openjpa.util.RuntimeExceptionTranslator; /** diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java index 8a40436108..991d858317 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.datacache; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.openjpa.kernel.QueryStatistics; import org.apache.openjpa.util.RuntimeExceptionTranslator; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryKey.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryKey.java index f58f6f11ca..e43574b6b7 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryKey.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryKey.java @@ -36,8 +36,8 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.enhance.PCRegistry; import org.apache.openjpa.kernel.Query; import org.apache.openjpa.kernel.QueryContext; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypeBasedCacheDistributionPolicy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypeBasedCacheDistributionPolicy.java index e797a81533..481c46298e 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypeBasedCacheDistributionPolicy.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypeBasedCacheDistributionPolicy.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.kernel.OpenJPAStateManager; import org.apache.openjpa.meta.ClassMetaData; @@ -76,7 +76,7 @@ public void setIncludedTypes(String types) { } private Set parseNames(String types) { - if (StringUtils.isEmpty(types)) + if (StringUtils.isEmpty((CharSequence)types)) return Collections.emptySet(); String[] names = Strings.split(types, ";", 0); Set set = new HashSet(); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java index 80058f075a..9443bb7e3a 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java @@ -36,7 +36,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.conf.OpenJPAConfiguration; import org.apache.openjpa.conf.OpenJPAConfigurationImpl; import org.apache.openjpa.lib.conf.Configuration; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/CodeGenerator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/CodeGenerator.java index 981937aa63..b0222bcf65 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/CodeGenerator.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/CodeGenerator.java @@ -26,8 +26,8 @@ import java.util.TreeSet; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.WordUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.text.WordUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.lib.util.CodeFormat; import org.apache.openjpa.lib.util.Files; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java index b8575d8293..4a448dd585 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java @@ -21,7 +21,7 @@ import java.lang.reflect.Constructor; import java.security.AccessController; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.util.InternalException; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java index b264860a68..9e98f4d512 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java @@ -24,7 +24,7 @@ import java.util.LinkedList; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.AbstractPCData; import org.apache.openjpa.kernel.FetchConfiguration; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java index 565a0f3ed4..24e9c168cf 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java @@ -49,7 +49,7 @@ import java.util.Properties; 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.conf.OpenJPAConfigurationImpl; import org.apache.openjpa.lib.conf.Configurations; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCSubclassValidator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCSubclassValidator.java index eb726ed6db..47c4e74f57 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCSubclassValidator.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCSubclassValidator.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.Collection; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.meta.AccessCode; import org.apache.openjpa.meta.ClassMetaData; import org.apache.openjpa.meta.FieldMetaData; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java index 6fc5143505..04e8d62f85 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java @@ -29,7 +29,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.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.ReferenceMap; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java index 0a7b26291f..8acaec014f 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java @@ -39,7 +39,7 @@ import javax.transaction.TransactionManager; import org.apache.commons.collections.set.MapBackedSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.kernel.AuditManager; import org.apache.openjpa.audit.Auditor; import org.apache.openjpa.conf.BrokerValue; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachStrategy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachStrategy.java index 5e2811dda8..8da52cc074 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachStrategy.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachStrategy.java @@ -25,7 +25,7 @@ import java.util.Set; import java.util.Map.Entry; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.enhance.StateManager; import org.apache.openjpa.lib.util.Localizer; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java index accefdb5fd..d5f8d2c1b7 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java @@ -48,7 +48,7 @@ import org.apache.commons.collections.map.IdentityMap; import org.apache.commons.collections.map.LinkedMap; import org.apache.commons.collections.set.MapBackedSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.datacache.DataCache; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java index ea1ac60f63..760a291cf6 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java @@ -31,7 +31,7 @@ import java.util.Map; 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.lib.rop.EagerResultList; import org.apache.openjpa.lib.rop.ListResultObjectProvider; @@ -348,7 +348,7 @@ public FetchConfiguration addFetchGroup(String name) { } private FetchConfiguration addFetchGroup(String name, boolean recomputeIsDefault) { - if (StringUtils.isEmpty(name)) + if (StringUtils.isEmpty((CharSequence)name)) throw new UserException(_loc.get("null-fg")); lock(); @@ -489,7 +489,7 @@ public boolean hasField(String field) { } public FetchConfiguration addField(String field) { - if (StringUtils.isEmpty(field)) + if (StringUtils.isEmpty((CharSequence)field)) throw new UserException(_loc.get("null-field")); lock(); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java index 710cca2525..2cce5c4162 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java @@ -30,7 +30,7 @@ import java.util.Map; import org.apache.commons.collections.map.LinkedMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.rop.ListResultObjectProvider; import org.apache.openjpa.lib.rop.RangeResultObjectProvider; import org.apache.openjpa.lib.rop.ResultObjectProvider; @@ -226,7 +226,7 @@ public void validate(StoreQuery q) { return; String methName = q.getContext().getQueryString(); - if (StringUtils.isEmpty(methName)) + if (StringUtils.isEmpty((CharSequence)methName)) throw new UserException(_loc.get("no-method")); int dotIdx = methName.lastIndexOf('.'); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java index 7393dc6cc5..3750589043 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java @@ -33,8 +33,8 @@ import java.util.concurrent.locks.ReentrantLock; import org.apache.commons.collections.map.LinkedMap; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.kernel.exps.AggregateListener; @@ -1205,7 +1205,7 @@ private void logExecution(int op, OrderedMap> types, Object[] p */ private void logExecution(int op, Map params) { String s = _query; - if (StringUtils.isEmpty(s)) + if (StringUtils.isEmpty((CharSequence)s)) s = toString(); String msg = "executing-query"; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java index 153a1bfcf6..1af85a42f3 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java @@ -36,7 +36,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.util.OpenJPAException; @@ -306,7 +306,7 @@ private Object packUserType(Object[] result) { */ private static Member findSet(String alias, Class type, Field[] fields, Method[] methods) { - if (StringUtils.isEmpty(alias)) + if (StringUtils.isEmpty((CharSequence)alias)) return null; if (type == Object.class) type = null; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java index 459dc41bd1..fad55c3f71 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java @@ -38,7 +38,7 @@ import java.util.TimeZone; import java.util.concurrent.locks.ReentrantLock; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.DetachOptions.FetchGroups; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.enhance.DynamicPersistenceCapable; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CandidatePath.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CandidatePath.java index 5971c376a0..32944047cb 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CandidatePath.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CandidatePath.java @@ -22,7 +22,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.kernel.Broker; import org.apache.openjpa.kernel.Filters; import org.apache.openjpa.kernel.OpenJPAStateManager; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java index 89f22f3fcb..2ce63b14dc 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java @@ -30,7 +30,7 @@ import java.util.ListIterator; import java.util.Set; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.openjpa.kernel.Extent; import org.apache.openjpa.kernel.StoreContext; import org.apache.openjpa.lib.util.Localizer; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java index eac38a4e13..e382d35c8e 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java @@ -39,7 +39,7 @@ import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.conf.OpenJPAConfigurationImpl; import org.apache.openjpa.lib.meta.ClassArgParser; @@ -96,7 +96,7 @@ public void setFiles(Collection files) { * directories supplied by user via auto-configuration. */ public void setFiles(String files) { - if (StringUtils.isEmpty(files)) + if (StringUtils.isEmpty((CharSequence)files)) this.files = null; else { String[] strs = Strings.split(files, ";", 0); @@ -124,7 +124,7 @@ public void setURLs(Collection urls) { * supplied by user via auto-configuration. */ public void setURLs(String urls) { - if (StringUtils.isEmpty(urls)) + if (StringUtils.isEmpty((CharSequence)urls)) this.urls = null; else { String[] strs = Strings.split(urls, ";", 0); @@ -151,7 +151,7 @@ public void setResources(Collection rsrcs) { */ public void setResources(String rsrcs) { // keep list mutable so subclasses can add implicit locations - this.rsrcs = (StringUtils.isEmpty(rsrcs)) ? null + this.rsrcs = (StringUtils.isEmpty((CharSequence)rsrcs)) ? null : new ArrayList(Arrays.asList(Strings.split(rsrcs, ";", 0))); } @@ -169,7 +169,7 @@ public void setClasspathScan(Collection cpath) { */ public void setClasspathScan(String cpath) { // keep list mutable so subclasses can add implicit locations - this.cpath = (StringUtils.isEmpty(cpath)) ? null + this.cpath = (StringUtils.isEmpty((CharSequence)cpath)) ? null : new ArrayList(Arrays.asList(Strings.split(cpath, ";", 0))); } diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.java index 8fb60f97b0..ef100b9fed 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.java @@ -25,7 +25,7 @@ import java.util.Map; 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.lib.log.Log; import org.apache.openjpa.lib.meta.ClassArgParser; @@ -60,7 +60,7 @@ public void setTypes(Set types) { * auto-configuration. */ public void setTypes(String types) { - this.types = (StringUtils.isEmpty(types)) ? null + this.types = (StringUtils.isEmpty((CharSequence)types)) ? null : new HashSet(Arrays.asList(Strings.split(types, ";", 0))); } diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java index b1b147c245..cb74ae87e9 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java @@ -36,7 +36,7 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.datacache.CacheDistributionPolicy; import org.apache.openjpa.datacache.DataCache; @@ -2000,7 +2000,7 @@ private void validateDataCache() { String superCache = getPCSuperclassMetaData().getDataCacheName(); - if (!StringUtils.isEmpty(superCache)) { + if (!StringUtils.isEmpty((CharSequence)superCache)) { if (!StringUtils.equals(cache, superCache)) { throw new MetaDataException(_loc.get("cache-names", new Object[] { _type, cache, _super, superCache })); } @@ -2371,7 +2371,7 @@ public FetchGroup getFetchGroup(String name) { * the same name. */ public FetchGroup addDeclaredFetchGroup(String name) { - if (StringUtils.isEmpty(name)) + if (StringUtils.isEmpty((CharSequence)name)) throw new MetaDataException(_loc.get("empty-fg-name", this)); if (_fgMap == null) _fgMap = new HashMap(); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.java index c01fcfa038..2bc1b19d6f 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.java @@ -26,7 +26,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.conf.OpenJPAConfiguration; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.util.Localizer; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java index 2bb0b25196..3c1831a2bd 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java @@ -27,8 +27,8 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.util.MetaDataException; @@ -142,7 +142,7 @@ public String getName() { public void addDeclaredInclude(String fgName) { if (_readOnly) throw new UnsupportedOperationException(); - if (StringUtils.isEmpty(fgName)) + if (StringUtils.isEmpty((CharSequence)fgName)) throw new MetaDataException(_loc.get("null-include-fg", this)); if (_includes == null) _includes = new ArrayList(); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java index 750a7bf1b2..bc13919081 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java @@ -46,7 +46,7 @@ import java.util.TimeZone; import org.apache.commons.collections.comparators.ComparatorChain; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.OpenJPAStateManager; import org.apache.openjpa.kernel.StoreContext; @@ -768,7 +768,7 @@ public boolean isInFetchGroup(String fg) { * class that declared this field or any of its persistent superclasses. */ public void setInFetchGroup(String fg, boolean in) { - if (StringUtils.isEmpty(fg)) + if (StringUtils.isEmpty((CharSequence)fg)) throw new MetaDataException(_loc.get("empty-fg-name", this)); if (fg.equals(FetchGroup.NAME_ALL)) return; @@ -1618,7 +1618,7 @@ private Method findMethod(String method) { * @return the method for invocation */ private Method findMethodByNameAndType(String method, Class type) { - if (StringUtils.isEmpty(method)) + if (StringUtils.isEmpty((CharSequence)method)) return null; // get class name and get package name divide on the last '.', so the diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java index cb4c15afdf..f153eaae8b 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.WeakHashMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.enhance.PCEnhancer; import org.apache.openjpa.util.InternalException; import org.apache.openjpa.lib.util.J2DoPrivHelper; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java index 6dcb8de0c4..a0b931d12a 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java @@ -34,7 +34,7 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.enhance.DynamicPersistenceCapable; import org.apache.openjpa.enhance.PCEnhancer; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java index c5b4c5f631..7b3e4828e0 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java @@ -23,7 +23,7 @@ import java.util.LinkedList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.kernel.Query; import org.apache.openjpa.kernel.QueryLanguages; import org.apache.openjpa.kernel.jpql.JPQLParser; @@ -211,7 +211,7 @@ public void setResultSetMappingName(String setMappingName) { public void setInto(Query query) { if (_candidate != null) query.setCandidateType(_candidate, true); - if (!StringUtils.isEmpty(_query)) + if (!StringUtils.isEmpty((CharSequence)_query)) query.setQuery(_query); if (_res != null) query.setResultType(_res); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java index d5906649bd..8bcbf5975c 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java @@ -23,7 +23,7 @@ import java.security.AccessController; import java.security.PrivilegedActionException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.SeqValue; import org.apache.openjpa.kernel.Seq; import org.apache.openjpa.lib.conf.Configurations; @@ -385,7 +385,7 @@ protected String wrapValue(String value) { * is null or empty string. */ protected void appendProperty(StringBuilder props, String name, String val) { - if (StringUtils.isEmpty(val)) + if (StringUtils.isEmpty((CharSequence)val)) return; if (props.length() > 0) props.append(","); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLClassMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLClassMetaData.java index 10ceb6a465..e39ae01ea2 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLClassMetaData.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLClassMetaData.java @@ -20,7 +20,7 @@ import java.util.HashMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class XMLClassMetaData implements XMLMetaData { diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLFieldMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLFieldMetaData.java index 179fbd602f..27bd190ee9 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLFieldMetaData.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLFieldMetaData.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.meta; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Contains metadata about an xml element or attribute diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java index 51e546ddd3..c65f773b32 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java @@ -20,7 +20,7 @@ import java.util.BitSet; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; /** * Utilities for dealing with a simple state image consisting of an diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java index aac5d37899..0fc9d1d4d7 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java @@ -49,7 +49,7 @@ import java.util.TreeSet; import java.util.Queue; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.enhance.AsmAdaptor; import org.apache.openjpa.kernel.OpenJPAStateManager; import org.apache.openjpa.lib.util.Files; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/StringId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/StringId.java index d5148a0fbe..804aaae4ac 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/StringId.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/StringId.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * {@link OpenJPAId} subclass appropriate for String fields. diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml index 320c180a1c..44f035ab43 100644 --- a/openjpa-lib/pom.xml +++ b/openjpa-lib/pom.xml @@ -58,8 +58,8 @@ provided - commons-lang - commons-lang + org.apache.commons + commons-lang3 org.apache.ant diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java index c0f2dbf193..e2eaff0056 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java @@ -24,7 +24,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.lib.conf.Configuration; import org.apache.openjpa.lib.conf.ConfigurationImpl; import org.apache.openjpa.lib.conf.ConfigurationProvider; @@ -168,7 +168,7 @@ public void execute() throws BuildException { String propertiesResource = _conf.getPropertiesResource(); if ( propertiesResource == null) { cp = ProductDerivations.loadDefaults(getConfigPropertiesResourceLoader()); - } else if (_conf.isDeferResourceLoading() && !StringUtils.isEmpty(propertiesResource)) { + } else if (_conf.isDeferResourceLoading() && !StringUtils.isEmpty((CharSequence)propertiesResource)) { Map result = Configurations.parseConfigResource(propertiesResource); String path = result.get(Configurations.CONFIG_RESOURCE_PATH); String anchor = result.get(Configurations.CONFIG_RESOURCE_ANCHOR); diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java index 0e838699b4..ab7a52c6e6 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java @@ -55,7 +55,7 @@ import java.util.TreeMap; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.log.LogFactory; import org.apache.openjpa.lib.log.LogFactoryImpl; diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java index 6584cdbc97..64988af336 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java @@ -36,8 +36,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.NestableRuntimeException; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; @@ -88,7 +87,7 @@ public static String getProperties(String plugin) { private static String getPluginComponent(String plugin, boolean clsName) { if (plugin != null) plugin = plugin.trim(); - if (StringUtils.isEmpty(plugin)) + if (StringUtils.isEmpty((CharSequence)plugin)) return null; int openParen = -1; @@ -113,9 +112,9 @@ private static String getPluginComponent(String plugin, boolean clsName) { * Combine the given class name and properties into a plugin string. */ public static String getPlugin(String clsName, String props) { - if (StringUtils.isEmpty(clsName)) + if (StringUtils.isEmpty((CharSequence)clsName)) return props; - if (StringUtils.isEmpty(props)) + if (StringUtils.isEmpty((CharSequence)props)) return clsName; return clsName + "(" + props + ")"; } @@ -126,17 +125,17 @@ public static String getPlugin(String clsName, String props) { * same properties of orig. */ public static String combinePlugins(String orig, String override) { - if (StringUtils.isEmpty(orig)) + if (StringUtils.isEmpty((CharSequence)orig)) return override; - if (StringUtils.isEmpty(override)) + if (StringUtils.isEmpty((CharSequence)override)) return orig; String origCls = getClassName(orig); String overrideCls = getClassName(override); String cls; - if (StringUtils.isEmpty(origCls)) + if (StringUtils.isEmpty((CharSequence)origCls)) cls = overrideCls; - else if (StringUtils.isEmpty(overrideCls)) + else if (StringUtils.isEmpty((CharSequence)overrideCls)) cls = origCls; else if (!origCls.equals(overrideCls)) return override; // completely different plugin @@ -145,9 +144,9 @@ else if (!origCls.equals(overrideCls)) String origProps = getProperties(orig); String overrideProps = getProperties(override); - if (StringUtils.isEmpty(origProps)) + if (StringUtils.isEmpty((CharSequence)origProps)) return getPlugin(cls, overrideProps); - if (StringUtils.isEmpty(overrideProps)) + if (StringUtils.isEmpty((CharSequence)overrideProps)) return getPlugin(cls, origProps); Properties props = parseProperties(origProps); @@ -192,7 +191,7 @@ public static Object newInstance(String clsName, Configuration conf, */ static Object newInstance(String clsName, Value val, Configuration conf, ClassLoader loader, boolean fatal) { - if (StringUtils.isEmpty(clsName)) + if (StringUtils.isEmpty((CharSequence)clsName)) return null; Class cls = null; @@ -242,7 +241,7 @@ static Object newInstance(String clsName, Value val, Configuration conf, if (e instanceof PrivilegedActionException) { e = ((PrivilegedActionException) e).getException(); } - RuntimeException re = new NestableRuntimeException(_loc.get + RuntimeException re = new RuntimeException(_loc.get ("obj-create", cls).getMessage(), e); if (fatal) throw re; @@ -335,7 +334,7 @@ public static List getFullyQualifiedAnchorsInPropertiesLocation( public static void populateConfiguration(Configuration conf, Options opts) { String props = opts.removeProperty("properties", "p", null); ConfigurationProvider provider; - if (!StringUtils.isEmpty(props)) { + if (!StringUtils.isEmpty((CharSequence)props)) { Map result = parseConfigResource(props); String path = result.get(CONFIG_RESOURCE_PATH); String anchor = result.get(CONFIG_RESOURCE_ANCHOR); @@ -453,7 +452,7 @@ public static void configureInstance(Object obj, Configuration conf, return; Properties props = null; - if (!StringUtils.isEmpty(properties)) + if (!StringUtils.isEmpty((CharSequence)properties)) props = parseProperties(properties); configureInstance(obj, conf, props, configurationName); } @@ -638,7 +637,7 @@ else if (val.startsWith("\"") || val.startsWith("'")) { * Looks up the given name in JNDI. If the name is null, null is returned. */ public static Object lookup(String name, String userKey, Log log) { - if (StringUtils.isEmpty(name)) + if (StringUtils.isEmpty((CharSequence)name)) return null; Context ctx = null; @@ -649,7 +648,7 @@ public static Object lookup(String name, String userKey, Log log) { log.warn(_loc.get("jndi-lookup-failed", userKey, name)); return result; } catch (NamingException ne) { - throw new NestableRuntimeException( + throw new RuntimeException( _loc.get("naming-err", name).getMessage(), ne); } finally { if (ctx != null) { diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java index 29b6533797..0a243b7c3a 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.lib.conf; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A double {@link Value}. @@ -60,7 +60,7 @@ protected String getInternalString() { } protected void setInternalString(String val) { - if (StringUtils.isEmpty(val)) + if (StringUtils.isEmpty((CharSequence)val)) set(0D); else set(Double.parseDouble(val)); diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java index 96bf7491e6..4c0d58e0ca 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java @@ -21,7 +21,7 @@ import java.io.File; import java.security.AccessController; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.openjpa.lib.util.J2DoPrivHelper; /** diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java index d4c09cca0a..dd32456f90 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.lib.conf; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * An int {@link Value}. @@ -60,7 +60,7 @@ protected String getInternalString() { } protected void setInternalString(String val) { - if (StringUtils.isEmpty(val)) + if (StringUtils.isEmpty((CharSequence)val)) set(0); else set(Integer.parseInt(val)); diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java index eba5098ecc..8d5478b7f5 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java @@ -20,7 +20,7 @@ import java.security.AccessController; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.ReferenceMap; diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java index 60df324528..cfc20275d5 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A list of plugins. Defaults and aliases on plugin lists apply only @@ -123,9 +123,9 @@ public String getString() { * properties string. */ public void setString(String str) { - if (StringUtils.isEmpty(str)) + if (StringUtils.isEmpty((CharSequence)str)) str = getDefault(); - if (StringUtils.isEmpty(str)) { + if (StringUtils.isEmpty((CharSequence)str)) { _names = EMPTY; _props = EMPTY; set(null, true); diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java index f73a72c3cf..080df83a9c 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.lib.conf; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.log.LogFactory; import org.apache.openjpa.lib.util.Localizer; diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java index d89809ce6c..0ed7e08122 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java @@ -32,7 +32,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.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.JavaVersions; import org.apache.openjpa.lib.util.Localizer; @@ -262,9 +262,9 @@ public static void beforeClose(Configuration conf) { * @param anchor optional named anchor within a multiple-configuration * resource */ - public static ConfigurationProvider load(String resource, String anchor, + public static ConfigurationProvider load(String resource, String anchor, ClassLoader loader) { - if (StringUtils.isEmpty(resource)) + if (StringUtils.isEmpty((CharSequence)resource)) return null; if (loader == null) loader = AccessController.doPrivileged( diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java index bdc7b9219a..ad62be9f55 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.ParseException; diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java index 61e5ffddc3..680921d3d2 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java @@ -18,7 +18,7 @@ */ package org.apache.openjpa.lib.conf; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A string {@link Value}. diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java index ebba455131..f4123f9e23 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.ParseException; diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java index 29f7048bc1..c4321e1c04 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java @@ -21,9 +21,9 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.CharUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.CharUtils; +import org.apache.commons.lang3.StringUtils; /** * The standard identifier rule. Rules are used for specific configuration diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java index a15caca21a..e38b20691d 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java @@ -20,7 +20,7 @@ import java.util.ArrayList; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.conf.Configurable; import org.apache.openjpa.lib.conf.Configuration; import org.apache.openjpa.lib.util.Localizer; @@ -222,7 +222,7 @@ public String[] splitName(IdentifierRule nrule, String name) { * ex. schema.table --> { schema, table } */ public String[] splitName(IdentifierRule nrule, String name, String nameDelim) { - if (!canSplit(nrule, name, nameDelim) || StringUtils.isEmpty(name)) { + if (!canSplit(nrule, name, nameDelim) || StringUtils.isEmpty((CharSequence)name)) { return new String[] {name}; } // "schema"."table" @@ -235,7 +235,7 @@ public String[] splitName(IdentifierRule nrule, String name, String nameDelim) { // for each name int ndLen = nameDelim.length(); - while (!StringUtils.isEmpty(name)) { + while (!StringUtils.isEmpty((CharSequence)name)) { pname = splitNameCharDelimiters(name, nameDelim); names.add(pname); if ((pname.length() + ndLen) >= name.length()) { @@ -308,7 +308,7 @@ public String delimit(IdentifierRule rule, String name, boolean force) { } public String delimit(IdentifierConfiguration config, IdentifierRule rule, String name, boolean force) { - if (!rule.getCanDelimit() || StringUtils.isEmpty(name)) { + if (!rule.getCanDelimit() || StringUtils.isEmpty((CharSequence)name)) { return name; } diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java index eb8a31784d..3c4a755108 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java @@ -20,7 +20,7 @@ import java.security.AccessController; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; import org.xml.sax.Attributes; @@ -209,7 +209,7 @@ protected boolean startClass(String elem, Attributes attrs) throws SAXException { if (getClassAttributeName() != null) { _class = attrs.getValue(getClassAttributeName()); - if (!StringUtils.isEmpty(_package) && _class.indexOf('.') == -1) + if (!StringUtils.isEmpty((CharSequence)_package) && _class.indexOf('.') == -1) _class = _package + "." + _class; } return true; @@ -223,7 +223,7 @@ protected void endClass(String elem) throws SAXException { _class = null; else { _class = currentText(); - if (!StringUtils.isEmpty(_package) && _class.indexOf('.') == -1) + if (!StringUtils.isEmpty((CharSequence)_package) && _class.indexOf('.') == -1) _class = _package + "." + _class; } } @@ -332,14 +332,14 @@ protected Class classForName(String name, boolean resolve) */ public static Class classForName(String name, String pkg, boolean resolve, ClassLoader loader) { - if (StringUtils.isEmpty(name)) + if (StringUtils.isEmpty((CharSequence)name)) return null; if (loader == null) loader = AccessController.doPrivileged( J2DoPrivHelper.getContextClassLoaderAction()); boolean fullName = name.indexOf('.') != -1; - boolean noPackage = StringUtils.isEmpty(pkg); + boolean noPackage = StringUtils.isEmpty((CharSequence)pkg); try { if (fullName || noPackage) return Strings.toClass(name, resolve, loader); diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java index 642fd1a259..258242b9c2 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java @@ -37,7 +37,6 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.exception.NestableRuntimeException; import org.apache.openjpa.lib.util.Files; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; @@ -223,7 +222,7 @@ public String[] parseTypeNames(String arg) { return col.toArray(new String[col.size()]); } } catch (Exception e) { - throw new NestableRuntimeException( + throw new RuntimeException( _loc.get("class-arg", arg).getMessage(), e); } @@ -246,7 +245,7 @@ public String[] parseTypeNames(MetaDataIterator itr) { appendTypeNames(source, itr.getInputStream(), names); } } catch (Exception e) { - throw new NestableRuntimeException( + throw new RuntimeException( _loc.get("class-arg", source).getMessage(), e); } return names.toArray(new String[names.size()]); @@ -291,7 +290,7 @@ public Map mapTypeNames(MetaDataIterator itr) { names.clear(); } } catch (Exception e) { - throw new NestableRuntimeException( + throw new RuntimeException( _loc.get("class-arg", source).getMessage(), e); } return map; diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java index 9acd5d6562..0674a119bd 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java @@ -26,7 +26,7 @@ import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; /** * Abstract base class for random-access result lists. Unlike the diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java index 988389399c..c8d9b25b52 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java @@ -24,7 +24,7 @@ import java.util.Iterator; import java.util.ListIterator; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; /** * Abstract base class for sequential result lists. Unlike the diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java index b2a9b28db9..c2798db9af 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java @@ -20,7 +20,6 @@ import java.util.List; -import org.apache.commons.lang.exception.NestableRuntimeException; import org.apache.openjpa.lib.util.Closeable; /** @@ -85,6 +84,6 @@ public void close() throws Exception { public void handleCheckedException(Exception e) { // shouldn't ever happen - throw new NestableRuntimeException(e); + throw new RuntimeException(e); } } diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java index f3a178cfe0..9f4eafeefd 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java @@ -20,7 +20,6 @@ import java.util.Comparator; -import org.apache.commons.lang.exception.NestableRuntimeException; /** * A result object provider that merges multiple result object provider @@ -144,7 +143,7 @@ private void clear() { public void handleCheckedException(Exception e) { if (_rops.length == 0) - throw new NestableRuntimeException(e); + throw new RuntimeException(e); _rops[0].handleCheckedException(e); } diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java index d2ad9bb9d0..694764f39a 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java @@ -37,8 +37,7 @@ import java.security.AccessController; import java.security.PrivilegedActionException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.NestableRuntimeException; +import org.apache.commons.lang3.StringUtils; import serp.util.Strings; /** @@ -70,7 +69,7 @@ public static File backup(File file, boolean copy) { try { copy(bk, file); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } } return bk; @@ -102,7 +101,7 @@ public static File revert(File backup, boolean copy) { try { copy(orig, backup); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } } return orig; @@ -153,7 +152,7 @@ public static File getPackageFile(File base, String pkg, boolean mkdirs) { if (base == null) base = new File(AccessController.doPrivileged( J2DoPrivHelper.getPropertyAction("user.dir"))); - if (StringUtils.isEmpty(pkg)) { + if (StringUtils.isEmpty((CharSequence)pkg)) { if (mkdirs && !(AccessController.doPrivileged( J2DoPrivHelper.existsAction(base))).booleanValue()) AccessController.doPrivileged( @@ -170,10 +169,10 @@ public static File getPackageFile(File base, String pkg, boolean mkdirs) { else file = new File(base, pkg); } catch (PrivilegedActionException pae) { - throw new NestableRuntimeException( + throw new RuntimeException( (IOException) pae.getException()); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } if (mkdirs && !(AccessController.doPrivileged( @@ -238,7 +237,7 @@ public static Writer getWriter(String file, ClassLoader loader) try { return new FileWriter(getFile(file, loader)); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } } @@ -265,7 +264,7 @@ else if ("stderr".equals(file)) else return new BufferedWriter(new OutputStreamWriter(getOutputStream(file, loader), enc)); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } } @@ -288,9 +287,9 @@ public static OutputStream getOutputStream(String file, J2DoPrivHelper.newFileOutputStreamAction( getFile(file, loader))); } catch (PrivilegedActionException pae) { - throw new NestableRuntimeException(pae.getException()); + throw new RuntimeException(pae.getException()); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } } diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java index 5cd702fda3..bdb7819c57 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java @@ -32,7 +32,7 @@ import java.util.Properties; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import serp.util.Strings; @@ -112,7 +112,7 @@ public String[] setFromCmdLine(String[] args) { if (i == args.length || args[i].startsWith("-")) { key = trimQuote(key); if (key != null) { - if (!StringUtils.isEmpty(value)) + if (!StringUtils.isEmpty((CharSequence)value)) setProperty(key, trimQuote(value)); else setProperty(key, "true"); @@ -298,7 +298,7 @@ public static Collection findOptionsFor(Class type) { */ private static boolean matchOptionToMember(String key, Object[] match) throws Exception { - if (StringUtils.isEmpty(key)) + if (StringUtils.isEmpty((CharSequence)key)) return false; // unfortunately we can't use bean properties for setters; any diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java index 729a94d910..4936b82b8d 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java @@ -18,8 +18,6 @@ */ package org.apache.openjpa.lib.util; -import org.apache.commons.lang.exception.NestableRuntimeException; - /** * Exception type for parse errors. * @@ -27,7 +25,7 @@ * @nojavadoc * @since 0.4.0 */ -public class ParseException extends NestableRuntimeException { +public class ParseException extends RuntimeException { public ParseException() { } diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java index 6b3e9ccc80..9774493e90 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java @@ -24,7 +24,6 @@ import java.util.Random; import java.util.UUID; -import org.apache.commons.lang.exception.NestableRuntimeException; /** * UUID value generator. Type 1 generator is based on the time-based generator @@ -113,7 +112,7 @@ private static synchronized void initializeForType1() { try { ip = InetAddress.getLocalHost().getAddress(); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } IP = new byte[6]; diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java index 90432bf242..0815b6378a 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java @@ -24,7 +24,6 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.lang.exception.NestableRuntimeException; import org.w3c.dom.Document; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -81,16 +80,16 @@ public static SAXParser getSAXParser(boolean validating, sp = _saxFactories[factoryIndex(validating, namespaceAware)]. newSAXParser(); } catch (ParserConfigurationException pce) { - throw new NestableRuntimeException(pce); + throw new RuntimeException(pce); } catch (SAXException se) { - throw new NestableRuntimeException(se); + throw new RuntimeException(se); } if (validating) { try { sp.getXMLReader().setErrorHandler(_validating); } catch (SAXException se) { - throw new NestableRuntimeException(se); + throw new RuntimeException(se); } } @@ -107,7 +106,7 @@ public static DocumentBuilder getDOMParser(boolean validating, db = _domFactories[factoryIndex(validating, namespaceAware)]. newDocumentBuilder(); } catch (ParserConfigurationException pce) { - throw new NestableRuntimeException(pce); + throw new RuntimeException(pce); } if (validating) diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java index 025b1185b4..817622e286 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java @@ -60,7 +60,7 @@ import javax.persistence.Temporal; import javax.persistence.UniqueConstraint; -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; import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier; @@ -241,7 +241,7 @@ protected boolean handleUnknownPackageMappingAnnotation(Package pkg, */ private void parseTableGenerator(AnnotatedElement el, TableGenerator gen) { String name = gen.name(); - if (StringUtils.isEmpty(name)) + if (StringUtils.isEmpty((CharSequence)name)) throw new MetaDataException(_loc.get("no-gen-name", el)); Log log = getLog(); @@ -423,7 +423,7 @@ private void parseAssociationOverrides(ClassMapping cm, List jcols; JoinTable joinTbl; for (AssociationOverride assoc : assocs) { - if (StringUtils.isEmpty(assoc.name())) + if (StringUtils.isEmpty((CharSequence)assoc.name())) throw new MetaDataException(_loc.get("no-override-name", cm)); sup = (FieldMapping) cm.getDefinedSuperclassField(assoc.name()); if (sup == null) @@ -457,7 +457,7 @@ private void parseAttributeOverrides(ClassMapping cm, AttributeOverride... attrs) { FieldMapping sup; for (AttributeOverride attr : attrs) { - if (StringUtils.isEmpty(attr.name())) + if (StringUtils.isEmpty((CharSequence)attr.name())) throw new MetaDataException(_loc.get("no-override-name", cm)); sup = (FieldMapping) cm.getDefinedSuperclassField(attr.name()); if (sup == null) @@ -485,11 +485,11 @@ private void parsePrimaryKeyJoinColumns(ClassMapping cm, private Column newColumn(PrimaryKeyJoinColumn join) { Column col = new Column(); col.setFlag(Column.FLAG_PK_JOIN, true); - if (!StringUtils.isEmpty(join.name())) + if (!StringUtils.isEmpty((CharSequence)join.name())) col.setIdentifier(DBIdentifier.newColumn(join.name(), delimit())); - if (!StringUtils.isEmpty(join.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)join.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(join.columnDefinition())); - if (!StringUtils.isEmpty(join.referencedColumnName())) + if (!StringUtils.isEmpty((CharSequence)join.referencedColumnName())) setTargetIdentifier(col, join.referencedColumnName()); return col; } @@ -506,7 +506,7 @@ private void parseSecondaryTables(ClassMapping cm, DBIdentifier sName = DBIdentifier.newTable(table.name(), delimit()); if (DBIdentifier.isEmpty(sName)) throw new MetaDataException(_loc.get("second-name", cm)); - if (!StringUtils.isEmpty(table.schema())) { + if (!StringUtils.isEmpty((CharSequence)table.schema())) { DBIdentifier sSchema = DBIdentifier.newSchema(table.schema(), delimit()); sName = QualifiedDBIdentifier.newPath(sSchema, sName); } @@ -550,7 +550,7 @@ Unique createUniqueConstraint(MetaDataContext ctx, UniqueConstraint anno) { column.setIdentifier(sColNames[i]); uniqueConstraint.addColumn(column); } - if (!StringUtils.isEmpty(anno.name())) { + if (!StringUtils.isEmpty((CharSequence)anno.name())) { uniqueConstraint.setIdentifier(DBIdentifier.newConstraint(anno.name(), delimit())); } return uniqueConstraint; @@ -574,7 +574,7 @@ else if (info instanceof FieldMappingInfo) * Form a qualified table name from a schema and table name. */ private DBIdentifier toTableIdentifier(String schema, String table) { - if (StringUtils.isEmpty(table)) { + if (StringUtils.isEmpty((CharSequence)table)) { return DBIdentifier.NULL; } DBIdentifier tName = DBIdentifier.newTable(table, delimit()); @@ -612,7 +612,7 @@ private void parseSQLResultSetMappings(ClassMapping cm, for (EntityResult entity : anno.entities()) { QueryResultMapping.PCResult entityResult = result.addPCResult (entity.entityClass()); - if (!StringUtils.isEmpty(entity.discriminatorColumn())) + if (!StringUtils.isEmpty((CharSequence)entity.discriminatorColumn())) entityResult.addMapping(entityResult.DISCRIMINATOR, entity.discriminatorColumn()); @@ -634,10 +634,10 @@ private void parseSQLResultSetMappings(ClassMapping cm, private void parseDiscriminatorColumn(ClassMapping cm, DiscriminatorColumn dcol) { Column col = new Column(); - if (!StringUtils.isEmpty(dcol.name())) { + if (!StringUtils.isEmpty((CharSequence)dcol.name())) { col.setIdentifier(DBIdentifier.newColumn(dcol.name(),delimit())); } - if (!StringUtils.isEmpty(dcol.columnDefinition())) { + if (!StringUtils.isEmpty((CharSequence)dcol.columnDefinition())) { col.setTypeIdentifier(DBIdentifier.newColumnDefinition(dcol.columnDefinition())); } Discriminator discrim = cm.getDiscriminator(); @@ -688,7 +688,7 @@ private void parseMappingOverrides(ClassMapping cm, MappingOverride... overs) { FieldMapping sup; for (MappingOverride over : overs) { - if (StringUtils.isEmpty(over.name())) + if (StringUtils.isEmpty((CharSequence)over.name())) throw new MetaDataException(_loc.get("no-override-name", cm)); sup = (FieldMapping) cm.getDefinedSuperclassField(over.name()); if (sup == null) @@ -714,9 +714,9 @@ private void populate(FieldMapping fm, MappingOverride over) { */ private void parseDataStoreIdColumn(ClassMapping cm, DataStoreIdColumn id) { Column col = new Column(); - if (!StringUtils.isEmpty(id.name())) + if (!StringUtils.isEmpty((CharSequence)id.name())) col.setIdentifier(DBIdentifier.newColumn(id.name(), delimit())); - if (!StringUtils.isEmpty(id.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)id.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(id.columnDefinition())); if (id.precision() != 0) col.setSize(id.precision()); @@ -752,7 +752,7 @@ protected void parseForeignKey(MappingInfo info, String name, org.apache.openjpa.jdbc.schema.ForeignKey fk = new org.apache.openjpa.jdbc.schema.ForeignKey(); - if (!StringUtils.isEmpty(name)) + if (!StringUtils.isEmpty((CharSequence)name)) fk.setIdentifier(DBIdentifier.newForeignKey(name, delimit())); fk.setDeferred(deferred); fk.setDeleteAction(toForeignKeyAction(deleteAction)); @@ -761,7 +761,7 @@ protected void parseForeignKey(MappingInfo info, String name, } void assertDefault(ForeignKey fk) { - boolean isDefault = StringUtils.isEmpty(fk.name()) + boolean isDefault = StringUtils.isEmpty((CharSequence)fk.name()) && fk.enabled() && !fk.deferred() && fk.deleteAction() == ForeignKeyAction.RESTRICT @@ -812,7 +812,7 @@ protected void parseIndex(MappingInfo info, String name, org.apache.openjpa.jdbc.schema.Index idx = new org.apache.openjpa.jdbc.schema.Index(); - if (!StringUtils.isEmpty(name)) + if (!StringUtils.isEmpty((CharSequence)name)) idx.setIdentifier(DBIdentifier.newConstraint(name, delimit())); idx.setUnique(unique); info.setIndex(idx); @@ -831,7 +831,7 @@ private void parseUnique(FieldMapping fm, org.apache.openjpa.jdbc.schema.Unique unq = new org.apache.openjpa.jdbc.schema.Unique(); - if (!StringUtils.isEmpty(anno.name())) + if (!StringUtils.isEmpty((CharSequence)anno.name())) unq.setIdentifier(DBIdentifier.newIndex(anno.name(), delimit())); unq.setDeferred(anno.deferred()); info.setUnique(unq); @@ -878,7 +878,7 @@ static Column newColumn(String name, boolean delimit) { Column col = new Column(); col.setTableIdentifier(DBIdentifier.newTable(table, delimit)); - if (!StringUtils.isEmpty(name)) + if (!StringUtils.isEmpty((CharSequence)name)) col.setIdentifier(DBIdentifier.newColumn(name, delimit)); if (precision != 0) col.setSize(precision); @@ -886,7 +886,7 @@ else if (length != 255) col.setSize(length); col.setNotNull(!nullable); col.setDecimalDigits(scale); - if (!StringUtils.isEmpty(columnDefinition)) { + if (!StringUtils.isEmpty((CharSequence)columnDefinition)) { col.setTypeIdentifier(DBIdentifier.newColumnDefinition(columnDefinition)); col.setType(Schemas.getJDBCType(col.getTypeIdentifier().getName())); col.setJavaType(JavaTypes.getTypeCode(Schemas.getJavaType @@ -905,7 +905,7 @@ private void parseMappingOverrides(ClassMapping cm, XMappingOverride... overs) { FieldMapping sup; for (XMappingOverride over : overs) { - if (StringUtils.isEmpty(over.name())) + if (StringUtils.isEmpty((CharSequence)over.name())) throw new MetaDataException(_loc.get("no-override-name", cm)); sup = (FieldMapping) cm.getDefinedSuperclassField(over.name()); if (sup == null) @@ -950,9 +950,9 @@ private void parseElementColumns(FieldMapping fm, ElementColumn... pcols) { */ private static Column newColumn(ElementColumn anno, boolean delimit) { Column col = new Column(); - if (!StringUtils.isEmpty(anno.name())) + if (!StringUtils.isEmpty((CharSequence)anno.name())) col.setIdentifier(DBIdentifier.newColumn(anno.name(), delimit)); - if (!StringUtils.isEmpty(anno.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)anno.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(anno.columnDefinition())); if (anno.precision() != 0) col.setSize(anno.precision()); @@ -986,13 +986,13 @@ private void parseKeyJoinColumns(FieldMapping fm, KeyJoinColumn... joins) { */ private static Column newColumn(KeyJoinColumn join, boolean delimit) { Column col = new Column(); - if (!StringUtils.isEmpty(join.name())) + if (!StringUtils.isEmpty((CharSequence)join.name())) col.setIdentifier(DBIdentifier.newColumn(join.name(),delimit)); - if (!StringUtils.isEmpty(join.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)join.columnDefinition())) col.setIdentifier(DBIdentifier.newColumnDefinition(join.columnDefinition())); - if (!StringUtils.isEmpty(join.referencedColumnName())) + if (!StringUtils.isEmpty((CharSequence)join.referencedColumnName())) col.setTargetIdentifier(DBIdentifier.newColumn(join.referencedColumnName(),delimit)); - if (!StringUtils.isEmpty(join.referencedAttributeName())) + if (!StringUtils.isEmpty((CharSequence)join.referencedAttributeName())) col.setTargetField(join.referencedAttributeName()); col.setNotNull(!join.nullable()); col.setFlag(Column.FLAG_UNINSERTABLE, !join.insertable()); @@ -1577,7 +1577,7 @@ protected void parseColumns(FieldMapping fm, cols.add(newColumn(pcols[i], delimit())); } if (xmlRootElementClass != null - && StringUtils.isEmpty(pcols[i].columnDefinition()) + && StringUtils.isEmpty((CharSequence)(pcols[i].columnDefinition())) && (AccessController.doPrivileged(J2DoPrivHelper .isAnnotationPresentAction(fm.getDeclaredType(), xmlRootElementClass))).booleanValue()) { @@ -1616,9 +1616,9 @@ private static Column newColumn(javax.persistence.Column anno, */ private static void setupColumn(Column col, javax.persistence.Column anno, boolean delimit) { - if (!StringUtils.isEmpty(anno.name())) + if (!StringUtils.isEmpty((CharSequence)anno.name())) col.setIdentifier(DBIdentifier.newColumn(anno.name(),delimit)); - if (!StringUtils.isEmpty(anno.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)anno.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(anno.columnDefinition())); if (anno.precision() != 0) col.setSize(anno.precision()); @@ -1733,12 +1733,12 @@ private void parseJoinColumns(FieldMapping fm, MappingInfo info, */ private Column newColumn(JoinColumn join) { Column col = new Column(); - if (!StringUtils.isEmpty(join.name())) + if (!StringUtils.isEmpty((CharSequence)join.name())) col.setIdentifier(DBIdentifier.newColumn(join.name(), delimit())); - if (!StringUtils.isEmpty(join.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)join.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(join.columnDefinition())); String refColumnName = join.referencedColumnName(); - if (!StringUtils.isEmpty(refColumnName)) { + if (!StringUtils.isEmpty((CharSequence)refColumnName)) { setTargetIdentifier(col, refColumnName); } col.setNotNull(!join.nullable()); @@ -1785,9 +1785,9 @@ private void parseKeyColumns(FieldMapping fm, KeyColumn... pcols) { */ private static Column newColumn(KeyColumn anno, boolean delimit) { Column col = new Column(); - if (!StringUtils.isEmpty(anno.name())) + if (!StringUtils.isEmpty((CharSequence)anno.name())) col.setIdentifier(DBIdentifier.newColumn(anno.name(), delimit)); - if (!StringUtils.isEmpty(anno.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)anno.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(anno.columnDefinition())); if (anno.precision() != 0) col.setSize(anno.precision()); @@ -1841,13 +1841,13 @@ protected void parseXJoinColumns(FieldMapping fm, MappingInfo info, */ private Column newColumn(XJoinColumn join, boolean delimit) { Column col = new Column(); - if (!StringUtils.isEmpty(join.name())) + if (!StringUtils.isEmpty((CharSequence)join.name())) col.setIdentifier(DBIdentifier.newColumn(join.name(), delimit)); - if (!StringUtils.isEmpty(join.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)join.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(join.columnDefinition())); - if (!StringUtils.isEmpty(join.referencedColumnName())) + if (!StringUtils.isEmpty((CharSequence)join.referencedColumnName())) setTargetIdentifier(col, join.referencedColumnName()); - if (!StringUtils.isEmpty(join.referencedAttributeName())) + if (!StringUtils.isEmpty((CharSequence)join.referencedAttributeName())) col.setTargetField(join.referencedAttributeName()); col.setNotNull(!join.nullable()); col.setFlag(Column.FLAG_UNINSERTABLE, !join.insertable()); @@ -1873,9 +1873,9 @@ private void parseEmbeddedMapping(FieldMapping fm, EmbeddedMapping anno) { } DBIdentifier nullInd = DBIdentifier.NULL; - if (!StringUtils.isEmpty(anno.nullIndicatorAttributeName())) + if (!StringUtils.isEmpty((CharSequence)anno.nullIndicatorAttributeName())) nullInd = DBIdentifier.newConstant(anno.nullIndicatorAttributeName()); - else if (!StringUtils.isEmpty(anno.nullIndicatorColumnName())) + else if (!StringUtils.isEmpty((CharSequence)anno.nullIndicatorColumnName())) nullInd = DBIdentifier.newColumn(anno.nullIndicatorColumnName(), delimit()); if (DBIdentifier.isNull(nullInd)) return; @@ -1962,9 +1962,9 @@ private void parseOrderColumn(FieldMapping fm, OrderColumn order) { } Column col = new Column(); - if (!StringUtils.isEmpty(order.name())) + if (!StringUtils.isEmpty((CharSequence)order.name())) col.setIdentifier(DBIdentifier.newColumn(order.name(), delimit())); - if (!StringUtils.isEmpty(order.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)order.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(order.columnDefinition())); if (order.precision() != 0) col.setSize(order.precision()); @@ -1980,9 +1980,9 @@ private void parseJavaxOrderColumn(FieldMapping fm, javax.persistence.OrderColumn order) { Column col = new Column(); - if (!StringUtils.isEmpty(order.name())) + if (!StringUtils.isEmpty((CharSequence)order.name())) col.setIdentifier(DBIdentifier.newColumn(order.name(), delimit())); - if (!StringUtils.isEmpty(order.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)order.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(order.columnDefinition())); col.setNotNull(!order.nullable()); col.setFlag(Column.FLAG_UNINSERTABLE, !order.insertable()); @@ -2013,13 +2013,13 @@ protected void parseElementJoinColumns(FieldMapping fm, */ private Column newColumn(ElementJoinColumn join, boolean delimit) { Column col = new Column(); - if (!StringUtils.isEmpty(join.name())) + if (!StringUtils.isEmpty((CharSequence)join.name())) col.setIdentifier(DBIdentifier.newColumn(join.name(), delimit)); - if (!StringUtils.isEmpty(join.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)join.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(join.columnDefinition())); - if (!StringUtils.isEmpty(join.referencedColumnName())) + if (!StringUtils.isEmpty((CharSequence)join.referencedColumnName())) setTargetIdentifier(col, join.referencedColumnName()); - if (!StringUtils.isEmpty(join.referencedAttributeName())) + if (!StringUtils.isEmpty((CharSequence)join.referencedAttributeName())) col.setTargetField(join.referencedAttributeName()); col.setNotNull(!join.nullable()); col.setFlag (Column.FLAG_UNINSERTABLE, !join.insertable ()); @@ -2047,12 +2047,12 @@ protected void parseMapKeyColumn(FieldMapping fm, MapKeyColumn anno) { */ private void setupMapKeyColumn(FieldMapping fm, Column col, MapKeyColumn anno) { - if (!StringUtils.isEmpty(anno.name())) { + if (!StringUtils.isEmpty((CharSequence)anno.name())) { col.setIdentifier(DBIdentifier.newColumn(anno.name(), delimit())); } else col.setIdentifier(DBIdentifier.newColumn(fm.getName() + "_" + "KEY", delimit())); - if (!StringUtils.isEmpty(anno.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)anno.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(anno.columnDefinition())); if (anno.precision() != 0) col.setSize(anno.precision()); @@ -2101,11 +2101,11 @@ private void parseMapKeyJoinColumns(FieldMapping fm, */ private Column newColumn(MapKeyJoinColumn join) { Column col = new Column(); - if (!StringUtils.isEmpty(join.name())) + if (!StringUtils.isEmpty((CharSequence)join.name())) col.setIdentifier(DBIdentifier.newColumn(join.name(), delimit())); - if (!StringUtils.isEmpty(join.columnDefinition())) + if (!StringUtils.isEmpty((CharSequence)join.columnDefinition())) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(join.columnDefinition())); - if (!StringUtils.isEmpty(join.referencedColumnName())) + if (!StringUtils.isEmpty((CharSequence)join.referencedColumnName())) setTargetIdentifier(col, join.referencedColumnName()); col.setNotNull(!join.nullable()); col.setFlag(Column.FLAG_UNINSERTABLE, !join.insertable()); @@ -2115,7 +2115,7 @@ private Column newColumn(MapKeyJoinColumn join) { @Override protected String normalizeSequenceName(String seqName) { - if (StringUtils.isEmpty(seqName)) { + if (StringUtils.isEmpty((CharSequence)seqName)) { return seqName; } return DBIdentifier.newSequence(seqName, delimit()).getName(); @@ -2123,7 +2123,7 @@ protected String normalizeSequenceName(String seqName) { @Override protected String normalizeSchemaName(String schName) { - if (StringUtils.isEmpty(schName)) { + if (StringUtils.isEmpty((CharSequence)schName)) { return schName; } return DBIdentifier.newSchema(schName, delimit()).getName(); @@ -2131,7 +2131,7 @@ protected String normalizeSchemaName(String schName) { @Override protected String normalizeCatalogName(String catName) { - if (StringUtils.isEmpty(catName)) { + if (StringUtils.isEmpty((CharSequence)catName)) { return catName; } return DBIdentifier.newCatalog(catName, delimit()).getName(); diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java index 10c4b2c4ee..03af076b03 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java @@ -44,7 +44,7 @@ import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.meta.SequenceMetaData; import org.apache.openjpa.meta.MetaDataModes; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.ArrayList; @@ -713,11 +713,11 @@ protected void serializeSequence(SequenceMetaData meta) { abTblGen.add("schema", table.substring(0, dotIdx)); } } - if (!StringUtils.isEmpty(seq.getPrimaryKeyColumn())) + if (!StringUtils.isEmpty((CharSequence)seq.getPrimaryKeyColumn())) abTblGen.add("pkColumnName", seq.getPrimaryKeyColumn()); - if (!StringUtils.isEmpty(seq.getSequenceColumn())) + if (!StringUtils.isEmpty((CharSequence)seq.getSequenceColumn())) abTblGen.add("valueColumnName", seq.getSequenceColumn()); - if (!StringUtils.isEmpty(seq.getPrimaryKeyValue())) + if (!StringUtils.isEmpty((CharSequence)seq.getPrimaryKeyValue())) abTblGen.add("pkColumnValue", seq.getPrimaryKeyValue()); if (seq.getAllocate() != 50 && seq.getAllocate() != -1) abTblGen.add("allocationSize", seq.getAllocate() + ""); diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java index ed354aae85..2b5c85cd4a 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java @@ -33,7 +33,7 @@ import javax.persistence.InheritanceType; import javax.persistence.TemporalType; -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; import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier; @@ -569,7 +569,7 @@ private boolean startInheritance(Attributes attrs) { */ private void endDiscriminatorValue() { String val = currentText(); - if (StringUtils.isEmpty(val)) + if (StringUtils.isEmpty((CharSequence)val)) return; ClassMapping cm = (ClassMapping) currentElement(); @@ -588,7 +588,7 @@ && getLog().isInfoEnabled()) { */ private void endTemporal() { String temp = currentText(); - if (!StringUtils.isEmpty(temp)) + if (!StringUtils.isEmpty((CharSequence)temp)) _temporal = Enum.valueOf(TemporalType.class, temp); } @@ -598,7 +598,7 @@ private void endTemporal() { private void endMapKeyTemporal() { String temp = currentText(); TemporalType _mapKeyTemporal = null; - if (!StringUtils.isEmpty(temp)) + if (!StringUtils.isEmpty((CharSequence)temp)) _mapKeyTemporal = Enum.valueOf(TemporalType.class, temp); FieldMapping fm = (FieldMapping) currentElement(); List cols = fm.getKeyMapping().getValueInfo().getColumns(); @@ -626,7 +626,7 @@ private void endMapKeyTemporal() { */ private void endEnumerated() { String text = currentText(); - if (StringUtils.isEmpty(text)) + if (StringUtils.isEmpty((CharSequence)text)) return; EnumType type = Enum.valueOf(EnumType.class, text); @@ -644,7 +644,7 @@ private void endEnumerated() { */ private void endMapKeyEnumerated() { String text = currentText(); - if (StringUtils.isEmpty(text)) + if (StringUtils.isEmpty((CharSequence)text)) return; EnumType type = Enum.valueOf(EnumType.class, text); @@ -1195,7 +1195,7 @@ private boolean startEntityResult(Attributes attrs) QueryResultMapping parent = (QueryResultMapping) currentElement(); QueryResultMapping.PCResult result = parent.addPCResult(entityClass); - if (!StringUtils.isEmpty(discriminator)) + if (!StringUtils.isEmpty((CharSequence)discriminator)) result.addMapping(PCResult.DISCRIMINATOR, discriminator); pushElement(result); return true; @@ -1520,7 +1520,7 @@ protected boolean startDelimitedIdentifiers() { @Override protected String normalizeSequenceName(String seqName) { - if (StringUtils.isEmpty(seqName)) { + if (StringUtils.isEmpty((CharSequence)seqName)) { return seqName; } return DBIdentifier.newSequence(seqName, delimit()).getName(); @@ -1528,7 +1528,7 @@ protected String normalizeSequenceName(String seqName) { @Override protected String normalizeSchemaName(String schName) { - if (StringUtils.isEmpty(schName)) { + if (StringUtils.isEmpty((CharSequence)schName)) { return schName; } return DBIdentifier.newSchema(schName, delimit()).getName(); @@ -1536,7 +1536,7 @@ protected String normalizeSchemaName(String schName) { @Override protected String normalizeCatalogName(String catName) { - if (StringUtils.isEmpty(catName)) { + if (StringUtils.isEmpty((CharSequence)catName)) { return catName; } return DBIdentifier.newCatalog(catName, delimit()).getName(); @@ -1567,10 +1567,10 @@ private boolean startDatastoreIdCol(Attributes attrs) Column col = new Column(); String name = attrs.getValue("name"); - if (!StringUtils.isEmpty(name)); + if (!StringUtils.isEmpty((CharSequence)name)); col.setIdentifier(DBIdentifier.newColumn(name, delimit())); String columnDefinition= attrs.getValue("column-definition"); - if (!StringUtils.isEmpty(columnDefinition)) + if (!StringUtils.isEmpty((CharSequence)columnDefinition)) col.setTypeIdentifier(DBIdentifier.newColumnDefinition(columnDefinition)); int precision = Integer.parseInt(attrs.getValue("precision")); if (precision != 0) @@ -1604,7 +1604,7 @@ private void parseIndex(MappingInfo info, String name, org.apache.openjpa.jdbc.schema.Index idx = new org.apache.openjpa.jdbc.schema.Index(); - if (!StringUtils.isEmpty(name)) + if (!StringUtils.isEmpty((CharSequence)name)) idx.setIdentifier(DBIdentifier.newConstraint(name, delimit())); idx.setUnique(unique); info.setIndex(idx); @@ -1661,7 +1661,7 @@ private void parseForeignKey(MappingInfo info, String name, boolean enabled, org.apache.openjpa.jdbc.schema.ForeignKey fk = new org.apache.openjpa.jdbc.schema.ForeignKey(); - if (!StringUtils.isEmpty(name)) + if (!StringUtils.isEmpty((CharSequence)name)) fk.setIdentifier(DBIdentifier.newForeignKey(name, delimit())); fk.setDeferred(deferred); fk.setDeleteAction(deleteAction); @@ -1693,7 +1693,7 @@ else if (action.equals("DEFAULT")) { private void assertDefault(String name, boolean enabled, boolean deferred, boolean specified, int updateAction, int deleteAction) { - boolean isDefault = StringUtils.isEmpty(name) + boolean isDefault = StringUtils.isEmpty((CharSequence)name) && enabled && !deferred && deleteAction == org.apache.openjpa.jdbc.schema.ForeignKey.ACTION_RESTRICT @@ -1767,7 +1767,7 @@ protected void parseEagerFetchModeAttr(FieldMetaData fmd, Attributes attrs) FieldMapping fm = (FieldMapping) fmd; String eagerFetchMode = attrs.getValue("eager-fetch-mode"); - if (!StringUtils.isEmpty(eagerFetchMode)) { + if (!StringUtils.isEmpty((CharSequence)eagerFetchMode)) { if (eagerFetchMode.equalsIgnoreCase("NONE")) { fm.setEagerFetchMode(EagerFetchModes.EAGER_NONE); } else if (eagerFetchMode.equalsIgnoreCase("JOIN")) { @@ -1783,7 +1783,7 @@ protected void parseElementClassCriteriaAttr(FieldMetaData fmd, Attributes attrs throws SAXException { String elementClassCriteriaString = attrs.getValue("element-class-criteria"); - if (!StringUtils.isEmpty(elementClassCriteriaString)) { + if (!StringUtils.isEmpty((CharSequence)elementClassCriteriaString)) { FieldMapping fm = (FieldMapping) fmd; boolean elementClassCriteria = Boolean.parseBoolean(elementClassCriteriaString); fm.getElementMapping().getValueInfo().setUseClassCriteria(elementClassCriteria); @@ -1793,7 +1793,7 @@ protected void parseElementClassCriteriaAttr(FieldMetaData fmd, Attributes attrs @Override protected void parseStrategy(FieldMetaData fmd, Attributes attrs) { String strategy = attrs.getValue("strategy"); - if (!StringUtils.isEmpty(strategy)) { + if (!StringUtils.isEmpty((CharSequence)strategy)) { ((FieldMapping) fmd).getMappingInfo().setStrategy(strategy); } } @@ -1804,19 +1804,19 @@ protected boolean startExtendedClass(String elem, Attributes attrs) ClassMapping mapping = (ClassMapping) currentElement(); String strategy = attrs.getValue("strategy"); - if (!StringUtils.isEmpty(strategy)) + if (!StringUtils.isEmpty((CharSequence)strategy)) mapping.getMappingInfo().setStrategy(strategy); String versionStrat = attrs.getValue("version-strategy"); - if (!StringUtils.isEmpty(versionStrat)) + if (!StringUtils.isEmpty((CharSequence)versionStrat)) mapping.getVersion().getMappingInfo().setStrategy(versionStrat); String discrimStrat = attrs.getValue("discriminator-strategy"); - if (!StringUtils.isEmpty(discrimStrat)) + if (!StringUtils.isEmpty((CharSequence)discrimStrat)) mapping.getDiscriminator().getMappingInfo().setStrategy(discrimStrat); String subclassFetchMode = attrs.getValue("subclass-fetch-mode"); - if (!StringUtils.isEmpty(subclassFetchMode)) + if (!StringUtils.isEmpty((CharSequence)subclassFetchMode)) mapping.setSubclassFetchMode(toEagerFetchModeConstant(subclassFetchMode)); return true; diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java index 11e6396d79..f538506661 100644 --- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java +++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java @@ -28,7 +28,7 @@ import javax.persistence.EnumType; import javax.persistence.TemporalType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.xml.sax.SAXException; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; @@ -691,11 +691,11 @@ protected void serializeSequence(SequenceMetaData meta) addAttribute("schema", table.substring(0, dotIdx)); } } - if (!StringUtils.isEmpty(seq.getPrimaryKeyColumn())) + if (!StringUtils.isEmpty((CharSequence)seq.getPrimaryKeyColumn())) addAttribute("pk-column-name", seq.getPrimaryKeyColumn()); - if (!StringUtils.isEmpty(seq.getSequenceColumn())) + if (!StringUtils.isEmpty((CharSequence)seq.getSequenceColumn())) addAttribute("value-column-name", seq.getSequenceColumn()); - if (!StringUtils.isEmpty(seq.getPrimaryKeyValue())) + if (!StringUtils.isEmpty((CharSequence)seq.getPrimaryKeyValue())) addAttribute("pk-column-value", seq.getPrimaryKeyValue()); if (seq.getAllocate() != 50 && seq.getAllocate() != -1) addAttribute("allocation-size", seq.getAllocate() + ""); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java index 1769c8bb69..0943dc732d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java @@ -27,7 +27,7 @@ import javax.persistence.EntityManager; import javax.persistence.Query; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.datacache.DataCachePCData; import org.apache.openjpa.jdbc.sql.DB2Dictionary; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java index e6b5b3d1d3..ef3b42d964 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java @@ -22,7 +22,7 @@ import javax.persistence.EntityTransaction; import javax.persistence.Query; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.event.TransactionEvent; import org.apache.openjpa.event.TransactionListener; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java index ad5848e8d8..6e8a44564f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java @@ -26,7 +26,7 @@ import junit.textui.TestRunner; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java index be9eb7cd20..823cb18895 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java @@ -26,7 +26,7 @@ import java.util.EnumSet; import java.lang.annotation.Annotation; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Helper class to stringify annotation declarations. diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java index 079e073200..4f9218c2da 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java @@ -134,7 +134,7 @@ import javax.persistence.SequenceGenerator; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.event.BeanLifecycleCallbacks; import org.apache.openjpa.event.LifecycleCallbacks; @@ -558,7 +558,7 @@ private ClassMetaData parseClassAnnotations() { meta.setEmbeddedOnly(true); else { meta.setEmbeddedOnly(false); - if (!StringUtils.isEmpty(entity.name())) + if (!StringUtils.isEmpty((CharSequence)entity.name())) meta.setTypeAlias(entity.name()); } } @@ -833,7 +833,7 @@ static void parseDataStoreId(ClassMetaData meta, GenerationType strategy, // technically we should have separate system table and // sequence generators, but it's easier to just rely on // the system org.apache.openjpa.Sequence setting for both - if (StringUtils.isEmpty(generator)) + if (StringUtils.isEmpty((CharSequence)generator)) meta.setIdentitySequenceName( SequenceMetaData.NAME_SYSTEM); else @@ -875,7 +875,7 @@ static void parseDataCache(ClassMetaData meta, meta.setDataCacheTimeout(timeout); } String cacheName = name; - if (StringUtils.isEmpty(cacheName)) { + if (StringUtils.isEmpty((CharSequence)cacheName)) { cacheName = org.apache.openjpa.datacache.DataCache.NAME_DEFAULT; } meta.setDataCacheName(enabled ? cacheName : null); @@ -894,7 +894,7 @@ private void parseDetachedState(ClassMetaData meta, if (detached != null) { if (!detached.enabled()) meta.setDetachedState(null); - else if (StringUtils.isEmpty(detached.fieldName())) + else if (StringUtils.isEmpty((CharSequence)detached.fieldName())) meta.setDetachedState(ClassMetaData.SYNTHETIC); else meta.setDetachedState(detached.fieldName()); @@ -1078,7 +1078,7 @@ static void parseFetchGroups(ClassMetaData meta, FetchGroup... groups) { static void parseFetchGroups(ClassMetaData meta, FetchGroupImpl... groups) { org.apache.openjpa.meta.FetchGroup fg; for (FetchGroupImpl group : groups) { - if (StringUtils.isEmpty(group.name())) + if (StringUtils.isEmpty((CharSequence)group.name())) throw new MetaDataException(_loc.get("unnamed-fg", meta)); fg = meta.addDeclaredFetchGroup(group.name()); @@ -1375,7 +1375,7 @@ static void parseGeneratedValue(FieldMetaData fmd, GenerationType strategy, // technically we should have separate system table and // sequence generators, but it's easier to just rely on // the system org.apache.openjpa.Sequence setting for both - if (StringUtils.isEmpty(generator)) + if (StringUtils.isEmpty((CharSequence)generator)) fmd.setValueSequenceName(SequenceMetaData.NAME_SYSTEM); else fmd.setValueSequenceName(generator); @@ -1399,7 +1399,7 @@ static void parseGeneratedValue(FieldMetaData fmd, GenerationType strategy, */ private static int getGeneratedValueStrategy(Object context, GenerationType strategy, String generator) { - if (strategy != AUTO || StringUtils.isEmpty(generator)) + if (strategy != AUTO || StringUtils.isEmpty((CharSequence)generator)) return -1; if (Generator.UUID_HEX.equals(generator)) @@ -1497,7 +1497,7 @@ private void parseOneToOne(FieldMetaData fmd, OneToOne anno) { if (!anno.optional()) fmd.setNullValue(FieldMetaData.NULL_EXCEPTION); - if (isMappingOverrideMode() && !StringUtils.isEmpty(anno.mappedBy())) + if (isMappingOverrideMode() && !StringUtils.isEmpty((CharSequence)anno.mappedBy())) fmd.setMappedBy(anno.mappedBy()); if (anno.targetEntity() != void.class) fmd.setTypeOverride(anno.targetEntity()); @@ -1538,7 +1538,7 @@ private void parseOneToMany(FieldMetaData fmd, OneToMany anno) { } fmd.setInDefaultFetchGroup(anno.fetch() == FetchType.EAGER); - if (isMappingOverrideMode() && !StringUtils.isEmpty(anno.mappedBy())) + if (isMappingOverrideMode() && !StringUtils.isEmpty((CharSequence)anno.mappedBy())) fmd.setMappedBy(anno.mappedBy()); if (anno.targetEntity() != void.class) fmd.getElement().setDeclaredType(anno.targetEntity()); @@ -1564,7 +1564,7 @@ private void parseManyToMany(FieldMetaData fmd, ManyToMany anno) { } fmd.setInDefaultFetchGroup(anno.fetch() == FetchType.EAGER); - if (isMappingOverrideMode() && !StringUtils.isEmpty(anno.mappedBy())) + if (isMappingOverrideMode() && !StringUtils.isEmpty((CharSequence)anno.mappedBy())) fmd.setMappedBy(anno.mappedBy()); if (anno.targetEntity() != void.class) fmd.getElement().setDeclaredType(anno.targetEntity()); @@ -1577,7 +1577,7 @@ private void parseManyToMany(FieldMetaData fmd, ManyToMany anno) { */ private void parseMapKey(FieldMetaData fmd, MapKey anno) { String name = anno.name(); - if (StringUtils.isEmpty(name)) + if (StringUtils.isEmpty((CharSequence)name)) fmd.getKey().setValueMappedBy(ValueMetaData.MAPPED_BY_PK); else fmd.getKey().setValueMappedBy(name); @@ -1649,7 +1649,7 @@ private void parsePersistent(FieldMetaData fmd, Persistent anno) { "Persistent")); } - if (!StringUtils.isEmpty(anno.mappedBy())) + if (!StringUtils.isEmpty((CharSequence)anno.mappedBy())) fmd.setMappedBy(anno.mappedBy()); fmd.setInDefaultFetchGroup(anno.fetch() == FetchType.EAGER); if (!anno.optional()) @@ -1678,7 +1678,7 @@ private void parsePersistentCollection(FieldMetaData fmd, fmd.setPersistentCollection(true); - if (!StringUtils.isEmpty(anno.mappedBy())) + if (!StringUtils.isEmpty((CharSequence)anno.mappedBy())) fmd.setMappedBy(anno.mappedBy()); fmd.setInDefaultFetchGroup(anno.fetch() == FetchType.EAGER); if (anno.elementType() != void.class) @@ -1786,7 +1786,7 @@ private void setOrphanRemoval(ValueMetaData vmd, boolean orphanRemoval) { private void parseSequenceGenerator(AnnotatedElement el, SequenceGenerator gen) { String name = gen.name(); - if (StringUtils.isEmpty(name)) + if (StringUtils.isEmpty((CharSequence)name)) throw new MetaDataException(_loc.get("no-seq-name", el)); if (_log.isTraceEnabled()) @@ -1817,7 +1817,7 @@ private void parseSequenceGenerator(AnnotatedElement el, // create plugin string from info String clsName, props; - if (StringUtils.isEmpty(seq)) { + if (StringUtils.isEmpty((CharSequence)seq)) { clsName = SequenceMetaData.IMPL_NATIVE; props = null; } else if (seq.indexOf('(') != -1) // plugin @@ -1846,9 +1846,9 @@ private void parseSequenceGenerator(AnnotatedElement el, private void parseNamedQueries(AnnotatedElement el, NamedQuery... queries) { QueryMetaData meta; for (NamedQuery query : queries) { - if (StringUtils.isEmpty(query.name())) + if (StringUtils.isEmpty((CharSequence)query.name())) throw new MetaDataException(_loc.get("no-query-name", el)); - if (StringUtils.isEmpty(query.query())) + if (StringUtils.isEmpty((CharSequence)query.query())) throw new MetaDataException(_loc.get("no-query-string", query.name(), el)); @@ -1919,10 +1919,10 @@ private void parseNamedNativeQueries(AnnotatedElement el, NamedNativeQuery... queries) { QueryMetaData meta; for (NamedNativeQuery query : queries) { - if (StringUtils.isEmpty(query.name())) + if (StringUtils.isEmpty((CharSequence)query.name())) throw new MetaDataException(_loc.get("no-native-query-name", el)); - if (StringUtils.isEmpty(query.query())) + if (StringUtils.isEmpty((CharSequence)query.query())) throw new MetaDataException(_loc.get("no-native-query-string", query.name(), el)); @@ -1947,7 +1947,7 @@ private void parseNamedNativeQueries(AnnotatedElement el, else if (!void.class.equals(res)) meta.setResultType(res); - if (!StringUtils.isEmpty(query.resultSetMapping())) + if (!StringUtils.isEmpty((CharSequence)query.resultSetMapping())) meta.setResultSetMappingName(query.resultSetMapping()); for (QueryHint hint : query.hints()) meta.addHint(hint.name(), hint.value()); diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java index 4475089eaf..3b90840f4b 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java @@ -66,7 +66,7 @@ import javax.persistence.Transient; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.QueryLanguages; import org.apache.openjpa.lib.conf.Configurations; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java index e838b70f45..b71d5fdb46 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java @@ -24,7 +24,7 @@ import java.lang.reflect.Method; import java.security.AccessController; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.util.J2DoPrivHelper; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java index 0208d8ccff..24ead840a1 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java @@ -30,7 +30,7 @@ import javax.persistence.PersistenceUnitUtil; import javax.persistence.spi.LoadState; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.AutoDetach; import org.apache.openjpa.kernel.Broker; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java index 0dea51fd7f..15dde76c6a 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java @@ -51,7 +51,7 @@ import javax.persistence.criteria.ParameterExpression; import javax.persistence.metamodel.Metamodel; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.ee.ManagedRuntime; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java index 790df370cf..4f72a726b9 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java @@ -26,7 +26,7 @@ import javax.persistence.CacheRetrieveMode; import javax.persistence.CacheStoreMode; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.kernel.DataCacheRetrieveMode; import org.apache.openjpa.kernel.DataCacheStoreMode; import org.apache.openjpa.lib.util.StringUtil; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java index bb3a3ce97f..0f62bb35ce 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java @@ -55,7 +55,7 @@ import javax.persistence.PreUpdate; import javax.persistence.Transient; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.log.Log; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java index 3ace311707..b73a533d14 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java @@ -41,7 +41,7 @@ import javax.persistence.spi.PersistenceUnitInfo; import javax.persistence.spi.PersistenceUnitTransactionType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.conf.OpenJPAConfigurationImpl; @@ -330,7 +330,7 @@ public ConfigurationProvider load(PersistenceUnitInfo pinfo, Map m) */ public ConfigurationProvider load(String rsrc, String name, Map m) throws IOException { - boolean explicit = !StringUtils.isEmpty(rsrc); + boolean explicit = !StringUtils.isEmpty((CharSequence)rsrc); if (!explicit) rsrc = RSRC_DEFAULT; @@ -435,10 +435,10 @@ public ConfigurationProvider loadGlobals(ClassLoader loader) throws IOException { String[] prefixes = ProductDerivations.getConfigurationPrefixes(); String rsrc = null; - for (int i = 0; i < prefixes.length && StringUtils.isEmpty(rsrc); i++) + for (int i = 0; i < prefixes.length && StringUtils.isEmpty((CharSequence)rsrc); i++) rsrc = AccessController.doPrivileged(J2DoPrivHelper .getPropertyAction(prefixes[i] + ".properties")); - boolean explicit = !StringUtils.isEmpty(rsrc); + boolean explicit = !StringUtils.isEmpty((CharSequence)rsrc); String anchor = null; int idx = (!explicit) ? -1 : rsrc.lastIndexOf('#'); if (idx != -1) { @@ -447,7 +447,7 @@ public ConfigurationProvider loadGlobals(ClassLoader loader) anchor = rsrc.substring(idx + 1); rsrc = rsrc.substring(0, idx); } - if (StringUtils.isEmpty(rsrc)) + if (StringUtils.isEmpty((CharSequence)rsrc)) rsrc = RSRC_GLOBAL; else if (!rsrc.endsWith(".xml")) return null; @@ -606,7 +606,7 @@ private PersistenceUnitInfoImpl findUnit(List if (isOpenJPAPersistenceProvider(pinfo, loader)) { // if no name given and found unnamed unit, return it. // otherwise record as default unit unless we find a better match later - if (StringUtils.isEmpty(pinfo.getPersistenceUnitName())) + if (StringUtils.isEmpty((CharSequence)pinfo.getPersistenceUnitName())) return pinfo; if (ojpa == null) ojpa = pinfo; @@ -623,7 +623,7 @@ private PersistenceUnitInfoImpl findUnit(List */ private static boolean isOpenJPAPersistenceProvider(PersistenceUnitInfo pinfo, ClassLoader loader) { String provider = pinfo.getPersistenceProviderClassName(); - if (StringUtils.isEmpty(provider) || PersistenceProviderImpl.class.getName().equals(provider)) + if (StringUtils.isEmpty((CharSequence)provider) || PersistenceProviderImpl.class.getName().equals(provider)) return true; if (loader == null) @@ -706,7 +706,7 @@ public void setInto(Configuration conf) { // get overwritten by our implicit setting. so instead, combine // the global value with our settings String orig = oconf.getMetaDataFactory(); - if (!StringUtils.isEmpty(orig)) { + if (!StringUtils.isEmpty((CharSequence)orig)) { String key = ProductDerivations.getConfigurationKey("MetaDataFactory", getProperties()); Object override = getProperties().get(key); if (override instanceof String) diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java index 072de8f08b..52a875c495 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java @@ -40,7 +40,7 @@ import static javax.persistence.CascadeType.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.event.BeanLifecycleCallbacks; @@ -1066,7 +1066,7 @@ protected boolean startClass(String elem, Attributes attrs) } meta.setListingIndex(_clsPos); String name = attrs.getValue("name"); - if (!StringUtils.isEmpty(name)) + if (!StringUtils.isEmpty((CharSequence)name)) meta.setTypeAlias(name); meta.setAbstract(mappedSuper); meta.setEmbeddedOnly(mappedSuper || embeddable); @@ -1136,7 +1136,7 @@ private void endAccess() { * default if string is empty. */ private int toAccessType(String str) { - if (StringUtils.isEmpty(str)) + if (StringUtils.isEmpty((CharSequence)str)) return AccessCode.UNKNOWN; if ("PROPERTY".equals(str)) return AccessCode.EXPLICIT | AccessCode.PROPERTY; @@ -1306,7 +1306,7 @@ protected boolean startGeneratedValue(Attributes attrs) String strategy = attrs.getValue("strategy"); String generator = attrs.getValue("generator"); - GenerationType type = StringUtils.isEmpty(strategy) + GenerationType type = StringUtils.isEmpty((CharSequence)strategy) ? GenerationType.AUTO : GenerationType.valueOf(strategy); FieldMetaData fmd = (FieldMetaData) currentElement(); @@ -1819,7 +1819,7 @@ private void endOrderBy() throw new MetaDataException(_loc.get( "invalid-orderBy", fmd)); } - if (StringUtils.isEmpty(dec) || dec.equals("ASC")) + if (StringUtils.isEmpty((CharSequence)dec) || dec.equals("ASC")) dec = Order.ELEMENT + " asc"; else if (dec.equals("DESC")) dec = Order.ELEMENT + " desc"; @@ -2404,7 +2404,7 @@ private boolean startDatastoreId(Attributes attrs) //Set default value if not specified String strategy = attrs.getValue("strategy"); - if (StringUtils.isEmpty(strategy)) { + if (StringUtils.isEmpty((CharSequence)strategy)) { strategy ="AUTO" ; } GenerationType stratType = GenerationType.valueOf(strategy); @@ -2418,15 +2418,15 @@ private boolean startDatastoreId(Attributes attrs) private boolean startDataCache(Attributes attrs) throws SAXException { String enabledStr = attrs.getValue("enabled"); - boolean enabled = (Boolean) (StringUtils.isEmpty(enabledStr) ? true : + boolean enabled = (Boolean) (StringUtils.isEmpty((CharSequence)enabledStr) ? true : Boolean.parseBoolean(enabledStr)); String timeoutStr = attrs.getValue("timeout"); - int timeout = (Integer) (StringUtils.isEmpty(timeoutStr) ? Integer.MIN_VALUE : + int timeout = (Integer) (StringUtils.isEmpty((CharSequence)timeoutStr) ? Integer.MIN_VALUE : Integer.parseInt(timeoutStr)); String name = attrs.getValue("name"); - name = StringUtils.isEmpty(name) ? "" : name; + name = StringUtils.isEmpty((CharSequence)name) ? "" : name; AnnotationPersistenceMetaDataParser.parseDataCache(getRepository().getCachedMetaData(_cls), enabled, name, timeout); @@ -2587,17 +2587,17 @@ private void parsePersistentMap(FieldMetaData fmd, Attributes attrs) private void parseCommonExtendedAttributes(FieldMetaData fmd, Attributes attrs) { String loadFetchGroup = attrs.getValue("load-fetch-group"); - if (!StringUtils.isEmpty(loadFetchGroup)) { + if (!StringUtils.isEmpty((CharSequence)loadFetchGroup)) { fmd.setLoadFetchGroup(loadFetchGroup); } String externalizer = attrs.getValue("externalizer"); - if (!StringUtils.isEmpty(externalizer)) { + if (!StringUtils.isEmpty((CharSequence)externalizer)) { fmd.setExternalizer(externalizer); } String factory = attrs.getValue("factory"); - if (!StringUtils.isEmpty(factory)) { + if (!StringUtils.isEmpty((CharSequence)factory)) { fmd.setFactory(factory); } @@ -2629,7 +2629,7 @@ else if (updateAction.equalsIgnoreCase("IGNORE")) { private void parseDependentAttr(FieldMetaData fmd, Attributes attrs) throws SAXException { String dependentStr = attrs.getValue("dependent"); - if (!StringUtils.isEmpty(dependentStr)) { + if (!StringUtils.isEmpty((CharSequence)dependentStr)) { boolean dependent = Boolean.parseBoolean(dependentStr); if (dependent) { fmd.setCascadeDelete(ValueMetaData.CASCADE_AUTO); @@ -2644,7 +2644,7 @@ private void parseElementDependentAttr(FieldMetaData fmd, Attributes attrs) throws SAXException { String elementDependentStr = attrs.getValue("element-dependent"); - if (!StringUtils.isEmpty(elementDependentStr)) { + if (!StringUtils.isEmpty((CharSequence)elementDependentStr)) { boolean elementDependent = Boolean.parseBoolean(elementDependentStr); if (elementDependent) { fmd.getElement().setCascadeDelete(ValueMetaData.CASCADE_AUTO); @@ -2659,7 +2659,7 @@ private void parseKeyDependentAttr(FieldMetaData fmd, Attributes attrs) throws SAXException { String keyDependentStr = attrs.getValue("key-dependent"); - if (!StringUtils.isEmpty(keyDependentStr)) { + if (!StringUtils.isEmpty((CharSequence)keyDependentStr)) { boolean keyDependent = Boolean.parseBoolean(keyDependentStr); if (keyDependent) { fmd.getKey().setCascadeDelete(ValueMetaData.CASCADE_AUTO); @@ -2674,7 +2674,7 @@ protected void parseElementClassCriteriaAttr(FieldMetaData fmd, Attributes attrs throws SAXException { // String elementClassCriteriaString = attrs.getValue("element-class-criteria"); -// if (!StringUtils.isEmpty(elementClassCriteriaString)) { +// if (!StringUtils.isEmpty((CharSequence)elementClassCriteriaString)) { // FieldMapping fm = (FieldMapping) fmd; // boolean elementClassCriteria = Boolean.parseBoolean(elementClassCriteriaString); // fm.getElementMapping().getValueInfo().setUseClassCriteria(elementClassCriteria); @@ -2685,7 +2685,7 @@ private void parseTypeAttr(FieldMetaData fmd, Attributes attrs) throws SAXException { String typeStr = attrs.getValue("type"); - if (!StringUtils.isEmpty(typeStr)) { + if (!StringUtils.isEmpty((CharSequence)typeStr)) { if (StringUtils.endsWithIgnoreCase(typeStr, ".class")) { typeStr = typeStr.substring(0, StringUtils.lastIndexOf(typeStr, '.')); @@ -2699,7 +2699,7 @@ private void parseTypeAttr(FieldMetaData fmd, Attributes attrs) private void parseLRSAttr(FieldMetaData fmd, Attributes attrs) throws SAXException { String lrsStr = attrs.getValue("lrs"); - if (!StringUtils.isEmpty(lrsStr)) { + if (!StringUtils.isEmpty((CharSequence)lrsStr)) { boolean lrs = Boolean.parseBoolean(lrsStr); fmd.setLRS(lrs); } @@ -2709,7 +2709,7 @@ private void parseElementTypeAttr(FieldMetaData fmd, Attributes attrs) throws SAXException { String typeStr = attrs.getValue("element-type"); - if (!StringUtils.isEmpty(typeStr)) { + if (!StringUtils.isEmpty((CharSequence)typeStr)) { if (StringUtils.endsWithIgnoreCase(typeStr, ".class")) { typeStr = typeStr.substring(0, StringUtils.lastIndexOf(typeStr, '.')); @@ -2724,7 +2724,7 @@ private void parseKeyTypeAttr(FieldMetaData fmd, Attributes attrs) throws SAXException { String typeStr = attrs.getValue("key-type"); - if (!StringUtils.isEmpty(typeStr)) { + if (!StringUtils.isEmpty((CharSequence)typeStr)) { if (StringUtils.endsWithIgnoreCase(typeStr, ".class")) { typeStr = typeStr.substring(0, StringUtils.lastIndexOf(typeStr, '.')); @@ -2777,7 +2777,7 @@ private void parseInverseLogicalAttr(FieldMetaData fmd, Attributes attrs) throws SAXException { String inverseLogical = attrs.getValue("inverse-logical"); - if (!StringUtils.isEmpty(inverseLogical)) { + if (!StringUtils.isEmpty((CharSequence)inverseLogical)) { fmd.setInverse(inverseLogical); } } diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java index 369dd0e7c6..b4015b5d07 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.QueryLanguages; import org.apache.openjpa.lib.conf.Configurations; diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java index 624de97ea6..16e8aece1d 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java @@ -30,7 +30,7 @@ import javax.validation.Validator; import javax.validation.ValidatorFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.event.LifecycleEvent; import org.apache.openjpa.lib.conf.Configuration; diff --git a/pom.xml b/pom.xml index eb97e64718..41e9f2ed50 100644 --- a/pom.xml +++ b/pom.xml @@ -506,9 +506,9 @@ 1.0.4 - commons-lang - commons-lang - 2.4 + org.apache.commons + commons-lang3 + 3.12.0 commons-collections From 33d392a8a3a832a379fe12897d188501d0f59a38 Mon Sep 17 00:00:00 2001 From: Ajay Paul Date: Wed, 5 Nov 2025 21:11:44 +0530 Subject: [PATCH 2/2] changed version of commonslang3 to 3.4 , changed capitalise to capitalize --- openjpa-jdbc/pom.xml | 10 ++++++++++ .../apache/openjpa/jdbc/meta/ReverseMappingTool.java | 6 +++--- .../apache/openjpa/datacache/AbstractDataCache.java | 10 ++++++++-- pom.xml | 2 +- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml index 1548e92725..533f528435 100644 --- a/openjpa-jdbc/pom.xml +++ b/openjpa-jdbc/pom.xml @@ -42,6 +42,11 @@ openjpa-kernel ${project.version} + + org.apache.commons + commons-lang3 + 3.4 + javax.xml.bind jaxb-api @@ -84,5 +89,10 @@ jmock-junit3 test + + org.apache.commons + commons-lang3 + 3.4 + diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java index fe6339be29..a8908fe730 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java @@ -1485,7 +1485,7 @@ private String getClassName(Table table) { name = name.toLowerCase(); subs = Strings.split(name, "_", 0); for (int i = 0; i < subs.length; i++) - buf.append(StringUtils.capitalise(subs[i])); + buf.append(StringUtils.capitalize(subs[i])); } name = replaceInvalidCharacters(table.getName()); @@ -1497,7 +1497,7 @@ private String getClassName(Table table) { // if the name would end in 'Id', make it end in 'Ident' if (i == subs.length - 1 && subs[i].equalsIgnoreCase("id")) subs[i] = "ident"; - buf.append(StringUtils.capitalise(subs[i])); + buf.append(StringUtils.capitalize(subs[i])); } return buf.toString(); @@ -1518,7 +1518,7 @@ public String getFieldName(String name, ClassMapping dec) { String[] subs = Strings.split(name, "_", 0); for (int i = 0; i < subs.length; i++) { if (i > 0) - subs[i] = StringUtils.capitalise(subs[i]); + subs[i] = StringUtils.capitalize(subs[i]); buf.append(subs[i]); } return getUniqueName(buf.toString(), dec); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java index 02cd9797db..de9dcee0c8 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java @@ -530,7 +530,10 @@ public void setTypes(Set types) { public void setTypes(String types) { _includedTypes = - StringUtils.isEmpty((CharSequence)types) ? null : new HashSet(Arrays.asList(Strings.split(types, ";", 0))); + StringUtils.isEmpty((CharSequence)types) + ? null + : new HashSet( + Arrays.asList(Strings.split(types, ";", 0))); if (log.isWarnEnabled()) log.warn(s_loc.get("recommend_jpa2_caching", new Object[]{"Types", DataCacheMode.ENABLE_SELECTIVE.toString()})); @@ -545,7 +548,10 @@ public void setExcludedTypes(Set types) { public void setExcludedTypes(String types) { _excludedTypes = - StringUtils.isEmpty((CharSequence)types) ? null : new HashSet(Arrays.asList(Strings.split(types, ";", 0))); + StringUtils.isEmpty((CharSequence)types) + ? null + : new HashSet( + Arrays.asList(Strings.split(types, ";", 0))); if (log.isWarnEnabled()) log.warn(s_loc.get("recommend_jpa2_caching", new Object[]{"ExcludeTypes", DataCacheMode.DISABLE_SELECTIVE.toString()})); diff --git a/pom.xml b/pom.xml index 41e9f2ed50..47e7828838 100644 --- a/pom.xml +++ b/pom.xml @@ -508,7 +508,7 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.4 commons-collections