From c58af533fb565d92f7a514749d05a957b6530fc5 Mon Sep 17 00:00:00 2001 From: Michael Dick Date: Mon, 8 Mar 2010 22:07:27 +0000 Subject: [PATCH] OPENJPA-1178: Remove uneeded imports git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@920540 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java | 1 - .../main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java | 1 - .../main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java | 1 - .../openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java | 1 - .../main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java | 1 - .../main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java | 1 - .../org/apache/openjpa/jdbc/kernel/exps/ContainsExpression.java | 1 - .../java/org/apache/openjpa/jdbc/kernel/exps/GetObjectId.java | 1 - .../apache/openjpa/jdbc/kernel/exps/StartsWithExpression.java | 1 - .../src/main/java/org/apache/openjpa/jdbc/meta/JavaSQLTypes.java | 1 - .../org/apache/openjpa/jdbc/meta/strats/IdentityJoinable.java | 1 - .../openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java | 1 - .../apache/openjpa/jdbc/meta/strats/NumberVersionStrategy.java | 1 - .../apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java | 1 - .../src/main/java/org/apache/openjpa/jdbc/schema/Column.java | 1 - .../java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java | 1 - .../java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java | 1 - .../src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java | 1 - .../main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java | 1 - .../main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java | 1 - .../src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java | 1 - .../src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java | 1 - .../src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java | 1 - .../java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java | 1 - .../src/main/java/org/apache/openjpa/enhance/PCEnhancer.java | 1 - .../org/apache/openjpa/kernel/DetachedValueStateManager.java | 1 - .../src/main/java/org/apache/openjpa/kernel/Filters.java | 1 - .../java/org/apache/openjpa/kernel/ObjectIdStateManager.java | 1 - .../src/main/java/org/apache/openjpa/kernel/QueryImpl.java | 1 - .../main/java/org/apache/openjpa/kernel/StateManagerImpl.java | 1 - .../src/main/java/org/apache/openjpa/kernel/TimeSeededSeq.java | 1 - .../main/java/org/apache/openjpa/kernel/VersionLockManager.java | 1 - .../src/main/java/org/apache/openjpa/kernel/exps/Abs.java | 1 - .../src/main/java/org/apache/openjpa/kernel/exps/Avg.java | 1 - .../src/main/java/org/apache/openjpa/kernel/exps/Count.java | 1 - .../src/main/java/org/apache/openjpa/kernel/exps/IndexOf.java | 1 - .../src/main/java/org/apache/openjpa/kernel/exps/Size.java | 1 - .../main/java/org/apache/openjpa/kernel/exps/StringLength.java | 1 - .../src/main/java/org/apache/openjpa/kernel/exps/Sum.java | 1 - .../src/main/java/org/apache/openjpa/kernel/exps/Type.java | 1 - .../org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java | 1 - .../src/main/java/org/apache/openjpa/meta/FetchGroup.java | 1 - .../src/main/java/org/apache/openjpa/meta/JavaTypes.java | 1 - .../src/main/java/org/apache/openjpa/meta/ValueStrategies.java | 1 - .../src/main/java/org/apache/openjpa/util/ApplicationIds.java | 1 - openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java | 1 - openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java | 1 - openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java | 1 - .../java/org/apache/openjpa/lib/jdbc/DelegatingConnection.java | 1 - .../java/org/apache/openjpa/lib/rop/RandomAccessResultList.java | 1 - .../src/main/java/org/apache/openjpa/lib/xml/Location.java | 1 - .../openjpa/persistence/jdbc/XMLPersistenceMappingParser.java | 1 - .../openjpa/persistence/jdbc/annotations/PointHandler.java | 1 - .../openjpa/persistence/AnnotationPersistenceMetaDataParser.java | 1 - .../apache/openjpa/persistence/XMLPersistenceMetaDataParser.java | 1 - .../src/main/java/org/apache/openjpa/xmlstore/ObjectData.java | 1 - .../main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java | 1 - 57 files changed, 57 deletions(-) diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java index 101d6e4e0..e9af893e7 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java @@ -41,7 +41,6 @@ import org.apache.openjpa.meta.FieldMetaData; import org.apache.openjpa.util.ApplicationIds; import org.apache.openjpa.util.Id; -import serp.util.Numbers; /** * Implements Finder Query identified by ClassMappping for SelectExecutor that diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java index 879b41196..34579a22f 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java @@ -73,7 +73,6 @@ import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.meta.ValueMetaData; import org.apache.openjpa.util.UnsupportedException; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; /** * JDBC query implementation. diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java index f0f6b8d70..b1beb7eee 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java @@ -45,7 +45,6 @@ import org.apache.openjpa.lib.util.Options; import org.apache.openjpa.util.MetaDataException; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; import serp.util.Strings; /////////////////////////////////////////////////////////// diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java index 10a68c543..fb18c5df8 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java @@ -29,7 +29,6 @@ import org.apache.openjpa.kernel.ResultPacker; import org.apache.openjpa.lib.rop.ResultObjectProvider; import org.apache.openjpa.util.StoreException; import org.apache.openjpa.util.UnsupportedException; -import serp.util.Numbers; /** * Provides all column data in a {@link ResultSet}. 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 369bc32fb..c19c6b4c3 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 @@ -48,7 +48,6 @@ import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.meta.ClassMetaData; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; /** * A SQL query. 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 f626819e7..a48a6ca9b 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 @@ -58,7 +58,6 @@ import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.util.InvalidStateException; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; //////////////////////////////////////////////////////////// // NOTE: Do not change property names; see SequenceMetaData diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsExpression.java index e15fd16ce..429bc4c28 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsExpression.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsExpression.java @@ -21,7 +21,6 @@ package org.apache.openjpa.jdbc.kernel.exps; import java.util.Map; import org.apache.openjpa.jdbc.sql.Select; -import serp.util.Numbers; /** * Tests whether one value contains another. diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetObjectId.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetObjectId.java index ff6114ebd..534334501 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetObjectId.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetObjectId.java @@ -34,7 +34,6 @@ import org.apache.openjpa.util.ApplicationIds; import org.apache.openjpa.util.Id; import org.apache.openjpa.util.OpenJPAId; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; /** * Select the oid value of an object; typically used in projections. diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StartsWithExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StartsWithExpression.java index 5aeae2a15..3f1ae6803 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StartsWithExpression.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StartsWithExpression.java @@ -29,7 +29,6 @@ import org.apache.openjpa.jdbc.sql.SQLBuffer; import org.apache.openjpa.jdbc.sql.Select; import org.apache.openjpa.kernel.exps.ExpressionVisitor; import org.apache.openjpa.meta.XMLMetaData; -import serp.util.Numbers; /** * Test if one string starts with another. diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JavaSQLTypes.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JavaSQLTypes.java index 52e15ae7a..77f83d874 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JavaSQLTypes.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JavaSQLTypes.java @@ -24,7 +24,6 @@ import java.sql.Time; import java.sql.Timestamp; import org.apache.openjpa.meta.JavaTypes; -import serp.util.Numbers; /** * Java SQL type constants. diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/IdentityJoinable.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/IdentityJoinable.java index 8e1540fd7..94f284a1a 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/IdentityJoinable.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/IdentityJoinable.java @@ -29,7 +29,6 @@ import org.apache.openjpa.jdbc.sql.Joins; import org.apache.openjpa.jdbc.sql.Result; import org.apache.openjpa.kernel.OpenJPAStateManager; import org.apache.openjpa.util.Id; -import serp.util.Numbers; /** * {@link Joinable} for the datastore identity column. 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 16b20507f..cf9d125f8 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 @@ -23,7 +23,6 @@ import org.apache.openjpa.jdbc.schema.Column; import org.apache.openjpa.jdbc.schema.Schemas; import org.apache.openjpa.meta.JavaTypes; -import serp.util.Numbers; /** * Uses multiple version numbers spanning multiple columns for optimistic diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NumberVersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NumberVersionStrategy.java index 843807558..f3988e453 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NumberVersionStrategy.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NumberVersionStrategy.java @@ -24,7 +24,6 @@ import java.util.HashMap; import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.util.InternalException; import org.apache.openjpa.jdbc.schema.Column; -import serp.util.Numbers; /** * Uses a version number for optimistic versioning. diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java index abd381bab..46d94180b 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java @@ -70,7 +70,6 @@ import org.apache.openjpa.util.ObjectId; import org.apache.openjpa.util.OpenJPAId; import org.apache.openjpa.util.UnsupportedException; -import serp.util.Numbers; /** * Mapping for a single-valued relation to another entity. 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 d5b463c1c..190488f2d 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 @@ -32,7 +32,6 @@ import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier; import org.apache.openjpa.jdbc.meta.JavaSQLTypes; import org.apache.openjpa.jdbc.meta.VersionStrategy; import org.apache.openjpa.meta.JavaTypes; -import serp.util.Numbers; /** * Represents a database column. Closely aligned with the column diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java index 9735316db..dc7355dfe 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java @@ -45,7 +45,6 @@ import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.Options; import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.util.GeneralException; -import serp.util.Numbers; import serp.util.Strings; /** diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java index 75090b629..d5d1a0e0e 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java @@ -36,7 +36,6 @@ import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.Localizer.Message; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; /** * Custom SAX parser used to parse {@link Schema} objects. The parser 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 5debb948f..890f9db0b 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 @@ -125,7 +125,6 @@ import org.apache.openjpa.util.StoreException; import org.apache.openjpa.util.UnsupportedException; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; import serp.util.Strings; /** diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java index 775d54289..ae6f16d68 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java @@ -60,7 +60,6 @@ import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.util.StoreException; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; /** * Dictionary for Oracle. diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java index f8a410570..69974ecaf 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java @@ -44,7 +44,6 @@ import org.apache.openjpa.jdbc.meta.JavaSQLTypes; import org.apache.openjpa.jdbc.schema.Column; import org.apache.openjpa.meta.JavaTypes; -import serp.util.Numbers; /** * Base {@link Result} implementation wrapped around a result set. diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java index 7ccb973b7..4a88315d7 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java @@ -45,7 +45,6 @@ import org.apache.openjpa.jdbc.schema.Table; import org.apache.openjpa.kernel.OpenJPAStateManager; import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.util.InternalException; -import serp.util.Numbers; /** * Basic {@link Row} implementation. 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 ced04f94f..8d521d53c 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 @@ -38,7 +38,6 @@ import org.apache.openjpa.jdbc.schema.Sequence; import org.apache.openjpa.jdbc.schema.Table; import org.apache.openjpa.kernel.exps.Parameter; -import serp.util.Numbers; /** * Buffer for SQL statements that can be used to create 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 763d06175..0ab3ca7c5 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 @@ -61,7 +61,6 @@ import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.util.ApplicationIds; import org.apache.openjpa.util.Id; import org.apache.openjpa.util.InternalException; -import serp.util.Numbers; /** * Standard {@link Select} implementation. Usage note: though this class diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java index 733a5ded0..c013c0d76 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java @@ -51,7 +51,6 @@ import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.meta.MetaDataRepository; import org.apache.openjpa.util.ObjectNotFoundException; -import serp.util.Numbers; /** * A {@link StoreQuery} implementation that caches the OIDs involved in 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 b3a476f6e..62b317fe3 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 @@ -101,7 +101,6 @@ import serp.bytecode.MethodInstruction; import serp.bytecode.Project; import serp.bytecode.TableSwitchInstruction; import serp.bytecode.ClassInstruction; -import serp.util.Numbers; import serp.util.Strings; /** diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java index 474975c5d..58178371c 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java @@ -32,7 +32,6 @@ import org.apache.openjpa.meta.ValueMetaData; import org.apache.openjpa.util.InternalException; import org.apache.openjpa.util.UnsupportedException; import org.apache.openjpa.util.ImplHelper; -import serp.util.Numbers; /** * Implementation of {@link OpenJPAStateManager} designed to retrieve diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java index 939a2ac0e..5ef1737b2 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java @@ -41,7 +41,6 @@ import org.apache.openjpa.meta.ClassMetaData; import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.util.InternalException; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; import serp.util.Strings; /** diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java index 669292df7..d136089dd 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java @@ -37,7 +37,6 @@ import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.meta.ValueMetaData; import org.apache.openjpa.util.GeneralException; import org.apache.openjpa.util.ImplHelper; -import serp.util.Numbers; /** * State manager used to access state of embedded object id primary key fields. 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 23c849333..8255ad383 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 @@ -66,7 +66,6 @@ import org.apache.openjpa.util.OpenJPAException; import org.apache.openjpa.util.UnsupportedException; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; import serp.util.Strings; /** 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 376c5e663..613d5b849 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 @@ -68,7 +68,6 @@ import org.apache.openjpa.util.OpenJPAId; import org.apache.openjpa.util.ProxyManager; import org.apache.openjpa.util.RuntimeExceptionTranslator; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; /** * Implementation of the {@link OpenJPAStateManager} interface for use diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TimeSeededSeq.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TimeSeededSeq.java index 061b7ab9f..67a7521f8 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TimeSeededSeq.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TimeSeededSeq.java @@ -19,7 +19,6 @@ package org.apache.openjpa.kernel; import org.apache.openjpa.meta.ClassMetaData; -import serp.util.Numbers; //////////////////////////////////////////////////////////// // NOTE: Do not change property names; see SequenceMetaData diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionLockManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionLockManager.java index 2c05c9dbc..becb970a5 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionLockManager.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionLockManager.java @@ -18,7 +18,6 @@ */ package org.apache.openjpa.kernel; -import serp.util.Numbers; /** * {@link LockManager} implementation that provides support diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Abs.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Abs.java index 799dc987b..98455751d 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Abs.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Abs.java @@ -22,7 +22,6 @@ import java.math.BigDecimal; import java.math.BigInteger; import org.apache.openjpa.kernel.Filters; -import serp.util.Numbers; /** * Take the absolute value of a number. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Avg.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Avg.java index 693668f46..665c0be55 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Avg.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Avg.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.Iterator; import org.apache.openjpa.kernel.Filters; -import serp.util.Numbers; /** * Average values. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Count.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Count.java index a1b1733a1..e99863dec 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Count.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Count.java @@ -21,7 +21,6 @@ package org.apache.openjpa.kernel.exps; import java.util.Collection; import java.util.Iterator; -import serp.util.Numbers; /** * Count non-null values. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IndexOf.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IndexOf.java index 5fe933def..76e789fc5 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IndexOf.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IndexOf.java @@ -19,7 +19,6 @@ package org.apache.openjpa.kernel.exps; import org.apache.openjpa.kernel.StoreContext; -import serp.util.Numbers; /** * Find the index of one string within another. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Size.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Size.java index ca4e394d4..4d15df211 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Size.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Size.java @@ -21,7 +21,6 @@ package org.apache.openjpa.kernel.exps; import java.util.Collection; import java.util.Map; -import serp.util.Numbers; /** * Returns the count of a collection. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringLength.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringLength.java index a7ddd4972..11924c435 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringLength.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringLength.java @@ -19,7 +19,6 @@ package org.apache.openjpa.kernel.exps; import org.apache.openjpa.kernel.StoreContext; -import serp.util.Numbers; /** * Returns the number of characters in the String. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.java index 487b41b3e..c9ca5c539 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.Iterator; import org.apache.openjpa.kernel.Filters; -import serp.util.Numbers; /** * Sum values. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Type.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Type.java index a9e7f45cc..b23b924da 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Type.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Type.java @@ -23,7 +23,6 @@ import java.util.Map; import org.apache.openjpa.kernel.StoreContext; -import serp.util.Numbers; /** * Returns the entity type. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java index ae3381d61..1344e5d5f 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java @@ -68,7 +68,6 @@ import org.apache.openjpa.meta.ValueMetaData; import org.apache.openjpa.util.InternalException; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; /** * Builder for JPQL expressions. This class takes the query parsed 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 a4640b09e..ba2645f44 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 @@ -32,7 +32,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.ObjectUtils; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.util.MetaDataException; -import serp.util.Numbers; /** * Captures fetch group metadata. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java index 024f7599f..14be49645 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java @@ -40,7 +40,6 @@ import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.lib.meta.CFMetaDataParser; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.util.MetaDataException; -import serp.util.Numbers; import serp.util.Strings; /** diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueStrategies.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueStrategies.java index 19fb1c3b7..18fa7d91f 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueStrategies.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueStrategies.java @@ -23,7 +23,6 @@ import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.StringDistance; import org.apache.openjpa.util.MetaDataException; -import serp.util.Numbers; /** * Strategies for persistent value generation. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java index bbfa4aacf..f0b2df39c 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java @@ -41,7 +41,6 @@ import org.apache.openjpa.meta.ClassMetaData; import org.apache.openjpa.meta.FieldMetaData; import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.meta.ValueStrategies; -import serp.util.Numbers; /** * Utility class for manipulating application object ids. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java index b3e95f69a..eaa94b7a8 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java @@ -23,7 +23,6 @@ import java.security.AccessController; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; -import serp.util.Numbers; /** * Datastore identity type. Implementations may choose to use this type, diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java index 907cfb312..e5c3f77bf 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java @@ -18,7 +18,6 @@ */ package org.apache.openjpa.util; -import serp.util.Numbers; /** * {@link OpenJPAId} subclass appropriate for int fields. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java index 7335c42f8..6e61b9690 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java @@ -18,7 +18,6 @@ */ package org.apache.openjpa.util; -import serp.util.Numbers; /** * {@link OpenJPAId} subclass appropriate for long fields. diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingConnection.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingConnection.java index 7568fa5f4..6a9516449 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingConnection.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingConnection.java @@ -37,7 +37,6 @@ import org.apache.openjpa.lib.util.Closeable; import org.apache.openjpa.lib.util.ConcreteClassGenerator; import org.apache.openjpa.lib.util.Localizer; -import serp.util.Numbers; /** * Wrapper around an existing connection. Subclasses can override the diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RandomAccessResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RandomAccessResultList.java index 7bba530b5..e450e2e9b 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RandomAccessResultList.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RandomAccessResultList.java @@ -25,7 +25,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import serp.util.Numbers; /** * Random-access result list implementation. It maintains a map diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java index 3d9bf3d5d..d25106ff2 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java @@ -22,7 +22,6 @@ import java.text.MessageFormat; import org.xml.sax.Locator; import org.apache.openjpa.lib.util.Localizer; -import serp.util.Numbers; /** * @author Stephen Kim 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 e52df2baa..4cc09b1ec 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 @@ -71,7 +71,6 @@ import org.xml.sax.Locator; import org.xml.sax.SAXException; import static org.apache.openjpa.persistence.jdbc.MappingTag.*; -import serp.util.Numbers; /** * Custom SAX parser used by the system to parse persistence mapping files. * diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PointHandler.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PointHandler.java index d1a44a260..5effef1cc 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PointHandler.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PointHandler.java @@ -26,7 +26,6 @@ import org.apache.openjpa.jdbc.meta.strats.AbstractValueHandler; import org.apache.openjpa.jdbc.schema.Column; import org.apache.openjpa.jdbc.schema.ColumnIO; import org.apache.openjpa.meta.JavaTypes; -import serp.util.Numbers; /** * Handler for {@link Point}. This is a sample of how to create custom 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 d55310d6e..da1eb0475 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 @@ -122,7 +122,6 @@ import org.apache.openjpa.util.MetaDataException; import org.apache.openjpa.util.UnsupportedException; import org.apache.openjpa.util.UserException; -import serp.util.Numbers; import serp.util.Strings; /** 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 713bdf7bc..12b5a5536 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 @@ -76,7 +76,6 @@ import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import serp.util.Numbers; /** * Custom SAX parser used by the system to quickly parse persistence diff --git a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java index 2eb0999ff..e5b8c7e8f 100644 --- a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java +++ b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java @@ -37,7 +37,6 @@ import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.meta.ValueMetaData; import org.apache.openjpa.util.Proxy; import org.apache.openjpa.util.UnsupportedException; -import serp.util.Numbers; /** * In-memory form of data in datastore backing a single persistent object. diff --git a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java index bee709f1d..d38e489d0 100644 --- a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java +++ b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java @@ -35,7 +35,6 @@ import org.apache.openjpa.lib.rop.ResultObjectProvider; import org.apache.openjpa.meta.ClassMetaData; import org.apache.openjpa.util.OptimisticException; import org.apache.openjpa.util.StoreException; -import serp.util.Numbers; /** * Store manager to a back-end consisting of XML files. This