From e25438a174d7c338b1392cbbded98270c0be853f Mon Sep 17 00:00:00 2001 From: Maxim Solodovnik Date: Wed, 3 Oct 2018 08:11:59 +0000 Subject: [PATCH] [OPENJPA-2751] imports, @Overrides and @Deprecated are organized, redundant type arguments and unnecessary casts are removed git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1842686 13f79535-47bb-0310-9956-ffa450edef68 --- .../gallery/constraint/ImageConstraint.java | 9 +- .../gallery/constraint/ImageContent.java | 11 +- .../constraint/ImageContentValidator.java | 2 + .../gallery/constraint/ImageValidator.java | 2 + .../openjpa/example/gallery/model/Album.java | 2 +- .../jest/src/main/java/demo/SimpleApp.java | 2 +- .../jpa/tools/swing/AttributeLegendView.java | 5 +- .../java/jpa/tools/swing/AttributeView.java | 2 +- .../jpa/tools/swing/ConfigurationViewer.java | 4 +- .../java/jpa/tools/swing/EntityDataModel.java | 10 +- .../java/jpa/tools/swing/EntityTable.java | 15 +- .../java/jpa/tools/swing/EntityTableView.java | 11 +- .../java/jpa/tools/swing/EntityTypeView.java | 2 +- .../java/jpa/tools/swing/ErrorDialog.java | 12 +- .../java/jpa/tools/swing/FileScanner.java | 2 +- .../src/main/java/jpa/tools/swing/Finder.java | 3 + .../jpa/tools/swing/GraphicOutputStream.java | 2 +- .../main/java/jpa/tools/swing/IndexedMap.java | 22 +- .../jpa/tools/swing/InstanceDataModel.java | 2 +- .../java/jpa/tools/swing/InstanceView.java | 5 +- .../java/jpa/tools/swing/MetamodelHelper.java | 6 +- .../java/jpa/tools/swing/MetamodelView.java | 5 +- .../main/java/jpa/tools/swing/PathFinder.java | 10 +- .../jpa/tools/swing/PowerPointViewer.java | 12 +- .../jpa/tools/swing/PreparedQueryViewer.java | 3 +- .../jpa/tools/swing/QueryStatisticsModel.java | 6 +- .../java/jpa/tools/swing/RoundButton.java | 2 +- .../jpa/tools/swing/ScrollingTextPane.java | 2 +- .../jpa/tools/swing/SourceCodeViewer.java | 12 +- .../main/java/jpa/tools/swing/StatusBar.java | 5 +- .../java/openbook/client/BuyBookPage.java | 17 +- .../java/openbook/client/DeliveryPage.java | 6 +- .../src/main/java/openbook/client/Demo.java | 60 +- .../java/openbook/client/ErrorHandler.java | 1 + .../src/main/java/openbook/client/Images.java | 2 +- .../main/java/openbook/client/SQLLogger.java | 7 +- .../main/java/openbook/client/SupplyPage.java | 9 +- .../src/main/java/openbook/domain/Author.java | 2 +- .../src/main/java/openbook/domain/Book.java | 5 +- .../main/java/openbook/domain/Customer.java | 3 +- .../main/java/openbook/domain/Inventory.java | 3 +- .../main/java/openbook/domain/LineItem.java | 5 +- .../java/openbook/domain/PurchaseOrder.java | 5 +- .../java/openbook/domain/ShoppingCart.java | 5 +- .../java/openbook/server/OpenBookService.java | 30 +- .../openbook/server/OpenBookServiceImpl.java | 30 +- .../openbook/server/PersistenceService.java | 4 +- .../java/openbook/server/ServiceFactory.java | 2 +- .../java/openbook/tools/CommandProcessor.java | 5 +- .../tools/ant/Java2HTMLConverterTask.java | 10 +- .../tools/converter/HTMLTokenRenderer.java | 10 +- .../tools/converter/ParseTokenListener.java | 4 +- .../tools/converter/PlainTokenRenderer.java | 5 + .../tools/converter/SourceRenderer.java | 8 +- .../tools/converter/TokenRenderer.java | 10 +- .../java/openbook/tools/parser/JavaLexer.java | 14 +- .../openbook/tools/parser/JavaParser.java | 71 ++- .../java/openbook/tools/util/URIUtils.java | 2 +- .../java/openbook/util/PropertyHelper.java | 14 +- .../main/java/openbook/util/Randomizer.java | 4 +- .../org/apache/openjpa/trader/domain/Ask.java | 2 +- .../org/apache/openjpa/trader/domain/Bid.java | 2 +- .../openjpa/trader/domain/LogStatement.java | 2 +- .../apache/openjpa/trader/domain/Match.java | 2 +- .../apache/openjpa/trader/domain/Stock.java | 2 +- .../openjpa/trader/domain/Tradable.java | 2 +- .../apache/openjpa/trader/domain/Trade.java | 2 +- .../apache/openjpa/trader/domain/Trader.java | 2 +- .../server/TradingServiceAdapterImpl.java | 2 +- .../openjpa/trader/service/Exchange.java | 2 +- .../trader/service/PersistenceService.java | 2 +- .../src/main/java/embeddables/Address.java | 1 + .../main/java/embeddables/ContactInfo.java | 1 + .../src/main/java/embeddables/Phone.java | 1 + .../src/main/java/embeddables/User.java | 3 +- .../simple/src/main/java/hellojpa/Main.java | 8 +- .../src/main/java/hellojpa/Message.java | 7 +- .../simple/src/main/java/relations/Deity.java | 11 +- .../simple/src/main/java/relations/Main.java | 13 +- .../daytrader/AccountDataBean.java | 1 + .../daytrader/AccountProfileDataBean.java | 1 + .../daytrader/HoldingDataBean.java | 1 + .../daytrader/MarketSummaryDataBean.java | 3 +- .../integration/daytrader/OrderDataBean.java | 1 + .../integration/daytrader/QuoteDataBean.java | 1 + .../integration/daytrader/TestDaytrader.java | 4 +- .../integration/daytrader/TradeAction.java | 4 +- .../integration/daytrader/TradeJPADirect.java | 9 +- .../integration/daytrader/TradeScenario.java | 12 +- .../jmx/TestJMXPlatformMBeans.java | 2 + .../integration/slf4j/TestLogFactory.java | 3 + .../DummyPersistenceProviderResolver.java | 2 + .../persistence/provider/DummyProvider1.java | 3 + .../persistence/provider/DummyProvider2.java | 3 + .../TestPersistenceProviderResolver.java | 10 +- .../integration/validation/Address.java | 10 + .../validation/ConstraintBoolean.java | 1 + .../validation/ConstraintNull.java | 1 + .../validation/ConstraintSize.java | 4 +- .../integration/validation/Customer.java | 4 + .../integration/validation/IAddress.java | 24 +- .../integration/validation/ICustomer.java | 8 +- .../integration/validation/IPerson.java | 15 +- .../openjpa/integration/validation/Image.java | 1 + .../integration/validation/Location.java | 1 + .../validation/NonDefGrpEntity.java | 1 - .../integration/validation/Person.java | 6 + .../integration/validation/SimpleEntity.java | 2 + .../validation/TestConstraintViolation.java | 3 +- .../integration/validation/TestEagerInit.java | 2 +- .../validation/TestTraversableResolver.java | 5 +- .../validation/TestValidatingLEM.java | 5 +- .../validation/TestValidationGroups.java | 4 +- .../openjpa/jdbc/ant/MappingToolTask.java | 8 +- .../jdbc/ant/ReverseMappingToolTask.java | 6 +- .../openjpa/jdbc/ant/SchemaToolTask.java | 7 +- .../openjpa/jdbc/conf/JDBCConfiguration.java | 152 ++--- .../jdbc/conf/JDBCConfigurationImpl.java | 83 ++- .../jdbc/conf/JDBCProductDerivation.java | 5 +- .../jdbc/conf/MappingFactoryValue.java | 4 +- .../jdbc/conf/MappingRepositoryValue.java | 1 + .../openjpa/jdbc/identifier/DBIdentifier.java | 10 +- .../jdbc/identifier/DBIdentifierUtil.java | 47 +- .../jdbc/identifier/DBIdentifierUtilImpl.java | 20 +- .../DefaultIdentifierConfiguration.java | 14 +- .../openjpa/jdbc/identifier/Normalizer.java | 2 +- .../identifier/QualifiedDBIdentifier.java | 11 +- .../kernel/AbstractJDBCSavepointManager.java | 9 + .../openjpa/jdbc/kernel/AbstractJDBCSeq.java | 8 + .../jdbc/kernel/AbstractUpdateManager.java | 6 +- .../BatchingConstraintUpdateManager.java | 2 + .../BatchingOperationOrderUpdateManager.java | 2 + .../BatchingPreparedStatementManagerImpl.java | 5 +- .../jdbc/kernel/ClassTableJDBCSeq.java | 7 +- .../jdbc/kernel/ConstraintUpdateManager.java | 4 + .../DelegatingJDBCFetchConfiguration.java | 30 + .../openjpa/jdbc/kernel/EagerFetchModes.java | 6 +- .../openjpa/jdbc/kernel/FinderCacheImpl.java | 33 +- .../openjpa/jdbc/kernel/FinderQueryImpl.java | 8 +- .../kernel/GenericResultObjectProvider.java | 9 + .../kernel/InstanceResultObjectProvider.java | 1 + .../jdbc/kernel/JDBC3SavepointManager.java | 4 + .../jdbc/kernel/JDBCBrokerFactory.java | 46 +- .../jdbc/kernel/JDBCFetchConfiguration.java | 60 +- .../kernel/JDBCFetchConfigurationImpl.java | 43 +- .../openjpa/jdbc/kernel/JDBCLockManager.java | 6 +- .../apache/openjpa/jdbc/kernel/JDBCSeq.java | 2 +- .../apache/openjpa/jdbc/kernel/JDBCStore.java | 22 +- .../openjpa/jdbc/kernel/JDBCStoreManager.java | 94 ++- .../openjpa/jdbc/kernel/JDBCStoreQuery.java | 33 +- .../apache/openjpa/jdbc/kernel/LRSSizes.java | 6 +- .../MappedQueryResultObjectProvider.java | 54 ++ .../openjpa/jdbc/kernel/MixedLockManager.java | 8 +- .../openjpa/jdbc/kernel/NativeJDBCSeq.java | 6 + .../kernel/OperationOrderUpdateManager.java | 4 + .../kernel/PagingResultObjectProvider.java | 12 +- .../jdbc/kernel/PessimisticLockManager.java | 8 +- ...reparedProjectionResultObjectProvider.java | 2 + .../jdbc/kernel/PreparedQueryCacheImpl.java | 61 +- .../jdbc/kernel/PreparedQueryImpl.java | 19 +- .../kernel/PreparedResultObjectProvider.java | 1 + .../jdbc/kernel/PreparedSQLStoreQuery.java | 10 +- .../jdbc/kernel/PreparedStatementManager.java | 6 +- .../kernel/PreparedStatementManagerImpl.java | 7 +- .../ProjectionResultObjectProvider.java | 1 + .../SQLProjectionResultObjectProvider.java | 9 + .../openjpa/jdbc/kernel/SQLStoreQuery.java | 18 +- .../kernel/SelectResultObjectProvider.java | 8 + .../jdbc/kernel/StoredProcedureQuery.java | 30 +- .../openjpa/jdbc/kernel/TableJDBCSeq.java | 37 +- .../openjpa/jdbc/kernel/UpdateManager.java | 4 +- .../jdbc/kernel/ValueTableJDBCSeq.java | 3 + .../org/apache/openjpa/jdbc/kernel/XROP.java | 12 +- .../apache/openjpa/jdbc/kernel/exps/Abs.java | 6 + .../openjpa/jdbc/kernel/exps/AbstractVal.java | 20 + .../openjpa/jdbc/kernel/exps/Aggregate.java | 17 + .../apache/openjpa/jdbc/kernel/exps/All.java | 4 + .../jdbc/kernel/exps/AndExpression.java | 6 + .../apache/openjpa/jdbc/kernel/exps/Any.java | 4 + .../apache/openjpa/jdbc/kernel/exps/Args.java | 26 +- .../apache/openjpa/jdbc/kernel/exps/Avg.java | 7 +- .../exps/BindVariableAndExpression.java | 6 + .../kernel/exps/BindVariableExpression.java | 6 + .../jdbc/kernel/exps/CoalesceExpression.java | 17 + .../jdbc/kernel/exps/CollectionParam.java | 14 + .../kernel/exps/CompareEqualExpression.java | 7 + .../jdbc/kernel/exps/CompareExpression.java | 8 +- .../openjpa/jdbc/kernel/exps/Concat.java | 16 + .../openjpa/jdbc/kernel/exps/Const.java | 17 + .../jdbc/kernel/exps/ConstGetObjectId.java | 10 + .../exps/ConstInstanceofExpression.java | 6 + .../openjpa/jdbc/kernel/exps/ConstPath.java | 23 +- .../jdbc/kernel/exps/ContainsExpression.java | 5 + .../kernel/exps/ContainsKeyExpression.java | 4 + .../openjpa/jdbc/kernel/exps/Count.java | 6 + .../openjpa/jdbc/kernel/exps/CurrentDate.java | 7 + .../jdbc/kernel/exps/DatastoreFunction.java | 3 +- .../openjpa/jdbc/kernel/exps/Distinct.java | 5 + .../jdbc/kernel/exps/EmptyExpression.java | 7 + .../jdbc/kernel/exps/EndsWithExpression.java | 22 + .../jdbc/kernel/exps/EqualExpression.java | 4 + .../jdbc/kernel/exps/EqualTypeExpression.java | 5 + .../apache/openjpa/jdbc/kernel/exps/Exp.java | 6 +- .../openjpa/jdbc/kernel/exps/Extension.java | 20 + .../openjpa/jdbc/kernel/exps/FilterValue.java | 32 +- .../jdbc/kernel/exps/FilterValueImpl.java | 16 + .../kernel/exps/GeneralCaseExpression.java | 17 + .../openjpa/jdbc/kernel/exps/GetColumn.java | 9 + .../openjpa/jdbc/kernel/exps/GetMapValue.java | 17 + .../openjpa/jdbc/kernel/exps/GetObjectId.java | 22 +- .../exps/HasContainsExpressionVisitor.java | 1 + .../jdbc/kernel/exps/InExpression.java | 6 + .../jdbc/kernel/exps/InKeyExpression.java | 4 + .../jdbc/kernel/exps/InSubQExpression.java | 6 + .../jdbc/kernel/exps/InValueExpression.java | 4 + .../openjpa/jdbc/kernel/exps/Index.java | 7 + .../openjpa/jdbc/kernel/exps/IndexOf.java | 17 + .../kernel/exps/InstanceofExpression.java | 6 + .../jdbc/kernel/exps/IsEmptyExpression.java | 6 + .../kernel/exps/IsNotEmptyExpression.java | 6 + .../kernel/exps/JDBCAggregateListener.java | 2 +- .../kernel/exps/JDBCExpressionFactory.java | 84 +++ .../jdbc/kernel/exps/JDBCFilterListener.java | 2 +- .../openjpa/jdbc/kernel/exps/JDBCPath.java | 2 +- .../jdbc/kernel/exps/JDBCStringContains.java | 4 + .../jdbc/kernel/exps/JDBCWildcardMatch.java | 4 + .../apache/openjpa/jdbc/kernel/exps/Lit.java | 11 + .../openjpa/jdbc/kernel/exps/MapEntry.java | 20 + .../openjpa/jdbc/kernel/exps/MapKey.java | 16 + .../jdbc/kernel/exps/MatchesExpression.java | 6 + .../apache/openjpa/jdbc/kernel/exps/Math.java | 17 + .../apache/openjpa/jdbc/kernel/exps/Max.java | 7 +- .../apache/openjpa/jdbc/kernel/exps/Min.java | 7 +- .../kernel/exps/NotContainsExpression.java | 6 + .../jdbc/kernel/exps/NotEqualExpression.java | 4 + .../kernel/exps/NotEqualTypeExpression.java | 5 + .../jdbc/kernel/exps/NotExpression.java | 6 + .../apache/openjpa/jdbc/kernel/exps/Null.java | 8 + .../jdbc/kernel/exps/NullIfExpression.java | 17 + .../kernel/exps/NullableAggregateUnaryOp.java | 2 +- .../jdbc/kernel/exps/OrExpression.java | 6 + .../openjpa/jdbc/kernel/exps/PCPath.java | 49 +- .../openjpa/jdbc/kernel/exps/Param.java | 13 + .../openjpa/jdbc/kernel/exps/SQLEmbed.java | 9 + .../jdbc/kernel/exps/SQLExpression.java | 4 + .../openjpa/jdbc/kernel/exps/SQLValue.java | 4 + .../jdbc/kernel/exps/SelectConstructor.java | 22 +- .../kernel/exps/SimpleCaseExpression.java | 17 + .../apache/openjpa/jdbc/kernel/exps/Size.java | 7 + .../apache/openjpa/jdbc/kernel/exps/Sqrt.java | 6 + .../kernel/exps/StartsWithExpression.java | 38 ++ .../jdbc/kernel/exps/StringFunction.java | 15 + .../jdbc/kernel/exps/StringLength.java | 6 + .../apache/openjpa/jdbc/kernel/exps/SubQ.java | 29 +- .../openjpa/jdbc/kernel/exps/Substring.java | 17 + .../apache/openjpa/jdbc/kernel/exps/Sum.java | 8 +- .../openjpa/jdbc/kernel/exps/ToLowerCase.java | 5 + .../openjpa/jdbc/kernel/exps/ToUpperCase.java | 5 + .../apache/openjpa/jdbc/kernel/exps/Trim.java | 16 + .../apache/openjpa/jdbc/kernel/exps/Type.java | 10 + .../openjpa/jdbc/kernel/exps/TypeLit.java | 11 + .../openjpa/jdbc/kernel/exps/UnaryOp.java | 16 + .../apache/openjpa/jdbc/kernel/exps/Val.java | 84 +-- .../openjpa/jdbc/kernel/exps/Variable.java | 24 + .../jdbc/kernel/exps/WhenCondition.java | 6 + .../openjpa/jdbc/kernel/exps/WhenScalar.java | 6 + .../openjpa/jdbc/meta/ClassMapping.java | 34 +- .../openjpa/jdbc/meta/ClassMappingInfo.java | 50 +- .../openjpa/jdbc/meta/ClassStrategy.java | 14 +- .../openjpa/jdbc/meta/DelegatingJoinable.java | 11 +- .../openjpa/jdbc/meta/Discriminator.java | 23 +- .../jdbc/meta/DiscriminatorMappingInfo.java | 10 +- .../jdbc/meta/DiscriminatorStrategy.java | 12 +- .../apache/openjpa/jdbc/meta/Embeddable.java | 14 +- .../openjpa/jdbc/meta/FieldMapping.java | 82 ++- .../openjpa/jdbc/meta/FieldMappingInfo.java | 20 +- .../openjpa/jdbc/meta/FieldStrategy.java | 54 +- .../openjpa/jdbc/meta/JDBCColumnOrder.java | 13 +- .../apache/openjpa/jdbc/meta/JDBCOrder.java | 6 +- .../jdbc/meta/JDBCRelatedFieldOrder.java | 12 +- .../openjpa/jdbc/meta/JDBCValueOrder.java | 12 +- .../apache/openjpa/jdbc/meta/Joinable.java | 12 +- .../openjpa/jdbc/meta/MappingDefaults.java | 76 +-- .../jdbc/meta/MappingDefaultsImpl.java | 62 +- .../apache/openjpa/jdbc/meta/MappingInfo.java | 42 +- .../openjpa/jdbc/meta/MappingRepository.java | 22 +- .../jdbc/meta/MappingStrategyInstaller.java | 10 +- .../apache/openjpa/jdbc/meta/MappingTool.java | 19 +- .../jdbc/meta/MetaDataPlusMappingFactory.java | 11 + .../jdbc/meta/NoneMappingDefaults.java | 43 +- .../jdbc/meta/NoneStrategyInstaller.java | 10 +- .../meta/PropertiesReverseCustomizer.java | 20 +- .../openjpa/jdbc/meta/QueryResultMapping.java | 39 +- .../jdbc/meta/RefreshStrategyInstaller.java | 10 +- .../apache/openjpa/jdbc/meta/RelationId.java | 2 +- .../openjpa/jdbc/meta/ReverseCustomizer.java | 26 +- .../openjpa/jdbc/meta/ReverseMappingTool.java | 42 +- .../jdbc/meta/RuntimeStrategyInstaller.java | 9 +- .../openjpa/jdbc/meta/SequenceMapping.java | 17 +- .../apache/openjpa/jdbc/meta/Strategy.java | 24 +- .../openjpa/jdbc/meta/StrategyInstaller.java | 2 + .../openjpa/jdbc/meta/ValueHandler.java | 14 +- .../openjpa/jdbc/meta/ValueMapping.java | 86 +-- .../openjpa/jdbc/meta/ValueMappingImpl.java | 43 +- .../openjpa/jdbc/meta/ValueMappingInfo.java | 21 +- .../org/apache/openjpa/jdbc/meta/Version.java | 25 + .../openjpa/jdbc/meta/VersionMappingInfo.java | 9 +- .../openjpa/jdbc/meta/VersionStrategy.java | 16 +- .../meta/strats/AbstractClassStrategy.java | 9 + .../strats/AbstractDiscriminatorStrategy.java | 9 + .../meta/strats/AbstractFieldStrategy.java | 30 + .../jdbc/meta/strats/AbstractStrategy.java | 15 + .../meta/strats/AbstractValueHandler.java | 9 + .../meta/strats/AbstractVersionStrategy.java | 10 + .../jdbc/meta/strats/BlobValueHandler.java | 4 + .../meta/strats/ByteArrayValueHandler.java | 6 + .../strats/CharArrayStreamValueHandler.java | 6 + .../meta/strats/CharArrayValueHandler.java | 6 + .../ClassNameDiscriminatorStrategy.java | 10 +- .../jdbc/meta/strats/ClobValueHandler.java | 4 + .../meta/strats/ColumnVersionStrategy.java | 15 +- .../meta/strats/ContainerFieldStrategy.java | 9 + .../meta/strats/ElementEmbedValueHandler.java | 35 +- .../jdbc/meta/strats/EmbedFieldStrategy.java | 248 +++++++- .../jdbc/meta/strats/EmbedValueHandler.java | 15 +- .../meta/strats/EmbeddedClassStrategy.java | 4 + .../jdbc/meta/strats/EnumValueHandler.java | 10 +- .../jdbc/meta/strats/FlatClassStrategy.java | 6 + .../jdbc/meta/strats/FullClassStrategy.java | 17 +- .../HandlerCollectionTableFieldStrategy.java | 65 +- .../meta/strats/HandlerFieldStrategy.java | 40 +- .../HandlerHandlerMapTableFieldStrategy.java | 51 +- .../HandlerRelationMapTableFieldStrategy.java | 67 ++- .../jdbc/meta/strats/IdentityJoinable.java | 8 + .../meta/strats/ImmutableValueHandler.java | 9 +- .../strats/InValueDiscriminatorStrategy.java | 8 + .../strats/LRSCollectionFieldStrategy.java | 14 +- .../jdbc/meta/strats/LRSMapFieldStrategy.java | 30 +- .../jdbc/meta/strats/LRSProxyCollection.java | 15 +- .../openjpa/jdbc/meta/strats/LRSProxyMap.java | 24 +- .../jdbc/meta/strats/LobFieldStrategy.java | 15 + .../meta/strats/MapTableFieldStrategy.java | 30 +- .../strats/MaxEmbeddedBlobFieldStrategy.java | 10 + .../MaxEmbeddedByteArrayFieldStrategy.java | 11 + .../MaxEmbeddedCharArrayFieldStrategy.java | 11 + .../strats/MaxEmbeddedClobFieldStrategy.java | 10 + .../strats/MaxEmbeddedLobFieldStrategy.java | 22 +- .../strats/MultiColumnVersionStrategy.java | 9 +- ...NanoPrecisionTimestampVersionStrategy.java | 4 + .../jdbc/meta/strats/NoneClassStrategy.java | 8 + .../strats/NoneDiscriminatorStrategy.java | 5 + .../jdbc/meta/strats/NoneFieldStrategy.java | 5 + .../jdbc/meta/strats/NoneVersionStrategy.java | 5 + .../meta/strats/NumberVersionStrategy.java | 9 +- .../meta/strats/ObjectIdClassStrategy.java | 3 + .../meta/strats/ObjectIdValueHandler.java | 7 + .../meta/strats/PrimitiveFieldStrategy.java | 28 + ...tionCollectionInverseKeyFieldStrategy.java | 12 + .../RelationCollectionTableFieldStrategy.java | 15 + .../meta/strats/RelationFieldStrategy.java | 88 ++- .../RelationHandlerMapTableFieldStrategy.java | 62 +- .../RelationMapInverseKeyFieldStrategy.java | 31 +- .../strats/RelationMapTableFieldStrategy.java | 31 +- ...RelationRelationMapTableFieldStrategy.java | 71 ++- .../jdbc/meta/strats/RelationStrategies.java | 5 +- ...RelationToManyInverseKeyFieldStrategy.java | 19 +- .../RelationToManyTableFieldStrategy.java | 18 +- .../StateComparisonVersionStrategy.java | 19 + .../strats/StoreCollectionFieldStrategy.java | 30 +- .../jdbc/meta/strats/StringFieldStrategy.java | 31 +- .../SubclassJoinDiscriminatorStrategy.java | 9 + .../SuperclassDiscriminatorStrategy.java | 8 + .../strats/SuperclassVersionStrategy.java | 7 + .../meta/strats/TimestampVersionStrategy.java | 8 +- .../meta/strats/UntypedPCValueHandler.java | 11 +- .../strats/ValueMapDiscriminatorStrategy.java | 8 + .../meta/strats/VerticalClassStrategy.java | 12 + .../jdbc/meta/strats/XMLValueHandler.java | 6 + .../apache/openjpa/jdbc/schema/Column.java | 26 +- .../apache/openjpa/jdbc/schema/ColumnIO.java | 11 +- .../openjpa/jdbc/schema/Constraint.java | 17 +- .../jdbc/schema/DBCPDriverDataSource.java | 4 + .../jdbc/schema/DataSourceFactory.java | 6 +- .../openjpa/jdbc/schema/DriverDataSource.java | 31 +- .../jdbc/schema/DynamicSchemaFactory.java | 27 +- .../jdbc/schema/FileSchemaFactory.java | 9 +- .../openjpa/jdbc/schema/ForeignKey.java | 16 +- .../org/apache/openjpa/jdbc/schema/Index.java | 11 +- .../jdbc/schema/LazySchemaFactory.java | 14 +- .../openjpa/jdbc/schema/LocalConstraint.java | 9 +- .../apache/openjpa/jdbc/schema/NameSet.java | 12 +- .../openjpa/jdbc/schema/PrimaryKey.java | 10 +- .../openjpa/jdbc/schema/ReferenceCounter.java | 2 + .../apache/openjpa/jdbc/schema/Schema.java | 28 +- .../openjpa/jdbc/schema/SchemaFactory.java | 4 +- .../openjpa/jdbc/schema/SchemaGenerator.java | 40 +- .../openjpa/jdbc/schema/SchemaGroup.java | 30 +- .../openjpa/jdbc/schema/SchemaParser.java | 10 +- .../openjpa/jdbc/schema/SchemaSerializer.java | 16 +- .../openjpa/jdbc/schema/SchemaTool.java | 18 +- .../apache/openjpa/jdbc/schema/Schemas.java | 5 +- .../apache/openjpa/jdbc/schema/Sequence.java | 15 +- .../jdbc/schema/SimpleDriverDataSource.java | 24 + .../org/apache/openjpa/jdbc/schema/Table.java | 58 +- .../jdbc/schema/TableSchemaFactory.java | 7 + .../apache/openjpa/jdbc/schema/Unique.java | 12 +- .../openjpa/jdbc/schema/XMLSchemaParser.java | 42 +- .../jdbc/schema/XMLSchemaSerializer.java | 18 +- .../jdbc/sql/AbstractDB2Dictionary.java | 1 + .../openjpa/jdbc/sql/AbstractResult.java | 96 +++ .../jdbc/sql/AbstractSQLServerDictionary.java | 5 + .../openjpa/jdbc/sql/AccessDictionary.java | 1 + .../jdbc/sql/BooleanRepresentation.java | 6 +- .../sql/BooleanRepresentationFactory.java | 2 +- .../openjpa/jdbc/sql/DB2Dictionary.java | 21 + .../apache/openjpa/jdbc/sql/DBDictionary.java | 79 ++- .../openjpa/jdbc/sql/DBDictionaryFactory.java | 2 +- .../openjpa/jdbc/sql/DerbyDictionary.java | 5 +- .../openjpa/jdbc/sql/EmpressDictionary.java | 5 + .../openjpa/jdbc/sql/FirebirdDictionary.java | 5 +- .../apache/openjpa/jdbc/sql/H2Dictionary.java | 4 +- .../openjpa/jdbc/sql/HSQLDictionary.java | 3 +- .../openjpa/jdbc/sql/InformixDictionary.java | 1 + .../openjpa/jdbc/sql/IngresDictionary.java | 2 + .../org/apache/openjpa/jdbc/sql/Join.java | 4 + .../org/apache/openjpa/jdbc/sql/JoinSet.java | 11 +- .../apache/openjpa/jdbc/sql/JoinSyntaxes.java | 6 +- .../org/apache/openjpa/jdbc/sql/Joins.java | 26 +- .../apache/openjpa/jdbc/sql/LogicalUnion.java | 165 ++++- .../openjpa/jdbc/sql/MariaDBDictionary.java | 3 +- .../apache/openjpa/jdbc/sql/MergedResult.java | 88 ++- .../openjpa/jdbc/sql/MySQLDictionary.java | 3 +- .../openjpa/jdbc/sql/OracleDictionary.java | 31 +- .../openjpa/jdbc/sql/PointbaseDictionary.java | 3 + .../openjpa/jdbc/sql/PostgresDictionary.java | 25 +- .../apache/openjpa/jdbc/sql/PrimaryRow.java | 20 +- .../java/org/apache/openjpa/jdbc/sql/Raw.java | 1 + .../org/apache/openjpa/jdbc/sql/Result.java | 168 +++--- .../openjpa/jdbc/sql/ResultSetResult.java | 38 ++ .../java/org/apache/openjpa/jdbc/sql/Row.java | 150 ++--- .../org/apache/openjpa/jdbc/sql/RowImpl.java | 74 ++- .../apache/openjpa/jdbc/sql/RowManager.java | 10 +- .../openjpa/jdbc/sql/RowManagerImpl.java | 23 +- .../apache/openjpa/jdbc/sql/SQLBuffer.java | 8 +- .../openjpa/jdbc/sql/SQLErrorCodeReader.java | 7 +- .../openjpa/jdbc/sql/SQLExceptions.java | 2 +- .../apache/openjpa/jdbc/sql/SQLFactory.java | 6 +- .../openjpa/jdbc/sql/SQLFactoryImpl.java | 6 + .../openjpa/jdbc/sql/SQLServerDictionary.java | 6 + .../apache/openjpa/jdbc/sql/SecondaryRow.java | 6 + .../org/apache/openjpa/jdbc/sql/Select.java | 240 ++++---- .../openjpa/jdbc/sql/SelectExecutor.java | 40 +- .../apache/openjpa/jdbc/sql/SelectImpl.java | 260 +++++++- .../openjpa/jdbc/sql/SolidDBDictionary.java | 2 +- .../openjpa/jdbc/sql/StoredProcedure.java | 19 +- .../openjpa/jdbc/sql/SybaseDictionary.java | 8 +- .../org/apache/openjpa/jdbc/sql/Union.java | 14 +- .../TestSQLStoreParamsSubstitution.java | 2 +- .../TestUpdateManagerFlushException.java | 206 ++++++- .../jdbc/meta/TestMappingDefaultsImpl.java | 5 +- .../jdbc/sql/TestBooleanRepresentation.java | 5 +- .../openjpa/jdbc/sql/TestDB2Dictionary.java | 5 +- .../sql/TestDBDictionaryGeneratedSQL.java | 6 +- .../jdbc/sql/TestDictionaryFactory.java | 1 + .../openjpa/jdbc/sql/TestMySQLDictionary.java | 3 +- .../sql/identifier/TestDBIdentifiers.java | 14 +- .../java/org/apache/openjpa/json/JSON.java | 32 +- .../org/apache/openjpa/json/JSONObject.java | 12 +- .../persistence/jest/AbstractCommand.java | 18 +- .../openjpa/persistence/jest/Closure.java | 3 +- .../openjpa/persistence/jest/Constants.java | 90 +-- .../persistence/jest/DomainCommand.java | 3 + .../openjpa/persistence/jest/FindCommand.java | 1 + .../openjpa/persistence/jest/JESTCommand.java | 18 +- .../openjpa/persistence/jest/JESTContext.java | 13 +- .../openjpa/persistence/jest/JESTServlet.java | 3 +- .../persistence/jest/JPAServletContext.java | 14 +- .../apache/openjpa/persistence/jest/JSON.java | 32 +- .../openjpa/persistence/jest/JSONObject.java | 12 +- .../persistence/jest/JSONObjectFormatter.java | 6 +- .../persistence/jest/MetamodelHelper.java | 3 +- .../persistence/jest/ObjectFormatter.java | 12 +- .../persistence/jest/ProcessingException.java | 3 +- .../persistence/jest/PropertiesCommand.java | 3 +- .../persistence/jest/PrototypeFactory.java | 2 +- .../persistence/jest/QueryCommand.java | 10 +- .../persistence/jest/TokenReplacedStream.java | 1 + .../persistence/jest/XMLFormatter.java | 3 + openjpa-jest/src/test/java/demo/Actor.java | 2 +- openjpa-jest/src/test/java/demo/Movie.java | 2 +- .../openjpa/persistence/jest/TestJEST.java | 5 +- .../AbstractStoreBrokerFactory.java | 7 +- .../abstractstore/AbstractStoreManager.java | 41 +- .../openjpa/ant/ApplicationIdToolTask.java | 2 + .../apache/openjpa/ant/MetaDataToolTask.java | 7 +- .../apache/openjpa/ant/PCEnhancerTask.java | 2 + .../org/apache/openjpa/audit/AuditLogger.java | 3 +- .../org/apache/openjpa/audit/Auditable.java | 5 +- .../org/apache/openjpa/audit/Auditor.java | 4 +- .../apache/openjpa/conf/AutoDetachValue.java | 4 +- .../openjpa/conf/BrokerFactoryValue.java | 4 +- .../org/apache/openjpa/conf/BrokerValue.java | 5 +- .../apache/openjpa/conf/CacheMarshaller.java | 14 +- .../openjpa/conf/CacheMarshallerImpl.java | 10 +- .../openjpa/conf/CacheMarshallersValue.java | 8 +- .../apache/openjpa/conf/CallbackOptions.java | 2 + .../apache/openjpa/conf/DetachOptions.java | 3 + .../conf/MetaDataCacheMaintenance.java | 10 +- .../openjpa/conf/MetaDataRepositoryValue.java | 2 +- .../openjpa/conf/NoOpCacheMarshaller.java | 5 + .../openjpa/conf/OpenJPAConfiguration.java | 564 +++++++++--------- .../conf/OpenJPAConfigurationImpl.java | 272 ++++++++- .../conf/OpenJPAProductDerivation.java | 13 +- .../apache/openjpa/conf/OpenJPAVersion.java | 1 + ...nAndConfigurationTypeValidationPolicy.java | 5 + .../conf/QueryCompilationCacheValue.java | 3 +- .../conf/RemoteCommitProviderValue.java | 5 +- .../openjpa/conf/SchemaGenerationAction.java | 8 +- .../openjpa/conf/SchemaGenerationSource.java | 10 +- .../apache/openjpa/conf/Specification.java | 2 + .../openjpa/conf/SpecificationPlugin.java | 1 + .../openjpa/datacache/AbstractDataCache.java | 60 +- .../openjpa/datacache/AbstractQueryCache.java | 51 +- .../openjpa/datacache/CacheStatistics.java | 48 +- .../datacache/CacheStatisticsImpl.java | 36 +- .../openjpa/datacache/CacheStatisticsSPI.java | 8 +- .../org/apache/openjpa/datacache/Caches.java | 2 +- .../openjpa/datacache/ClearableScheduler.java | 5 +- .../datacache/ConcurrentDataCache.java | 16 + .../datacache/ConcurrentQueryCache.java | 13 + .../apache/openjpa/datacache/DataCache.java | 62 +- .../openjpa/datacache/DataCacheManager.java | 26 +- .../datacache/DataCacheManagerImpl.java | 19 +- .../openjpa/datacache/DataCachePCData.java | 4 +- .../datacache/DataCachePCDataGenerator.java | 8 +- .../datacache/DataCachePCDataImpl.java | 23 +- .../datacache/DataCacheStoreManager.java | 41 +- .../DefaultCacheDistributionPolicy.java | 4 + .../datacache/DelegatingDataCache.java | 34 +- .../datacache/DelegatingQueryCache.java | 17 + .../openjpa/datacache/ExpirationEvent.java | 2 + .../openjpa/datacache/ExpirationListener.java | 2 +- .../datacache/PartitionedDataCache.java | 10 +- .../apache/openjpa/datacache/QueryCache.java | 26 +- .../datacache/QueryCacheStoreQuery.java | 65 +- .../apache/openjpa/datacache/QueryKey.java | 28 +- .../apache/openjpa/datacache/QueryResult.java | 5 +- .../TypeBasedCacheDistributionPolicy.java | 2 +- .../openjpa/datacache/TypesChangedEvent.java | 2 + .../datacache/TypesChangedListener.java | 2 +- .../openjpa/ee/AbstractManagedRuntime.java | 2 + .../openjpa/ee/AutomaticManagedRuntime.java | 10 +- .../openjpa/ee/InvocationManagedRuntime.java | 7 + .../apache/openjpa/ee/JNDIManagedRuntime.java | 3 + .../org/apache/openjpa/ee/ManagedRuntime.java | 10 +- .../openjpa/ee/RegistryManagedRuntime.java | 17 + .../openjpa/ee/SunOneManagedRuntime.java | 4 + .../apache/openjpa/ee/WASManagedRuntime.java | 18 + .../openjpa/ee/WASRegistryManagedRuntime.java | 6 +- .../apache/openjpa/ee/WLSManagedRuntime.java | 4 + .../openjpa/enhance/ApplicationIdTool.java | 13 +- .../apache/openjpa/enhance/AsmAdaptor.java | 7 +- .../openjpa/enhance/AttributeTranslator.java | 4 +- .../openjpa/enhance/ClassRedefiner.java | 1 + .../apache/openjpa/enhance/CodeGenerator.java | 4 +- .../openjpa/enhance/DynamicStorage.java | 44 +- .../enhance/DynamicStorageGenerator.java | 1 + .../enhance/InstrumentationFactory.java | 1 + .../enhance/ManagedClassSubclasser.java | 14 +- .../enhance/ManagedInstanceProvider.java | 2 +- .../enhance/PCClassFileTransformer.java | 1 + .../openjpa/enhance/PCDataGenerator.java | 31 +- .../apache/openjpa/enhance/PCEnhancer.java | 40 +- .../openjpa/enhance/PCEnhancerAgent.java | 3 +- .../apache/openjpa/enhance/PCRegistry.java | 7 +- .../openjpa/enhance/PCSubclassValidator.java | 17 +- .../openjpa/enhance/PersistenceCapable.java | 18 +- .../openjpa/enhance/RedefinitionHelper.java | 7 +- .../enhance/ReflectingPersistenceCapable.java | 30 + .../apache/openjpa/enhance/Reflection.java | 11 +- .../RuntimeUnenhancedClassesModes.java | 6 +- .../apache/openjpa/enhance/StateManager.java | 98 +-- .../event/AbstractLifecycleListener.java | 18 + .../event/AbstractRemoteCommitProvider.java | 4 + .../event/AbstractTransactionListener.java | 9 + .../apache/openjpa/event/AttachListener.java | 4 +- .../openjpa/event/BeanLifecycleCallbacks.java | 3 + .../event/BeginTransactionListener.java | 2 +- .../openjpa/event/BrokerFactoryEvent.java | 3 + .../event/BrokerFactoryEventManager.java | 11 +- .../openjpa/event/BrokerFactoryListener.java | 5 +- .../apache/openjpa/event/CallbackModes.java | 10 +- .../apache/openjpa/event/ClearListener.java | 4 +- .../apache/openjpa/event/DeleteListener.java | 4 +- .../apache/openjpa/event/DetachListener.java | 4 +- .../apache/openjpa/event/DirtyListener.java | 8 +- .../openjpa/event/EndTransactionListener.java | 12 +- .../event/ExceptionOrphanedKeyAction.java | 1 + .../event/FlushTransactionListener.java | 4 +- .../event/JMSRemoteCommitProvider.java | 7 + .../openjpa/event/LifecycleCallbacks.java | 4 +- .../apache/openjpa/event/LifecycleEvent.java | 3 + .../openjpa/event/LifecycleEventManager.java | 34 +- .../apache/openjpa/event/LoadListener.java | 4 +- .../openjpa/event/LogOrphanedKeyAction.java | 1 + .../event/MethodLifecycleCallbacks.java | 5 + .../openjpa/event/NoneOrphanedKeyAction.java | 1 + .../openjpa/event/OrphanedKeyAction.java | 2 +- .../apache/openjpa/event/PersistListener.java | 4 +- .../openjpa/event/PostDeleteListener.java | 2 +- .../openjpa/event/PostPersistListener.java | 2 +- .../openjpa/event/RemoteCommitEvent.java | 3 + .../event/RemoteCommitEventManager.java | 13 +- .../openjpa/event/RemoteCommitListener.java | 4 +- .../openjpa/event/RemoteCommitProvider.java | 6 +- .../event/SingleJVMRemoteCommitProvider.java | 2 + .../apache/openjpa/event/StoreListener.java | 4 +- .../openjpa/event/TransactionEvent.java | 3 + .../event/TransactionEventManager.java | 5 + .../apache/openjpa/event/UpdateListener.java | 4 +- .../AbstractDataCacheInstrument.java | 23 + .../AbstractPreparedQueryCacheInstrument.java | 13 + .../AbstractQueryCacheInstrument.java | 18 +- .../instrumentation/DataCacheInstrument.java | 44 +- .../InstrumentationManager.java | 10 +- .../InstrumentationManagerImpl.java | 6 + .../PreparedQueryCacheInstrument.java | 24 +- .../instrumentation/QueryCacheInstrument.java | 30 +- .../jmx/DataCacheJMXInstrument.java | 3 + .../instrumentation/jmx/JMXInstrument.java | 10 +- .../instrumentation/jmx/JMXProvider.java | 6 +- .../jmx/PreparedQueryCacheJMXInstrument.java | 3 + .../jmx/QueryCacheJMXInstrument.java | 3 + .../openjpa/kernel/AbstractBrokerFactory.java | 57 +- .../openjpa/kernel/AbstractFieldManager.java | 20 + .../openjpa/kernel/AbstractLockManager.java | 5 + .../apache/openjpa/kernel/AbstractPCData.java | 6 + .../AbstractPCResultObjectProvider.java | 10 + .../openjpa/kernel/AbstractStoreQuery.java | 47 +- .../apache/openjpa/kernel/AttachManager.java | 2 +- .../apache/openjpa/kernel/AttachStrategy.java | 4 +- .../apache/openjpa/kernel/AuditManager.java | 18 +- .../org/apache/openjpa/kernel/AutoClear.java | 4 +- .../org/apache/openjpa/kernel/AutoDetach.java | 14 +- .../org/apache/openjpa/kernel/Broker.java | 210 +++---- .../apache/openjpa/kernel/BrokerFactory.java | 36 +- .../org/apache/openjpa/kernel/BrokerImpl.java | 277 +++++++-- .../openjpa/kernel/ClearFieldManager.java | 10 + .../openjpa/kernel/ConnectionRetainModes.java | 6 +- .../openjpa/kernel/DelegatingBroker.java | 178 ++++++ .../kernel/DelegatingBrokerFactory.java | 22 + .../openjpa/kernel/DelegatingExtent.java | 13 + .../kernel/DelegatingFetchConfiguration.java | 64 ++ .../openjpa/kernel/DelegatingQuery.java | 75 +++ .../openjpa/kernel/DelegatingResultList.java | 46 +- .../apache/openjpa/kernel/DelegatingSeq.java | 7 + .../kernel/DelegatingStoreManager.java | 33 + .../apache/openjpa/kernel/DetachManager.java | 13 +- .../apache/openjpa/kernel/DetachState.java | 8 +- .../kernel/DetachedStateAttachStrategy.java | 9 +- .../openjpa/kernel/DetachedStateManager.java | 120 +++- .../kernel/DetachedValueStateManager.java | 115 +++- .../openjpa/kernel/DistinctResultList.java | 25 +- .../apache/openjpa/kernel/ECleanState.java | 18 +- .../org/apache/openjpa/kernel/ECopyState.java | 17 +- .../apache/openjpa/kernel/EDeletedState.java | 16 +- .../apache/openjpa/kernel/EDirtyState.java | 19 +- .../apache/openjpa/kernel/ENonTransState.java | 14 +- .../openjpa/kernel/ExpressionStoreQuery.java | 55 +- .../org/apache/openjpa/kernel/Extent.java | 22 +- .../org/apache/openjpa/kernel/ExtentImpl.java | 32 +- .../openjpa/kernel/FetchConfiguration.java | 128 ++-- .../kernel/FetchConfigurationImpl.java | 99 ++- .../apache/openjpa/kernel/FillStrategy.java | 8 +- .../org/apache/openjpa/kernel/Filters.java | 8 +- .../openjpa/kernel/FinalizingBrokerImpl.java | 4 + .../apache/openjpa/kernel/FindCallbacks.java | 4 +- .../apache/openjpa/kernel/FinderCache.java | 20 +- .../apache/openjpa/kernel/FinderQuery.java | 8 +- .../apache/openjpa/kernel/HollowState.java | 16 +- .../kernel/InMemorySavepointManager.java | 2 + .../apache/openjpa/kernel/InverseManager.java | 3 + .../openjpa/kernel/LocalManagedRuntime.java | 15 + .../org/apache/openjpa/kernel/LockLevels.java | 6 +- .../apache/openjpa/kernel/LockManager.java | 18 +- .../org/apache/openjpa/kernel/LockScopes.java | 4 +- .../apache/openjpa/kernel/ManagedCache.java | 11 +- .../openjpa/kernel/MethodStoreQuery.java | 17 +- .../openjpa/kernel/MixedLockLevels.java | 10 +- .../openjpa/kernel/NoneLockManager.java | 4 + .../apache/openjpa/kernel/ObjectFactory.java | 2 +- .../openjpa/kernel/ObjectIdStateManager.java | 135 ++++- .../apache/openjpa/kernel/OpCallbacks.java | 30 +- .../openjpa/kernel/OpenJPASavepoint.java | 7 +- .../openjpa/kernel/OpenJPAStateManager.java | 150 ++--- .../OrderingMergedResultObjectProvider.java | 2 + .../org/apache/openjpa/kernel/PCData.java | 26 +- .../org/apache/openjpa/kernel/PCDataImpl.java | 19 +- .../kernel/PCResultObjectProvider.java | 2 +- .../org/apache/openjpa/kernel/PCState.java | 5 +- .../apache/openjpa/kernel/PCleanState.java | 18 +- .../openjpa/kernel/PDeletedFlushedState.java | 8 +- .../apache/openjpa/kernel/PDeletedState.java | 20 +- .../apache/openjpa/kernel/PDirtyState.java | 20 +- .../openjpa/kernel/PNewDeletedState.java | 20 +- .../PNewFlushedDeletedFlushedState.java | 7 +- .../kernel/PNewFlushedDeletedState.java | 21 +- .../openjpa/kernel/PNewProvisionalState.java | 19 +- .../org/apache/openjpa/kernel/PNewState.java | 19 +- .../openjpa/kernel/PNonTransDeletedState.java | 18 +- .../openjpa/kernel/PNonTransDirtyState.java | 14 +- .../openjpa/kernel/PNonTransNewState.java | 13 +- .../apache/openjpa/kernel/PNonTransState.java | 18 +- .../apache/openjpa/kernel/PreparedQuery.java | 16 +- .../openjpa/kernel/PreparedQueryCache.java | 42 +- .../java/org/apache/openjpa/kernel/Query.java | 52 +- .../apache/openjpa/kernel/QueryContext.java | 91 ++- .../openjpa/kernel/QueryFlushModes.java | 6 +- .../org/apache/openjpa/kernel/QueryHints.java | 28 +- .../org/apache/openjpa/kernel/QueryImpl.java | 170 +++++- .../openjpa/kernel/QueryOperations.java | 6 +- .../openjpa/kernel/QueryStatistics.java | 105 +++- .../openjpa/kernel/ROPStoreManager.java | 4 + .../apache/openjpa/kernel/RestoreState.java | 6 +- .../apache/openjpa/kernel/ResultPacker.java | 8 +- .../apache/openjpa/kernel/ResultShape.java | 15 +- .../openjpa/kernel/SaveFieldManager.java | 6 +- .../openjpa/kernel/SavepointFieldManager.java | 9 +- .../openjpa/kernel/SavepointManager.java | 4 +- .../java/org/apache/openjpa/kernel/Seq.java | 18 +- .../openjpa/kernel/SingleFieldManager.java | 3 + .../openjpa/kernel/StateManagerImpl.java | 143 ++++- .../apache/openjpa/kernel/StoreContext.java | 148 ++--- .../apache/openjpa/kernel/StoreManager.java | 78 +-- .../org/apache/openjpa/kernel/StoreQuery.java | 103 ++-- .../apache/openjpa/kernel/TCleanState.java | 11 +- .../apache/openjpa/kernel/TDirtyState.java | 15 +- .../apache/openjpa/kernel/TLoadedState.java | 7 +- .../apache/openjpa/kernel/TimeSeededSeq.java | 5 + .../openjpa/kernel/TransferFieldManager.java | 20 + .../apache/openjpa/kernel/TransientState.java | 6 +- .../org/apache/openjpa/kernel/UUIDHexSeq.java | 5 + .../apache/openjpa/kernel/UUIDStringSeq.java | 5 + .../openjpa/kernel/UUIDType4HexSeq.java | 5 + .../openjpa/kernel/UUIDType4StringSeq.java | 5 + .../openjpa/kernel/VersionAttachStrategy.java | 3 + .../openjpa/kernel/VersionLockManager.java | 4 + .../org/apache/openjpa/kernel/exps/Abs.java | 5 + .../exps/AbstractExpressionBuilder.java | 8 +- .../exps/AbstractExpressionVisitor.java | 4 + .../org/apache/openjpa/kernel/exps/Add.java | 4 + .../apache/openjpa/kernel/exps/Aggregate.java | 9 + .../kernel/exps/AggregateListener.java | 8 +- .../openjpa/kernel/exps/AggregateVal.java | 9 + .../org/apache/openjpa/kernel/exps/All.java | 4 + .../openjpa/kernel/exps/AndExpression.java | 5 + .../org/apache/openjpa/kernel/exps/Any.java | 4 + .../org/apache/openjpa/kernel/exps/Args.java | 9 +- .../apache/openjpa/kernel/exps/Arguments.java | 2 +- .../org/apache/openjpa/kernel/exps/Avg.java | 5 + .../exps/BindKeyVariableExpression.java | 4 + .../exps/BindValueVariableExpression.java | 4 + .../exps/BindVariableAndExpression.java | 5 + .../kernel/exps/BindVariableExpression.java | 5 + .../openjpa/kernel/exps/BoundVariable.java | 6 + .../openjpa/kernel/exps/CandidatePath.java | 20 +- .../org/apache/openjpa/kernel/exps/Cast.java | 7 + .../apache/openjpa/kernel/exps/Coalesce.java | 5 + .../openjpa/kernel/exps/CollectionParam.java | 8 + .../kernel/exps/CompareExpression.java | 5 + .../apache/openjpa/kernel/exps/Concat.java | 6 + .../apache/openjpa/kernel/exps/Constant.java | 2 +- .../kernel/exps/ContainsExpression.java | 5 + .../kernel/exps/ContainsKeyExpression.java | 4 + .../kernel/exps/ContainsValueExpression.java | 4 + .../apache/openjpa/kernel/exps/Context.java | 8 +- .../org/apache/openjpa/kernel/exps/Count.java | 5 + .../openjpa/kernel/exps/CurrentDate.java | 5 + .../apache/openjpa/kernel/exps/Distinct.java | 7 + .../apache/openjpa/kernel/exps/Divide.java | 4 + .../kernel/exps/EndsWithExpression.java | 4 + .../openjpa/kernel/exps/EqualExpression.java | 4 + .../org/apache/openjpa/kernel/exps/Exp.java | 4 + .../openjpa/kernel/exps/Expression.java | 2 +- .../kernel/exps/ExpressionFactory.java | 162 ++--- .../openjpa/kernel/exps/ExpressionParser.java | 10 +- .../kernel/exps/ExpressionVisitor.java | 8 +- .../apache/openjpa/kernel/exps/Extension.java | 6 + .../openjpa/kernel/exps/FilterListener.java | 10 +- .../openjpa/kernel/exps/GeneralCase.java | 7 + .../openjpa/kernel/exps/GetMapValue.java | 6 + .../openjpa/kernel/exps/GetObjectId.java | 6 + .../exps/GreaterThanEqualExpression.java | 4 + .../kernel/exps/GreaterThanExpression.java | 4 + .../exps/InMemoryExpressionFactory.java | 90 ++- .../org/apache/openjpa/kernel/exps/Index.java | 4 + .../apache/openjpa/kernel/exps/IndexOf.java | 6 + .../kernel/exps/InstanceofExpression.java | 5 + .../kernel/exps/IsEmptyExpression.java | 5 + .../kernel/exps/LessThanEqualExpression.java | 4 + .../kernel/exps/LessThanExpression.java | 4 + .../org/apache/openjpa/kernel/exps/Lit.java | 9 + .../apache/openjpa/kernel/exps/Literal.java | 28 +- .../kernel/exps/MatchesExpression.java | 4 + .../apache/openjpa/kernel/exps/MathVal.java | 6 + .../org/apache/openjpa/kernel/exps/Max.java | 5 + .../org/apache/openjpa/kernel/exps/Min.java | 5 + .../org/apache/openjpa/kernel/exps/Mod.java | 4 + .../apache/openjpa/kernel/exps/Multiply.java | 4 + .../kernel/exps/NotEqualExpression.java | 4 + .../openjpa/kernel/exps/NotExpression.java | 5 + .../org/apache/openjpa/kernel/exps/Null.java | 6 + .../apache/openjpa/kernel/exps/NullIf.java | 5 + .../openjpa/kernel/exps/OrExpression.java | 5 + .../org/apache/openjpa/kernel/exps/Param.java | 8 + .../apache/openjpa/kernel/exps/Parameter.java | 4 +- .../org/apache/openjpa/kernel/exps/Path.java | 18 +- .../openjpa/kernel/exps/QueryExpressions.java | 14 +- .../apache/openjpa/kernel/exps/Resolver.java | 10 +- .../openjpa/kernel/exps/SimpleCase.java | 5 + .../org/apache/openjpa/kernel/exps/Size.java | 5 + .../org/apache/openjpa/kernel/exps/Sqrt.java | 5 + .../kernel/exps/StartsWithExpression.java | 4 + .../openjpa/kernel/exps/StringContains.java | 8 + .../openjpa/kernel/exps/StringLength.java | 6 + .../org/apache/openjpa/kernel/exps/SubQ.java | 11 + .../apache/openjpa/kernel/exps/Subquery.java | 10 +- .../apache/openjpa/kernel/exps/Substring.java | 6 + .../apache/openjpa/kernel/exps/Subtract.java | 4 + .../org/apache/openjpa/kernel/exps/Sum.java | 5 + .../org/apache/openjpa/kernel/exps/This.java | 6 + .../openjpa/kernel/exps/ToLowerCase.java | 6 + .../openjpa/kernel/exps/ToUpperCase.java | 6 + .../org/apache/openjpa/kernel/exps/Trim.java | 5 + .../org/apache/openjpa/kernel/exps/Type.java | 6 + .../apache/openjpa/kernel/exps/TypeLit.java | 9 + .../openjpa/kernel/exps/UnaryMathVal.java | 6 + .../openjpa/kernel/exps/UnboundVariable.java | 6 + .../org/apache/openjpa/kernel/exps/Val.java | 13 + .../openjpa/kernel/exps/ValExpression.java | 5 + .../org/apache/openjpa/kernel/exps/Value.java | 26 +- .../apache/openjpa/kernel/exps/ValuePath.java | 5 + .../openjpa/kernel/exps/WhenCondition.java | 3 + .../openjpa/kernel/exps/WhenScalar.java | 3 + .../openjpa/kernel/exps/WildcardMatch.java | 8 + .../kernel/jpql/JPQLExpressionBuilder.java | 62 +- .../openjpa/kernel/jpql/JPQLParser.java | 7 + .../openjpa/kernel/jpql/SimpleNode.java | 3 + .../meta/AbstractCFMetaDataFactory.java | 46 +- .../meta/AbstractMetaDataDefaults.java | 13 +- .../openjpa/meta/AbstractMetaDataFactory.java | 13 + .../apache/openjpa/meta/ClassMetaData.java | 79 ++- .../meta/DelegatingMetaDataFactory.java | 20 + .../org/apache/openjpa/meta/Extensions.java | 12 +- .../org/apache/openjpa/meta/FetchGroup.java | 18 +- .../apache/openjpa/meta/FieldMetaData.java | 73 ++- .../meta/InMemoryRelatedFieldOrder.java | 8 +- .../openjpa/meta/InMemoryValueOrder.java | 8 +- .../openjpa/meta/InheritanceComparator.java | 3 + .../openjpa/meta/InterfaceImplGenerator.java | 13 +- .../org/apache/openjpa/meta/JavaTypes.java | 6 +- .../openjpa/meta/LifecycleMetaData.java | 2 + .../apache/openjpa/meta/MetaDataContext.java | 2 +- .../apache/openjpa/meta/MetaDataDefaults.java | 36 +- .../apache/openjpa/meta/MetaDataFactory.java | 46 +- .../meta/MetaDataInheritanceComparator.java | 5 + .../apache/openjpa/meta/MetaDataModes.java | 14 +- .../openjpa/meta/MetaDataRepository.java | 102 ++-- .../org/apache/openjpa/meta/MetaDataTool.java | 1 + .../openjpa/meta/MultiQueryMetaData.java | 6 +- .../openjpa/meta/NonPersistentMetaData.java | 16 +- .../openjpa/meta/NoneMetaDataFactory.java | 38 ++ .../java/org/apache/openjpa/meta/Order.java | 8 +- .../openjpa/meta/ProxySetupStateManager.java | 46 ++ .../apache/openjpa/meta/QueryMetaData.java | 13 +- .../apache/openjpa/meta/SequenceMetaData.java | 19 +- .../apache/openjpa/meta/ValueMetaData.java | 92 +-- .../openjpa/meta/ValueMetaDataImpl.java | 46 +- .../apache/openjpa/meta/XMLClassMetaData.java | 19 + .../apache/openjpa/meta/XMLFieldMetaData.java | 19 + .../org/apache/openjpa/meta/XMLMetaData.java | 42 +- .../openjpa/util/AbstractChangeTracker.java | 8 + .../util/AbstractLRSProxyCollection.java | 34 ++ .../openjpa/util/AbstractLRSProxyMap.java | 48 +- .../apache/openjpa/util/ApplicationIds.java | 20 + .../apache/openjpa/util/ArrayStateImage.java | 1 - .../org/apache/openjpa/util/BigDecimalId.java | 6 + .../org/apache/openjpa/util/BigIntegerId.java | 6 + .../org/apache/openjpa/util/BooleanId.java | 3 + .../java/org/apache/openjpa/util/ByteId.java | 6 + .../org/apache/openjpa/util/CacheMap.java | 41 +- .../openjpa/util/CallbackException.java | 4 + .../apache/openjpa/util/ChangeTracker.java | 16 +- .../java/org/apache/openjpa/util/CharId.java | 6 + .../apache/openjpa/util/ClassResolver.java | 2 +- .../openjpa/util/ClassResolverImpl.java | 1 + .../openjpa/util/CollectionChangeTracker.java | 4 +- .../util/CollectionChangeTrackerImpl.java | 6 + .../java/org/apache/openjpa/util/DateId.java | 6 + .../openjpa/util/DelayedArrayListProxy.java | 26 + .../DelayedCollectionChangeTrackerImpl.java | 3 + .../openjpa/util/DelayedHashSetProxy.java | 12 + .../util/DelayedLinkedHashSetProxy.java | 12 + .../util/DelayedPriorityQueueProxy.java | 6 + .../openjpa/util/DelayedTreeSetProxy.java | 11 + .../openjpa/util/DelayedVectorProxy.java | 10 + .../org/apache/openjpa/util/DoubleId.java | 6 + .../apache/openjpa/util/ExceptionInfo.java | 30 +- .../org/apache/openjpa/util/Exceptions.java | 1 + .../java/org/apache/openjpa/util/FloatId.java | 6 + .../apache/openjpa/util/GeneralException.java | 4 + .../apache/openjpa/util/GeneratedClasses.java | 1 + .../main/java/org/apache/openjpa/util/Id.java | 6 + .../org/apache/openjpa/util/ImplHelper.java | 13 +- .../java/org/apache/openjpa/util/IntId.java | 6 + .../openjpa/util/InternalException.java | 4 + .../openjpa/util/InvalidStateException.java | 4 + .../apache/openjpa/util/LockException.java | 7 +- .../java/org/apache/openjpa/util/LongId.java | 6 + .../apache/openjpa/util/MapChangeTracker.java | 10 +- .../openjpa/util/MapChangeTrackerImpl.java | 8 + .../openjpa/util/MetaDataException.java | 4 + .../util/MultiLoaderClassResolver.java | 1 + .../openjpa/util/NoResultException.java | 4 + .../openjpa/util/NoTransactionException.java | 4 + .../util/NonUniqueResultException.java | 4 + .../openjpa/util/ObjectExistsException.java | 4 + .../org/apache/openjpa/util/ObjectId.java | 5 + .../openjpa/util/ObjectNotFoundException.java | 3 + .../apache/openjpa/util/OpenJPAException.java | 12 +- .../org/apache/openjpa/util/OpenJPAId.java | 9 +- .../openjpa/util/OptimisticException.java | 3 + .../java/org/apache/openjpa/util/Proxy.java | 10 +- .../org/apache/openjpa/util/ProxyBean.java | 2 +- .../apache/openjpa/util/ProxyCalendar.java | 2 +- .../apache/openjpa/util/ProxyCollection.java | 4 +- .../apache/openjpa/util/ProxyCollections.java | 18 +- .../org/apache/openjpa/util/ProxyDate.java | 2 +- .../org/apache/openjpa/util/ProxyManager.java | 24 +- .../apache/openjpa/util/ProxyManagerImpl.java | 23 +- .../org/apache/openjpa/util/ProxyMap.java | 6 +- .../org/apache/openjpa/util/ProxyMaps.java | 20 +- .../apache/openjpa/util/QueryException.java | 5 + .../util/ReferentialIntegrityException.java | 3 + .../util/RuntimeExceptionTranslator.java | 2 +- .../apache/openjpa/util/Serialization.java | 8 + .../java/org/apache/openjpa/util/ShortId.java | 6 + .../apache/openjpa/util/StoreException.java | 7 +- .../openjpa/util/StoreFacadeTypeRegistry.java | 4 +- .../org/apache/openjpa/util/StringId.java | 6 + .../openjpa/util/UnsupportedException.java | 4 + .../apache/openjpa/util/UserException.java | 3 + .../apache/openjpa/util/WrappedException.java | 2 +- .../openjpa/validation/AbstractValidator.java | 4 + .../ValidatingLifecycleEventManager.java | 5 +- .../validation/ValidationException.java | 2 +- .../ValidationUnavailableException.java | 2 +- .../apache/openjpa/validation/Validator.java | 8 +- .../openjpa/ee/TestOSGiManagedRuntime.java | 39 +- .../openjpa/ee/TestWASManagedRuntime.java | 4 +- .../openjpa/enhance/TestAsmAdaptor.java | 8 +- .../enhance/TestGetDeclaredMethod.java | 8 +- .../openjpa/meta/TestMemberProvider.java | 5 +- .../apache/openjpa/util/TestProxyManager.java | 30 +- .../apache/openjpa/util/TestResultShape.java | 38 +- .../custom/CustomProxyDefaultScopeList.java | 4 +- .../apache/openjpa/lib/ant/AbstractTask.java | 7 +- .../lib/conf/AbstractProductDerivation.java | 14 + .../apache/openjpa/lib/conf/BooleanValue.java | 5 + .../openjpa/lib/conf/BootstrapException.java | 2 + .../apache/openjpa/lib/conf/Configurable.java | 6 +- .../openjpa/lib/conf/Configuration.java | 68 +-- .../openjpa/lib/conf/ConfigurationImpl.java | 60 +- .../lib/conf/ConfigurationProvider.java | 8 +- .../openjpa/lib/conf/Configurations.java | 8 +- .../apache/openjpa/lib/conf/DoubleValue.java | 5 + .../apache/openjpa/lib/conf/FileValue.java | 5 + .../openjpa/lib/conf/GenericConfigurable.java | 2 +- .../org/apache/openjpa/lib/conf/IntValue.java | 5 + .../lib/conf/MapConfigurationProvider.java | 4 + .../apache/openjpa/lib/conf/ObjectValue.java | 6 +- .../openjpa/lib/conf/PluginListValue.java | 13 +- .../apache/openjpa/lib/conf/PluginValue.java | 9 + .../openjpa/lib/conf/ProductDerivation.java | 34 +- .../openjpa/lib/conf/ProductDerivations.java | 11 +- .../openjpa/lib/conf/StringListValue.java | 7 +- .../apache/openjpa/lib/conf/StringValue.java | 5 + .../org/apache/openjpa/lib/conf/Value.java | 10 +- .../openjpa/lib/conf/ValueListener.java | 2 +- .../lib/encryption/EncryptionProvider.java | 4 +- .../openjpa/lib/graph/BreadthFirstWalk.java | 6 +- .../openjpa/lib/graph/DepthFirstAnalysis.java | 15 +- .../org/apache/openjpa/lib/graph/Edge.java | 1 + .../org/apache/openjpa/lib/graph/Graph.java | 12 +- .../openjpa/lib/graph/GraphVisitor.java | 6 +- .../openjpa/lib/identifier/Identifier.java | 6 +- .../identifier/IdentifierConfiguration.java | 24 +- .../lib/identifier/IdentifierImpl.java | 8 + .../lib/identifier/IdentifierRule.java | 4 +- .../lib/identifier/IdentifierUtil.java | 108 ++-- .../lib/identifier/IdentifierUtilImpl.java | 50 +- .../instrumentation/AbstractInstrument.java | 12 + .../AbstractInstrumentationProvider.java | 25 +- .../lib/instrumentation/Instrument.java | 28 +- .../InstrumentationProvider.java | 40 +- .../lib/jdbc/AbstractJDBCListener.java | 12 + .../jdbc/ConfiguringConnectionDecorator.java | 8 + .../openjpa/lib/jdbc/ConnectionDecorator.java | 2 +- .../lib/jdbc/DecoratingDataSource.java | 4 +- .../lib/jdbc/DelegatingCallableStatement.java | 216 +++++++ .../lib/jdbc/DelegatingConnection.java | 56 ++ .../lib/jdbc/DelegatingDataSource.java | 13 + .../lib/jdbc/DelegatingDatabaseMetaData.java | 179 ++++++ .../lib/jdbc/DelegatingPreparedStatement.java | 103 ++++ .../openjpa/lib/jdbc/DelegatingResultSet.java | 193 ++++++ .../openjpa/lib/jdbc/DelegatingStatement.java | 47 ++ .../apache/openjpa/lib/jdbc/JDBCEvent.java | 2 +- .../jdbc/JDBCEventConnectionDecorator.java | 33 +- .../apache/openjpa/lib/jdbc/JDBCListener.java | 24 +- .../lib/jdbc/LoggingConnectionDecorator.java | 172 +++++- .../lib/jdbc/ReportingSQLException.java | 4 +- .../apache/openjpa/lib/jdbc/SQLFormatter.java | 2 +- .../apache/openjpa/lib/log/AbstractLog.java | 15 + .../openjpa/lib/log/CommonsLogFactory.java | 16 + .../java/org/apache/openjpa/lib/log/Log.java | 40 +- .../openjpa/lib/log/Log4JLogFactory.java | 16 + .../apache/openjpa/lib/log/LogFactory.java | 2 +- .../openjpa/lib/log/LogFactoryAdapter.java | 4 +- .../openjpa/lib/log/LogFactoryImpl.java | 13 +- .../openjpa/lib/log/LogOutputStream.java | 1 + .../openjpa/lib/log/MultiLogFactory.java | 21 +- .../openjpa/lib/log/NoneLogFactory.java | 16 + .../openjpa/lib/log/SLF4JLogFactory.java | 18 +- .../openjpa/lib/meta/CFMetaDataParser.java | 5 +- .../lib/meta/CFMetaDataSerializer.java | 6 +- .../meta/ClassAnnotationMetaDataFilter.java | 1 + .../openjpa/lib/meta/ClassArgParser.java | 11 +- .../lib/meta/ClassMetaDataIterator.java | 9 +- .../lib/meta/ClasspathMetaDataIterator.java | 1 - .../lib/meta/FileMetaDataIterator.java | 9 +- .../lib/meta/JarFileURLMetaDataIterator.java | 9 +- .../openjpa/lib/meta/MetaDataFilter.java | 8 +- .../openjpa/lib/meta/MetaDataIterator.java | 10 +- .../lib/meta/MetaDataIteratorChain.java | 9 +- .../openjpa/lib/meta/MetaDataParser.java | 18 +- .../openjpa/lib/meta/MetaDataSerializer.java | 16 +- .../lib/meta/ResourceMetaDataIterator.java | 7 +- .../openjpa/lib/meta/SourceTracker.java | 18 +- .../lib/meta/SuffixMetaDataFilter.java | 1 + .../openjpa/lib/meta/URLMetaDataIterator.java | 5 + .../openjpa/lib/meta/XMLMetaDataParser.java | 45 +- .../lib/meta/XMLMetaDataSerializer.java | 8 +- .../lib/meta/ZipFileMetaDataIterator.java | 7 + .../lib/meta/ZipStreamMetaDataIterator.java | 11 + .../openjpa/lib/rop/AbstractListIterator.java | 3 + .../rop/AbstractNonSequentialResultList.java | 20 + .../openjpa/lib/rop/AbstractResultList.java | 15 +- .../lib/rop/AbstractSequentialResultList.java | 14 + .../lib/rop/BatchedResultObjectProvider.java | 1 + .../openjpa/lib/rop/EagerResultList.java | 3 + .../lib/rop/LazyForwardResultList.java | 15 + .../openjpa/lib/rop/ListResultList.java | 19 + .../lib/rop/ListResultObjectProvider.java | 9 + .../lib/rop/MergedResultObjectProvider.java | 9 + .../lib/rop/RandomAccessResultList.java | 8 + .../lib/rop/RangeResultObjectProvider.java | 9 + .../apache/openjpa/lib/rop/ResultList.java | 10 +- .../openjpa/lib/rop/ResultListIterator.java | 6 + .../openjpa/lib/rop/ResultObjectProvider.java | 18 +- .../lib/rop/ResultObjectProviderIterator.java | 5 + .../openjpa/lib/rop/SimpleResultList.java | 5 + .../lib/rop/SoftRandomAccessResultList.java | 1 + .../openjpa/lib/rop/WindowResultList.java | 5 + .../openjpa/lib/util/BytecodeWriter.java | 2 +- .../apache/openjpa/lib/util/Clearable.java | 2 +- .../apache/openjpa/lib/util/Closeable.java | 2 +- .../apache/openjpa/lib/util/CodeFormat.java | 2 + .../apache/openjpa/lib/util/EventManager.java | 12 +- .../lib/util/FormatPreservingProperties.java | 23 + .../openjpa/lib/util/J2DoPrivHelper.java | 63 ++ .../org/apache/openjpa/lib/util/LRUMap.java | 10 + .../apache/openjpa/lib/util/Localizer.java | 6 +- .../openjpa/lib/util/MultiClassLoader.java | 9 +- .../org/apache/openjpa/lib/util/Options.java | 11 +- .../apache/openjpa/lib/util/OrderedMap.java | 18 +- .../openjpa/lib/util/ParameterTemplate.java | 1 + .../openjpa/lib/util/ParseException.java | 3 + .../openjpa/lib/util/ReferenceHashMap.java | 14 +- .../openjpa/lib/util/ReferenceHashSet.java | 22 + .../apache/openjpa/lib/util/ReferenceMap.java | 6 +- .../lib/util/ResourceBundleProvider.java | 2 +- .../util/SimpleResourceBundleProvider.java | 1 + .../org/apache/openjpa/lib/util/SizedMap.java | 8 +- .../util/StreamResourceBundleProvider.java | 1 + .../lib/util/TemporaryClassLoader.java | 2 + .../openjpa/lib/util/TypedProperties.java | 4 + .../lib/util/ZipResourceBundleProvider.java | 1 + .../AbstractConcurrentEventManager.java | 9 + .../util/concurrent/ConcurrentHashMap.java | 44 ++ .../lib/util/concurrent/ConcurrentMap.java | 4 +- .../ConcurrentReferenceHashMap.java | 79 ++- .../ConcurrentReferenceHashSet.java | 20 +- .../apache/openjpa/lib/xml/Commentable.java | 6 +- .../apache/openjpa/lib/xml/DocTypeReader.java | 9 + .../org/apache/openjpa/lib/xml/Location.java | 2 +- .../lib/xml/ValidatingErrorHandler.java | 3 + .../org/apache/openjpa/lib/xml/XMLWriter.java | 3 + .../TestConfigurationProviderPrefixes.java | 2 + .../apache/openjpa/lib/conf/TestValue.java | 5 + .../ConfigurationTestProductDerivation.java | 5 +- .../lib/conf/test/TestConfigurationImpl.java | 10 +- .../lib/graph/TestDepthFirstAnalysis.java | 1 + .../apache/openjpa/lib/graph/TestGraph.java | 1 + .../lib/identifier/DefaultTestIdRule.java | 2 - .../identifier/IdConfigurationTestImpl.java | 18 +- .../NewIdConfigurationTestImpl.java | 18 +- .../lib/identifier/TestIdentifiers.java | 3 - .../openjpa/lib/rop/ResultListTest.java | 1 + .../openjpa/lib/rop/TestEagerResultList.java | 1 + .../lib/rop/TestLazyForwardResultList.java | 1 + .../openjpa/lib/rop/TestListResultList.java | 1 + .../rop/TestMergedResultObjectProvider.java | 2 + ...TestOrderedMergedResultObjectProvider.java | 3 + .../lib/rop/TestRandomAccessResultList.java | 1 + .../rop/TestRangeResultObjectProvider.java | 2 + .../openjpa/lib/rop/TestSimpleResultList.java | 1 + .../rop/TestSoftRandomAccessResultList.java | 1 + .../openjpa/lib/rop/TestWindowResultList.java | 1 + .../openjpa/lib/test/AbstractTestCase.java | 19 +- .../lib/util/TestAbstractEventManager.java | 7 +- .../openjpa/lib/util/TestLocalizer.java | 7 +- .../lib/util/TestMultiClassLoader.java | 9 +- .../apache/openjpa/lib/util/TestOptions.java | 1 + .../lib/util/TestPropertiesParser.java | 3 +- .../openjpa/lib/util/TestReferenceSet.java | 1 + .../openjpa/lib/util/TestTypedProperties.java | 1 + .../openjpa/lib/util/TestUUIDGenerator.java | 2 + .../openjpa/lib/xml/TestDocTypeReader.java | 13 +- .../apache/openjpa/lib/xml/TestXMLWriter.java | 4 +- .../AnnotationPersistenceMappingParser.java | 125 +++- ...nnotationPersistenceMappingSerializer.java | 114 ++-- .../persistence/jdbc/ClassCriteria.java | 3 +- .../openjpa/persistence/jdbc/Columns.java | 4 +- .../persistence/jdbc/ContainerTable.java | 3 +- .../persistence/jdbc/DataStoreIdColumn.java | 3 +- .../jdbc/DiscriminatorStrategy.java | 3 +- .../persistence/jdbc/EagerFetchMode.java | 3 +- .../jdbc/ElementClassCriteria.java | 3 +- .../persistence/jdbc/ElementColumn.java | 3 +- .../persistence/jdbc/ElementColumns.java | 3 +- .../jdbc/ElementEmbeddedMapping.java | 3 +- .../persistence/jdbc/ElementForeignKey.java | 3 +- .../persistence/jdbc/ElementIndex.java | 3 +- .../persistence/jdbc/ElementJoinColumn.java | 3 +- .../persistence/jdbc/ElementJoinColumns.java | 3 +- .../jdbc/ElementNonpolymorphic.java | 3 +- .../persistence/jdbc/ElementStrategy.java | 3 +- .../persistence/jdbc/EmbeddedMapping.java | 3 +- .../openjpa/persistence/jdbc/FetchMode.java | 3 + .../openjpa/persistence/jdbc/ForeignKey.java | 7 +- .../openjpa/persistence/jdbc/Index.java | 3 +- .../persistence/jdbc/IsolationLevel.java | 7 +- .../persistence/jdbc/JDBCFetchPlan.java | 121 ++-- .../persistence/jdbc/JDBCFetchPlanImpl.java | 21 + .../JDBCPersistenceProductDerivation.java | 4 +- .../persistence/jdbc/KeyClassCriteria.java | 3 +- .../openjpa/persistence/jdbc/KeyColumn.java | 3 +- .../openjpa/persistence/jdbc/KeyColumns.java | 3 +- .../persistence/jdbc/KeyEmbeddedMapping.java | 3 +- .../persistence/jdbc/KeyForeignKey.java | 3 +- .../openjpa/persistence/jdbc/KeyIndex.java | 3 +- .../persistence/jdbc/KeyJoinColumn.java | 3 +- .../persistence/jdbc/KeyJoinColumns.java | 3 +- .../persistence/jdbc/KeyNonpolymorphic.java | 3 +- .../openjpa/persistence/jdbc/KeyStrategy.java | 3 +- .../persistence/jdbc/LRSSizeAlgorithm.java | 3 + .../persistence/jdbc/MappingOverride.java | 4 +- .../persistence/jdbc/MappingOverrides.java | 3 +- .../persistence/jdbc/Nonpolymorphic.java | 3 +- .../openjpa/persistence/jdbc/OrderColumn.java | 3 +- .../jdbc/PersistenceMappingDefaults.java | 5 +- .../jdbc/PersistenceMappingFactory.java | 6 +- .../persistence/jdbc/ResultSetType.java | 3 + .../openjpa/persistence/jdbc/Strategy.java | 7 +- .../persistence/jdbc/SubclassFetchMode.java | 3 +- .../openjpa/persistence/jdbc/Unique.java | 3 +- .../persistence/jdbc/VersionColumn.java | 3 +- .../persistence/jdbc/VersionColumns.java | 3 +- .../persistence/jdbc/VersionStrategy.java | 3 +- .../persistence/jdbc/XEmbeddedMapping.java | 3 +- .../openjpa/persistence/jdbc/XJoinColumn.java | 3 +- .../persistence/jdbc/XJoinColumns.java | 3 +- .../jdbc/XMLPersistenceMappingParser.java | 76 ++- .../jdbc/XMLPersistenceMappingSerializer.java | 28 +- .../persistence/jdbc/XMappingOverride.java | 4 +- .../persistence/jdbc/XMappingOverrides.java | 3 +- .../persistence/jdbc/XSecondaryTable.java | 4 +- .../persistence/jdbc/XSecondaryTables.java | 3 +- .../openjpa/persistence/jdbc/XTable.java | 3 +- .../apache/openjpa/audit/AuditedEntry.java | 2 + .../org/apache/openjpa/audit/TestAudit.java | 9 +- .../TestBeginEventOnTransactionListener.java | 10 +- .../test/java/org/apache/openjpa/audit/X.java | 3 +- .../openjpa/conf/TestAutoDetachProperty.java | 15 +- .../apache/openjpa/conf/TestBadJdbcUrl.java | 4 +- .../openjpa/conf/TestCacheMarshaller.java | 1 + .../conf/TestCacheMarshallerEndToEnd.java | 20 +- .../conf/TestDynamicConfiguration.java | 3 +- .../apache/openjpa/conf/TestGetProperty.java | 15 +- .../apache/openjpa/conf/TestQueryHints.java | 1 + .../openjpa/conf/TestQueryProperties.java | 2 +- .../enhance/AbstractUnenhancedClassTest.java | 25 +- .../openjpa/enhance/EnhancedSubClass.java | 3 +- .../openjpa/enhance/EnhancedSuperClass.java | 3 +- .../enhance/RestrictedMetaDataRepository.java | 5 +- .../TestClassHierarchyEnhancement.java | 4 +- .../TestEnhancementWithMultiplePUs.java | 7 +- ...tPCEnhancerEnhancementContractVersion.java | 3 +- .../enhance/TestRelationToUnlistedClass.java | 1 + .../enhance/TestSimpleUnenhancedQuery.java | 3 +- .../enhance/TestUnenhancedCompoundPK.java | 1 + .../TestUnenhancedCompoundPKSubclass.java | 1 + .../enhance/TestUnenhancedFieldAccess.java | 5 + ...UnenhancedFieldAccessPrimitiveWrapper.java | 5 + .../enhance/TestUnenhancedOneToMany.java | 1 + .../enhance/TestUnenhancedPropertyAccess.java | 5 + .../UnenhancedCompoundPKFieldAccess.java | 5 +- ...hancedCompoundPKFieldAccessSuperclass.java | 3 + .../UnenhancedCompoundPKPropertyAccess.java | 5 +- .../enhance/UnenhancedFieldAccess.java | 18 +- ...UnenhancedFieldAccessPrimitiveWrapper.java | 10 + ...edFieldAccessPrimitiveWrapperSubclass.java | 7 + .../UnenhancedFieldAccessSubclass.java | 11 +- .../openjpa/enhance/UnenhancedMany.java | 6 +- .../apache/openjpa/enhance/UnenhancedOne.java | 12 +- .../enhance/UnenhancedPropertyAccess.java | 20 +- .../UnenhancedPropertyAccessSubclass.java | 11 +- .../openjpa/event/TestLifecycleListener.java | 3 +- .../event/TestSJVMRemoteCommitProvider.java | 13 +- .../BrokerLevelInstrument.java | 3 + .../openjpa/instrumentation/DCInstrument.java | 3 + .../instrumentation/DynamicProvider.java | 4 + .../openjpa/instrumentation/QCInstrument.java | 3 + .../instrumentation/QSCInstrument.java | 2 + .../instrumentation/SecondProvider.java | 4 + .../instrumentation/SimpleProvider.java | 4 + .../TestInstrumentationProvider.java | 1 + .../org/apache/openjpa/jdbc/kernel/A.java | 16 +- .../apache/openjpa/jdbc/kernel/EntityD.java | 8 +- .../apache/openjpa/jdbc/kernel/EntityF.java | 5 +- .../openjpa/jdbc/kernel/M2MBiDepartment.java | 2 +- .../openjpa/jdbc/kernel/M2MBiEmployee.java | 2 +- .../jdbc/kernel/TestCollectionTracking.java | 8 +- .../kernel/TestForeignKeyCountViolation.java | 9 +- .../openjpa/jdbc/kernel/TestInsertOrder.java | 5 +- .../jdbc/kernel/TestM21UniVersion.java | 1 + .../openjpa/jdbc/kernel/TestM2MBiVersion.java | 1 + .../kernel/TestNoForeignKeyViolation.java | 4 +- .../apache/openjpa/jdbc/meta/EntityBool.java | 4 +- .../openjpa/jdbc/meta/TestBooleanValue.java | 7 +- .../openjpa/jdbc/meta/TestCalendarField.java | 1 + .../jdbc/meta/TestMappingToolAutoDelete.java | 4 +- .../jdbc/meta/TestMappingToolRefresh.java | 1 - .../jdbc/meta/TestMappingToolTemporal.java | 3 +- .../jdbc/meta/strats/AbstractLobTest.java | 3 +- .../meta/strats/InputStreamLobEntity.java | 5 + .../jdbc/meta/strats/InputStreamWrapper.java | 5 + .../openjpa/jdbc/meta/strats/LobEntity.java | 8 +- .../jdbc/meta/strats/ReaderLobEntity.java | 5 + .../jdbc/meta/strats/ReaderWrapper.java | 2 + .../jdbc/meta/strats/TestInputStreamLob.java | 6 + .../jdbc/meta/strats/TestReaderLob.java | 6 + .../jdbc/oracle/TestOracleXmlColumn.java | 1 + .../jdbc/persistence/classcriteria/Book.java | 7 +- .../jdbc/persistence/classcriteria/Item.java | 2 + .../jdbc/persistence/classcriteria/Movie.java | 7 +- .../classcriteria/TestQuerySubclass.java | 2 + .../jdbc/procedure/TestStoredProcedure.java | 11 +- .../jdbc/procedure/derby/Procedures.java | 4 +- .../entity/EntityWithStoredProcedure.java | 6 +- .../openjpa/jira1100/TestBadVersionField.java | 1 + .../apache/openjpa/jta/JTAManagedRuntime.java | 5 + .../apache/openjpa/jta/SimpleTransaction.java | 14 +- .../openjpa/jta/SimpleTransactionManager.java | 11 +- .../AbstractBrokerSerializationTest.java | 6 + .../org/apache/openjpa/kernel/TestBroker.java | 1 + .../kernel/TestBrokerFactoryEventManager.java | 8 +- .../TestBrokerFactoryListenerRegistry.java | 6 +- .../kernel/TestDynamicClassRegistration.java | 4 +- ...stEnhancedInstanceBrokerSerialization.java | 4 + .../kernel/TestEntityManagerFactoryPool.java | 2 + .../TestInstanceGraphBrokerSerialization.java | 4 + .../kernel/TestQueryCompilationCache.java | 2 +- ...ieldAccessInstanceBrokerSerialization.java | 4 + ...thRelationInstanceBrokerSerialization.java | 5 + ...ertyAccessInstanceBrokerSerialization.java | 4 + ...thRelationInstanceBrokerSerialization.java | 5 + .../openjpa/lib/conf/TestAnchorParsing.java | 13 +- .../apache/openjpa/meta/AbstractThing.java | 6 +- .../java/org/apache/openjpa/meta/Artist.java | 4 +- .../test/java/org/apache/openjpa/meta/B.java | 3 +- .../test/java/org/apache/openjpa/meta/C.java | 4 +- .../java/org/apache/openjpa/meta/Item.java | 3 + .../java/org/apache/openjpa/meta/Painter.java | 3 + .../java/org/apache/openjpa/meta/Person.java | 4 + .../apache/openjpa/meta/TestGetMetaData.java | 1 + .../TestMetaDataInheritanceComparator.java | 3 +- .../openjpa/meta/TestSecondaryTable.java | 1 + .../openjpa/openjpa2018/OpenJPA2018Test.java | 9 +- .../apache/openjpa/persistence/Country.java | 5 +- .../persistence/DummyPersistenceCapeable.java | 27 + .../org/apache/openjpa/persistence/Embed.java | 2 +- .../apache/openjpa/persistence/Security.java | 9 +- .../persistence/TestMixedMappingLocation.java | 2 + .../openjpa/persistence/TestOpenJPA2330.java | 8 +- .../TestOpenjpaIdNotRecognizedMessage.java | 1 + .../openjpa/persistence/TestUnwrap.java | 2 +- .../TestXMLPersistenceMetaDataParser.java | 21 +- .../access/AbstractMappedSuperField.java | 3 +- .../access/AbstractMappedSuperProperty.java | 3 +- .../access/DefFieldMixedPropAccess.java | 7 +- .../access/DefPropMixedFieldAccess.java | 7 +- .../persistence/access/EmbedFieldAccess.java | 1 + .../openjpa/persistence/access/EmbedId.java | 2 + .../persistence/access/EmbedInnerProp.java | 1 + .../persistence/access/EmbedMixedAccess.java | 1 + .../persistence/access/EmbedOuterField.java | 1 + .../persistence/access/EmbedPropAccess.java | 1 + .../persistence/access/FieldAccess.java | 5 +- .../access/FieldAccessPropStratsEntity.java | 2 +- .../persistence/access/FieldEmbedEntity.java | 1 + .../openjpa/persistence/access/FieldSub.java | 1 + .../openjpa/persistence/access/FieldSub2.java | 1 + .../openjpa/persistence/access/FieldSub3.java | 1 + .../persistence/access/MappedSuperField.java | 1 + .../access/MappedSuperProperty.java | 1 + .../persistence/access/MixedFieldSub.java | 1 + .../persistence/access/MixedMappedSuper.java | 1 + .../access/MixedMultEmbedEntity.java | 1 + .../access/MixedNestedEmbedEntity.java | 1 + .../persistence/access/PropAccess.java | 5 +- .../access/PropAccessFieldStratsEntity.java | 2 +- .../persistence/access/PropEmbedEntity.java | 1 + .../persistence/access/PropMixedEntity.java | 1 + .../persistence/access/PropertySub.java | 1 + .../persistence/access/PropertySub2.java | 1 + .../persistence/access/PropertySub3.java | 1 + .../persistence/access/SuperFieldEntity.java | 1 + .../access/SuperPropertyEntity.java | 1 + .../persistence/access/TestDefaultAccess.java | 1 + .../access/TestExplicitAccess.java | 11 +- .../TestPropertyAccessCapitalization.java | 1 + .../access/xml/TestXMLExplicitAccess.java | 2 + .../xml/XMLAbstractMappedSuperField.java | 1 + .../xml/XMLAbstractMappedSuperProperty.java | 1 + .../xml/XMLDefFieldMixedPropAccess.java | 1 + .../xml/XMLDefFieldMixedPropAccess2.java | 1 + .../xml/XMLDefPropMixedFieldAccess.java | 1 + .../xml/XMLDefPropMixedFieldAccess2.java | 1 + .../access/xml/XMLEmbedFieldAccess.java | 1 + .../access/xml/XMLEmbedMixedAccess.java | 1 + .../access/xml/XMLEmbedPropAccess.java | 1 + .../access/xml/XMLFieldAccess.java | 1 + .../access/xml/XMLFieldAccess2.java | 1 + .../access/xml/XMLFieldEmbedEntity.java | 1 + .../persistence/access/xml/XMLFieldSub.java | 1 + .../persistence/access/xml/XMLFieldSub2.java | 1 + .../persistence/access/xml/XMLFieldSub3.java | 1 + .../access/xml/XMLMappedSuperField.java | 1 + .../access/xml/XMLMappedSuperProperty.java | 1 + .../access/xml/XMLMixedFieldSub.java | 1 + .../access/xml/XMLMixedMappedSuper.java | 1 + .../persistence/access/xml/XMLPropAccess.java | 1 + .../access/xml/XMLPropAccess2.java | 1 + .../access/xml/XMLPropEmbedEntity.java | 1 + .../access/xml/XMLPropMixedEntity.java | 1 + .../access/xml/XMLPropertySub.java | 1 + .../access/xml/XMLPropertySub2.java | 1 + .../access/xml/XMLPropertySub3.java | 1 + .../access/xml/XMLSuperFieldEntity.java | 1 + .../access/xml/XMLSuperPropertyEntity.java | 1 + .../annotations/PColl_EntityA.java | 3 +- .../annotations/PColl_EntityA1.java | 3 +- .../annotations/PColl_EntityC.java | 1 + .../annotations/PColl_EntityStringEager.java | 2 +- .../annotations/PColl_EntityStringLazy.java | 2 +- .../persistence/annotations/TestAdvAnnot.java | 9 +- .../annotations/TestAnnotationBasics.java | 7 +- .../annotations/TestDDCallbackMethods.java | 13 +- .../annotations/TestEJBEmbedded.java | 6 +- .../annotations/TestEmbeddableSuperclass.java | 6 +- .../annotations/TestEmbeddedId.java | 10 +- .../annotations/TestEntityListenerAnnot.java | 11 +- .../annotations/TestEntityOrderBy.java | 7 +- .../annotations/TestEnumerated.java | 10 +- .../annotations/TestFlatInheritance.java | 6 +- .../annotations/TestGenerators.java | 7 +- .../annotations/TestJoinedInheritance.java | 7 +- .../annotations/TestManyToMany.java | 8 +- .../persistence/annotations/TestMapKey.java | 9 +- .../annotations/TestMappedSuperClass.java | 5 +- .../annotations/TestOneToMany.java | 8 +- .../persistence/annotations/TestOneToOne.java | 6 +- .../annotations/TestPersistentCollection.java | 1 + .../annotations/TestPropertyAccess.java | 6 +- .../annotations/TestSerializedLobs.java | 9 +- .../TestTablePerClassInheritance.java | 6 +- .../persistence/annotations/TestVersion.java | 21 +- .../apps/annotApp/annotype/AnnoTest1.java | 33 +- .../apps/annotApp/annotype/AnnoTest2.java | 27 +- .../apps/annotApp/annotype/AnnoTest3.java | 10 +- .../annotApp/annotype/CallbackStorage.java | 6 +- .../annotApp/annotype/ContractEmployee.java | 5 +- .../apps/annotApp/annotype/DateValidator.java | 3 +- .../annotype/DefaultCallbackListener.java | 6 +- .../apps/annotApp/annotype/EmbedOwner.java | 13 +- .../apps/annotApp/annotype/EmbedValue.java | 7 +- .../apps/annotApp/annotype/EmbedValue2.java | 4 +- .../annotApp/annotype/EmbeddableSuper.java | 8 +- .../annotApp/annotype/EmbeddableSuperSub.java | 7 +- .../annotApp/annotype/EmbeddedIdClass.java | 7 +- .../annotApp/annotype/EmbeddedIdEntity.java | 11 +- .../apps/annotApp/annotype/Employee.java | 19 +- .../apps/annotApp/annotype/Entity1.java | 3 +- .../apps/annotApp/annotype/Entity2.java | 7 +- .../common/apps/annotApp/annotype/Flat1.java | 9 +- .../common/apps/annotApp/annotype/Flat2.java | 3 +- .../annotApp/annotype/FlightSchedule.java | 11 +- .../apps/annotApp/annotype/Generator.java | 13 +- .../annotApp/annotype/LongNameValidator.java | 3 +- .../apps/annotApp/annotype/NameValidator.java | 5 +- .../apps/annotApp/annotype/NamedEntity.java | 2 +- .../apps/annotApp/annotype/OrderByEntity.java | 12 +- .../apps/annotApp/annotype/PartyId.java | 2 + .../annotApp/annotype/PropertyAccess1.java | 3 +- .../apps/annotApp/annotype/Schedule.java | 17 +- .../common/apps/annotApp/annotype/Site.java | 5 +- .../common/apps/annotApp/annotype/Site1.java | 4 +- .../annotApp/annotype/StringValidator.java | 3 +- .../annotApp/annotype/TablePerClass1.java | 10 +- .../annotApp/annotype/TablePerClass2.java | 3 +- .../annotApp/annotype/TxRollbackEntity.java | 2 +- .../apps/annotApp/ddtype/CallbackStorage.java | 6 +- .../annotApp/ddtype/ContractEmployee.java | 5 +- .../apps/annotApp/ddtype/DateValidator.java | 3 +- .../ddtype/DefaultCallbackListener.java | 3 - .../common/apps/annotApp/ddtype/Employee.java | 19 +- .../common/apps/annotApp/ddtype/Entity1.java | 3 +- .../common/apps/annotApp/ddtype/Entity2.java | 7 +- .../annotApp/ddtype/EntityDDListener.java | 3 - .../annotApp/ddtype/EntityDDListener2.java | 3 - .../apps/annotApp/ddtype/FlightSchedule.java | 9 +- .../annotApp/ddtype/LifeCycleDDEntity.java | 9 +- .../annotApp/ddtype/LifeCycleDDEntity2.java | 3 - .../annotApp/ddtype/LifeCycleDDEntitySub.java | 13 +- .../annotApp/ddtype/LongNameValidator.java | 3 +- .../apps/annotApp/ddtype/NameValidator.java | 5 +- .../apps/annotApp/ddtype/NamedEntity.java | 2 +- .../common/apps/annotApp/ddtype/Schedule.java | 16 +- .../apps/annotApp/ddtype/StringValidator.java | 3 +- .../annotApp/ddtype/TxRollbackEntity.java | 2 +- .../annotations/xml/TestMetaDataComplete.java | 9 +- .../arrays/TestAnnoExceptionEntity.java | 1 + .../persistence/batch/exception/Ent1.java | 1 + .../exception/TestBatchLimitException.java | 1 + .../openjpa/persistence/blob/TestBlobs.java | 1 + .../blob/mysql/TestBlobColumnType.java | 1 + .../cache/jpa/AbstractCacheModeTestCase.java | 6 +- .../cache/jpa/TestCacheModeAll.java | 4 +- .../TestCacheModeAllDataCacheCustomized.java | 2 +- .../jpa/TestCacheModeAllDataCacheTrue.java | 2 +- .../jpa/TestCacheModeDisableSelective.java | 4 +- .../cache/jpa/TestCacheModeEmpty.java | 4 +- ...tCacheModeEnableSelectedDataCacheTrue.java | 2 +- .../jpa/TestCacheModeEnableSelective.java | 4 +- .../cache/jpa/TestCacheModeNone.java | 4 +- .../TestCacheModeNoneDataCacheCustomized.java | 2 +- .../jpa/TestCacheModeNoneDataCacheTrue.java | 2 +- .../cache/jpa/TestCacheModeUnspecified.java | 4 +- ...TestCacheModeUnspecifiedDataCacheTrue.java | 6 +- .../cache/jpa/TestMultiEMFCacheModes.java | 6 +- .../cache/jpa/TestPropertyCacheModeAll.java | 6 +- ...TestPropertyCacheModeDisableSelective.java | 6 +- .../TestPropertyCacheModeEnableSelective.java | 6 +- .../jpa/TestPropertyCacheModeInvalid.java | 2 +- .../cache/jpa/TestPropertyCacheModeNone.java | 6 +- .../jpa/TestPropertyCacheModeUnspecified.java | 6 +- .../cache/jpa/model/CacheEntity.java | 6 +- .../cache/jpa/model/CacheableEntity.java | 3 + .../jpa/model/NegatedCachableEntity.java | 3 + .../jpa/model/NegatedUncacheableEntity.java | 3 + .../cache/jpa/model/UncacheableEntity.java | 3 + .../cache/jpa/model/UnspecifiedEntity.java | 3 + .../cache/jpa/model/XmlCacheableEntity.java | 3 + .../cache/jpa/model/XmlUncacheableEntity.java | 3 + .../callbacks/AddListenerEntity.java | 2 +- .../callbacks/DuplicateListenerEntity.java | 7 +- .../callbacks/EntityListenerEntity.java | 7 +- .../callbacks/EntityListenerPostLoadTest.java | 1 + .../ExceptionsFromCallbacksEntity.java | 15 +- .../callbacks/GlobalListenerEntity.java | 5 +- .../persistence/callbacks/ListenerImpl.java | 10 +- .../callbacks/ListenerInEntity.java | 2 +- .../callbacks/ListenerTestEntity.java | 6 +- .../callbacks/MSCListenerEntity.java | 5 +- .../callbacks/MessageListenerImpl.java | 10 +- .../callbacks/PostLoadListenerEntity.java | 4 +- .../callbacks/TestEntityListeners.java | 3 +- .../TestExceptionsFromCallbacks.java | 5 +- .../callbacks/TestMSCEntityListeners.java | 3 +- .../callbacks/TestMessageListeners.java | 3 +- .../callbacks/TestMultiEmEntityListeners.java | 1 + .../openjpa/persistence/cascade/Vertex.java | 4 +- .../persistence/cascade/VertexType.java | 2 +- .../EmbeddableWithRelationships.java | 4 +- .../cascade/pudefault/PUDEntityA01.java | 4 +- .../cascade/pudefault/PUDEntityAE01.java | 4 +- .../TestNoPUDefaultCascadePersist.java | 1 + .../TestPUDefaultCascadePersist.java | 3 + .../persistence/common/apps/Address.java | 8 +- .../common/apps/ComplexEmbeddedPC.java | 8 +- .../persistence/common/apps/Course.java | 8 +- .../persistence/common/apps/Department.java | 11 +- .../common/apps/EmbeddedOwnerPC.java | 4 +- .../persistence/common/apps/EmbeddedPC.java | 4 +- .../persistence/common/apps/Entity1.java | 3 +- .../persistence/common/apps/Entity2.java | 7 +- .../persistence/common/apps/MaleUser.java | 3 +- .../openjpa/persistence/common/apps/Part.java | 4 + .../persistence/common/apps/PartPK.java | 4 + .../persistence/common/apps/RuntimeTest1.java | 9 +- .../persistence/common/apps/RuntimeTest2.java | 3 +- .../persistence/common/apps/Shirt.java | 5 +- .../persistence/common/apps/Student.java | 9 +- .../persistence/common/apps/Textile.java | 7 +- .../persistence/common/apps/TextilePK.java | 3 + .../persistence/common/apps/Trousers.java | 6 +- .../common/utils/AbstractTestCase.java | 31 +- .../common/utils/BufferedLogFactory.java | 14 +- .../openjpa/persistence/common/utils/Bug.java | 10 +- .../persistence/compat/Bi_1To1_JT.java | 9 +- .../persistence/compat/Bi_1ToM_FK.java | 8 +- .../persistence/compat/Bi_1ToM_JT.java | 8 +- .../persistence/compat/Bi_1ToM_Map_JT.java | 8 +- .../compat/Bi_1ToM_Map_RelKey_JT.java | 8 +- .../persistence/compat/Department.java | 4 +- .../persistence/compat/DepartmentId.java | 4 + .../persistence/compat/EmbeddableSuper.java | 8 +- .../compat/EmbeddableSuperSub.java | 7 +- .../persistence/compat/EmployeeId.java | 4 + .../openjpa/persistence/compat/EntityC.java | 2 + .../persistence/compat/EntityC_B11JT.java | 7 +- .../persistence/compat/EntityC_B1MFK.java | 6 +- .../persistence/compat/EntityC_B1MJT.java | 7 +- .../compat/EntityC_B1M_Map_JT.java | 10 +- .../compat/EntityC_B1M_Map_RelKey_JT.java | 10 +- .../persistence/compat/EntityC_U11JT.java | 6 +- .../persistence/compat/EntityC_U1MFK.java | 5 +- .../compat/EntityC_U1M_Map_FK.java | 7 +- .../compat/EntityC_U1M_Map_RelKey_FK.java | 8 +- .../openjpa/persistence/compat/Invoice.java | 8 +- .../openjpa/persistence/compat/LineItem.java | 4 +- .../persistence/compat/SimpleEntity.java | 3 + ...TestContainerSpecCompatibilityOptions.java | 36 +- .../persistence/compat/TestDupNamedQuery.java | 5 +- .../compat/TestEmbeddableSuperclass.java | 1 + .../compat/TestMessageListener.java | 5 +- .../persistence/compat/TestMethodQLQuery.java | 6 +- .../TestNonPrimaryKeyQueryParameters.java | 1 + .../persistence/compat/TestQuerySQLCache.java | 6 +- .../compat/TestSpecCompatibilityOptions.java | 36 +- .../persistence/compat/Uni_1To1_JT.java | 9 +- .../persistence/compat/Uni_1ToM_FK.java | 9 +- .../persistence/compat/Uni_1ToM_JT.java | 10 +- .../persistence/compat/Uni_1ToM_Map_FK.java | 10 +- .../compat/Uni_1ToM_Map_RelKey_FK.java | 10 +- .../persistence/compat/Uni_MTo1_JT.java | 9 +- .../conf/TestOpenJPAConfiguration.java | 6 +- .../conf/TestOverrideNonJtaDataSource.java | 4 +- .../conf/TestSwitchConnection.java | 3 +- .../criteria/AbstractCriteriaTestCase.java | 8 +- .../persistence/criteria/CompUser.java | 17 +- .../persistence/criteria/CompUser_.java | 1 + .../persistence/criteria/CriteriaTest.java | 3 + .../persistence/criteria/Customer.java | 4 +- .../persistence/criteria/Customer_.java | 1 + .../persistence/criteria/DependentId_.java | 1 + .../persistence/criteria/Dependent_.java | 1 + .../criteria/EmbeddableDomainTestCase.java | 3 + .../openjpa/persistence/criteria/Exempt_.java | 1 + .../criteria/JoinDomainTestCase.java | 3 + .../persistence/criteria/Magazine.java | 8 +- .../persistence/criteria/Magazine_.java | 1 + .../persistence/criteria/MaleUser.java | 3 +- .../persistence/criteria/Manager_.java | 1 + .../openjpa/persistence/criteria/Movie.java | 5 +- .../openjpa/persistence/criteria/Order_.java | 1 + .../openjpa/persistence/criteria/Phone.java | 2 +- .../openjpa/persistence/criteria/Product.java | 7 +- .../persistence/criteria/Publisher.java | 6 +- .../openjpa/persistence/criteria/Request.java | 5 +- .../criteria/StringComparison.java | 2 +- .../openjpa/persistence/criteria/Student.java | 2 +- .../persistence/criteria/TestByteArray.java | 1 + .../persistence/criteria/TestCriteria.java | 1 + .../criteria/TestDateStringConversion.java | 1 + .../criteria/TestDistinctCriteria.java | 3 +- .../persistence/criteria/TestEdit.java | 6 + .../criteria/TestEmbeddableCriteria.java | 16 + .../criteria/TestJPQLSubquery.java | 1 + .../TestMetaModelTypesafeCriteria.java | 1 + .../criteria/TestQueryByExample.java | 1 + .../criteria/TestStringCriteria.java | 2 +- .../criteria/TestTypeSafeCondExpression.java | 7 +- .../criteria/TestTypesafeCriteria.java | 38 +- .../criteria/TransactionHistory_.java | 1 + .../persistence/criteria/VideoStore.java | 2 +- .../criteria/init/MyUserEntity.java | 2 +- .../criteria/multiselect/DimDay_.java | 4 +- .../multiselect/FactWorkAssignment_.java | 6 +- .../TestCriteriaMultiselectAliasing.java | 6 +- .../persistence/criteria/results/Item.java | 8 +- .../criteria/results/OrderProducer.java | 1 + .../criteria/results/Producer.java | 2 +- .../criteria/results/Producer_.java | 2 +- .../criteria/results/ShipRate.java | 7 +- .../persistence/criteria/results/Shop.java | 4 +- .../criteria/results/TestTypedResults.java | 4 +- .../persistence/datacache/CacheLoadTest.java | 6 +- .../persistence/datacache/CacheTest.java | 61 +- .../datacache/CacheTestBroker.java | 11 + .../datacache/CacheTestHelper.java | 14 +- .../datacache/CachedEntityStatistics.java | 5 +- .../datacache/DistributedCacheTest.java | 2 + .../datacache/OptimisticLockInstance.java | 5 +- .../datacache/OrderedOneManyChild.java | 2 +- .../datacache/OrderedOneManyParent.java | 2 +- .../datacache/TestArrayFieldsInDataCache.java | 4 +- .../datacache/TestBulkJPQLAndDataCache.java | 1 + .../TestBulkUpdatesAndVersionColumn.java | 7 +- .../TestBulkUpdatesDataCacheEviction.java | 1 + .../datacache/TestCacheExclusions.java | 3 +- .../datacache/TestClearableScheduler.java | 13 +- .../datacache/TestConcurrentDataCache.java | 2 + .../TestDataCacheBehavesIdentical.java | 6 +- .../TestDataCacheOptimisticLockRecovery.java | 16 +- .../TestDataCachePCDataGenerator.java | 2 + .../datacache/TestDataCacheStoreLazyFk.java | 3 +- .../datacache/TestDataCacheStoreManager.java | 2 + .../TestDistributedKodoDataCache.java | 24 +- .../datacache/TestEntitiesAsKeys.java | 2 +- .../datacache/TestFlushDataCache.java | 5 +- .../persistence/datacache/TestJPACache.java | 1 + .../datacache/TestJPAEmbeddableDataCache.java | 1 + .../datacache/TestJPQL2Queries.java | 12 +- .../TestJPQL2ResultsAndResultClasses.java | 19 +- .../TestJPQLRelationProjections.java | 19 +- .../persistence/datacache/TestLRUCache.java | 4 +- .../persistence/datacache/TestLocalCache.java | 2 + .../datacache/TestM2MInDataCache.java | 1 + .../datacache/TestMutableParameters.java | 13 +- .../datacache/TestOrderbyInDataCache.java | 1 + .../datacache/TestPCParametersInQueries.java | 14 +- .../datacache/TestPartitionedDataCache.java | 5 + .../datacache/TestQueryResultSize.java | 1 + .../datacache/TestQueryResultTypes.java | 9 +- .../datacache/TestResultShapes.java | 32 +- .../persistence/datacache/TestSJVMCache.java | 2 + .../persistence/datacache/TestStatistics.java | 5 +- .../datacache/TestUniteratedQueryResult.java | 10 +- .../datacache/common/apps/AttachA.java | 3 + .../datacache/common/apps/AttachB.java | 3 + .../datacache/common/apps/AttachC.java | 3 + .../datacache/common/apps/AttachD.java | 4 + .../datacache/common/apps/AttachE.java | 4 + .../datacache/common/apps/AttachF.java | 6 + .../datacache/common/apps/CacheObjectA.java | 2 + .../datacache/common/apps/CacheObjectC.java | 2 + .../common/apps/CacheObjectInterface.java | 4 +- .../common/apps/EmbeddingOwnerEntity.java | 2 +- .../datacache/common/apps/M2MEntityE.java | 14 +- .../datacache/common/apps/M2MEntityF.java | 14 +- .../datacache/common/apps/RuntimeTest1.java | 6 +- .../datacache/common/apps/RuntimeTest2.java | 2 + .../datacache/stats/TestStatistics.java | 3 +- .../delimited/identifiers/EntityA.java | 8 +- .../delimited/identifiers/EntityC.java | 6 +- .../delimited/identifiers/EntityD.java | 2 +- .../delimited/identifiers/EntityF.java | 8 +- .../delimited/identifiers/EntityH.java | 6 +- .../delimited/identifiers/EntityI.java | 2 +- .../identifiers/TestDelimitedIdentifiers.java | 1 + .../identifiers/noschema/EntityC.java | 6 +- .../identifiers/noschema/EntityD.java | 2 +- .../identifiers/noschema/EntityF.java | 8 +- .../delimited/identifiers/xml/EntityA.java | 4 +- .../delimited/identifiers/xml/EntityH.java | 6 +- .../delimited/identifiers/xml/EntityI.java | 2 +- .../xml/TestXmlDelimitedIdentifiers.java | 1 + .../derivedid/TestDerivedIdentity.java | 1 + .../openjpa/persistence/detach/Entity10.java | 4 +- .../persistence/detach/IntVersionEntity.java | 2 + .../persistence/detach/TestDetachCascade.java | 7 +- .../detach/TestDetachNoCascade.java | 3 +- .../persistence/detach/TestDetachNoProxy.java | 9 +- .../detach/TestDetachReloadProp.java | 1 + .../detach/TestDetachStateCascade.java | 5 +- .../SerializableDetachedStateManager.java | 4 +- .../TestSerializableDetachedStateManager.java | 1 + .../persistence/detach/xml/TestDetachXML.java | 6 +- .../detachment/DetachmentOneManyParent.java | 12 +- .../detachment/TestAttachConstructedCopy.java | 4 +- .../detachment/TestAttachWithNoChanges.java | 4 +- .../detachment/TestCascadeMerge.java | 3 +- .../persistence/detachment/TestDetach.java | 3 +- .../detachment/TestDetachLite.java | 1 + .../TestDetachedEntityCascadePersist.java | 1 + .../detachment/TestDetachment.java | 1 + .../detachment/TestDetachmentOneMany.java | 6 +- ...TestGetReferenceAndImplicitDetachment.java | 1 + .../TestNoCascadeOneToManyMerge.java | 10 +- .../TestNoCascadeOneToOneMerge.java | 10 +- .../detachment/model/DMCustomer.java | 2 +- .../detachment/model/DMCustomerInventory.java | 5 +- .../persistence/detachment/model/SimpleA.java | 13 +- .../persistence/detachment/model/SimpleB.java | 14 +- .../persistence/detachment/model/SimpleC.java | 8 +- .../detachment/model/SimpleRef.java | 5 +- .../discriminator/TestDiscriminatorTypes.java | 2 + .../persistence/distinctjoin/Course.java | 12 +- .../persistence/distinctjoin/Lecturer.java | 7 +- .../distinctjoin/TestDistinctJoin.java | 9 +- .../dynamicschema/EntityReservedWords.java | 4 +- .../dynamicschema/EntityVeryLongNames.java | 3 + .../dynamicschema/TestDynamicSchemas.java | 1 + .../dynamicschema/TestResWordEntity.java | 3 + .../apache/openjpa/persistence/embed/A.java | 15 +- .../openjpa/persistence/embed/Address.java | 4 +- .../openjpa/persistence/embed/BaseEntity.java | 4 +- .../openjpa/persistence/embed/Book.java | 11 +- .../openjpa/persistence/embed/Company1.java | 6 +- .../openjpa/persistence/embed/Company2.java | 7 +- .../openjpa/persistence/embed/CompanyXml.java | 2 +- .../persistence/embed/ContactInfo.java | 11 +- .../persistence/embed/CustomerXml.java | 3 +- .../persistence/embed/Department1.java | 8 +- .../persistence/embed/Department2.java | 7 +- .../persistence/embed/Department3.java | 2 +- .../persistence/embed/DepartmentXml.java | 2 +- .../persistence/embed/Embed_Coll_Embed.java | 7 +- .../persistence/embed/Embed_Coll_Integer.java | 5 +- .../persistence/embed/Embed_Coll_Map.java | 2 +- .../persistence/embed/Embed_ToMany.java | 2 +- .../openjpa/persistence/embed/Employee.java | 9 +- .../openjpa/persistence/embed/Employee1.java | 5 +- .../openjpa/persistence/embed/Employee2.java | 5 +- .../openjpa/persistence/embed/Employee3.java | 6 +- .../persistence/embed/EmployeeName3.java | 2 + .../persistence/embed/EmployeePK2.java | 6 +- .../persistence/embed/EmployeePK2_.java | 1 + .../embed/EntityA_Coll_Embed_Embed.java | 8 +- .../embed/EntityA_Coll_Embed_EmbedXml.java | 5 +- .../embed/EntityA_Coll_Embed_ToOne.java | 10 +- .../embed/EntityA_Coll_String.java | 18 +- .../embed/EntityA_Coll_StringXml.java | 5 +- .../persistence/embed/EntityA_Embed.java | 3 + .../embed/EntityA_Embed_Coll_Embed.java | 3 + .../embed/EntityA_Embed_Coll_Integer.java | 3 + .../embed/EntityA_Embed_Coll_Map.java | 3 + .../embed/EntityA_Embed_Complex.java | 22 +- .../embed/EntityA_Embed_Embed.java | 3 + .../embed/EntityA_Embed_Embed_ToMany.java | 3 + .../embed/EntityA_Embed_MappedToOne.java | 3 + ...ntityA_Embed_MappedToOneCascadeDelete.java | 3 + .../embed/EntityA_Embed_Single_Coll.java | 3 + .../embed/EntityA_Embed_ToMany.java | 3 + .../embed/EntityA_Embed_ToOne.java | 3 + .../openjpa/persistence/embed/EntityB1.java | 3 + .../openjpa/persistence/embed/EntityB2.java | 3 + .../persistence/embed/FeatureIdXml.java | 13 +- .../openjpa/persistence/embed/FileName4.java | 2 + .../openjpa/persistence/embed/Geocode.java | 2 +- .../openjpa/persistence/embed/Item1.java | 6 +- .../openjpa/persistence/embed/Item2.java | 7 +- .../openjpa/persistence/embed/Item3.java | 9 +- .../openjpa/persistence/embed/Item4.java | 2 +- .../openjpa/persistence/embed/Item5.java | 2 +- .../openjpa/persistence/embed/JobInfo.java | 3 +- .../persistence/embed/LocationDetails.java | 3 +- .../openjpa/persistence/embed/OrderXml.java | 1 + .../persistence/embed/ParkingSpot.java | 5 +- .../persistence/embed/PhoneNumber.java | 10 +- .../persistence/embed/ProgramManager.java | 10 +- .../openjpa/persistence/embed/Seller.java | 3 +- .../persistence/embed/TestEmbeddable.java | 7 +- .../persistence/embed/TestEmbeddableXml.java | 5 +- .../persistence/embed/TestEmbedded.java | 1 + .../embed/TestEmbeddedWithQuery.java | 5 +- .../embed/TestUpdateEmbeddedQueryResult.java | 6 +- .../persistence/embed/VicePresident.java | 5 +- .../embed/attrOverrides/AbstractEmployee.java | 3 +- .../embed/attrOverrides/Address.java | 12 +- .../embed/attrOverrides/ContactInfo.java | 11 +- .../embed/attrOverrides/Customer.java | 8 +- .../attrOverrides/EmergencyContactInfo.java | 7 +- .../embed/attrOverrides/Employee.java | 17 +- .../embed/attrOverrides/JobInfo.java | 3 +- .../embed/attrOverrides/Person.java | 5 +- .../embed/attrOverrides/PhoneNumber.java | 11 +- .../embed/attrOverrides/ProgramManager.java | 11 +- .../embed/attrOverrides/PropertyInfo.java | 3 +- .../embed/attrOverrides/PropertyOwner.java | 10 +- .../embed/attrOverrides/PropertyRecord.java | 11 +- .../attrOverrides/TestAssocOverrides.java | 5 +- .../attrOverrides/TestAssocOverridesXML.java | 10 +- .../attrOverrides/TestAttrOverrides.java | 1 + .../attrOverrides/TestAttrOverridesXml.java | 9 +- .../embed/attrOverrides/Zipcode.java | 9 +- .../embed/compositepk/SubjectIdClass.java | 3 + .../compositepk/TestCompositePrimaryKeys.java | 10 +- .../embed/lazy/TestLazyEmbeddable.java | 4 +- .../enhance/DynamicEnhancementSuite.java | 8 +- .../persistence/enhance/TestClone.java | 5 +- .../enhance/TestDynamicStorageGenerator.java | 2 +- .../TestEmbeddableEntityWithIDAnnotation.java | 1 + .../TestEmbeddedEnumSqlGeneration.java | 8 +- .../persistence/enhance/TestNoNoArgs.java | 3 +- .../enhance/TestSubclassedBehavior.java | 24 +- .../BackingFieldNameMismatchInstance.java | 2 + .../enhance/common/apps/BaseEntity.java | 2 + .../common/apps/BasicSubclassInstance.java | 2 + .../enhance/common/apps/DetachablePC.java | 3 + .../common/apps/DetachableVersionedPC.java | 3 + .../EmbeddableEntityWithIDAnnotation.java | 5 +- .../enhance/common/apps/Entity1.java | 2 + .../enhance/common/apps/Entity2.java | 6 +- .../enhance/common/apps/PCClone.java | 1 + .../common/apps/SubclassTestInstance.java | 4 +- .../enhance/identity/BeneContactId.java | 9 +- .../persistence/enhance/identity/Book.java | 8 +- .../persistence/enhance/identity/Book1.java | 7 +- .../persistence/enhance/identity/BookId.java | 4 + .../persistence/enhance/identity/BookId1.java | 4 + .../enhance/identity/Dependent1.java | 8 +- .../enhance/identity/Dependent1Xml.java | 2 + .../enhance/identity/Dependent2.java | 8 +- .../enhance/identity/Dependent3.java | 9 +- .../enhance/identity/Dependent4.java | 12 +- .../enhance/identity/Dependent5.java | 7 +- .../enhance/identity/Dependent5a.java | 7 +- .../enhance/identity/DependentId1.java | 4 +- .../enhance/identity/DependentId1Xml.java | 2 + .../enhance/identity/DependentId2.java | 4 +- .../enhance/identity/DependentId3.java | 4 +- .../enhance/identity/DependentId4.java | 2 + .../enhance/identity/DependentId5.java | 2 + .../persistence/enhance/identity/EmpId.java | 2 + .../enhance/identity/Employee.java | 8 +- .../enhance/identity/Employee1.java | 13 +- .../enhance/identity/Employee1Xml.java | 4 +- .../enhance/identity/Employee2.java | 12 +- .../enhance/identity/Employee3.java | 14 +- .../enhance/identity/Employee4.java | 13 +- .../enhance/identity/Employee5.java | 6 +- .../enhance/identity/EmployeeId2.java | 4 +- .../enhance/identity/EmployeeId5.java | 4 + .../persistence/enhance/identity/Library.java | 8 +- .../enhance/identity/Library1.java | 8 +- .../persistence/enhance/identity/Line1.java | 3 + .../persistence/enhance/identity/LineId1.java | 5 + .../enhance/identity/MedicalHistory1.java | 8 +- .../enhance/identity/MedicalHistory2.java | 8 +- .../enhance/identity/MedicalHistory3.java | 8 +- .../enhance/identity/MedicalHistory4.java | 8 +- .../persistence/enhance/identity/Page.java | 3 + .../persistence/enhance/identity/Page1.java | 5 +- .../persistence/enhance/identity/PageId.java | 4 + .../persistence/enhance/identity/PageId1.java | 5 + .../persistence/enhance/identity/Parent3.java | 9 +- .../persistence/enhance/identity/Person1.java | 7 +- .../persistence/enhance/identity/Person2.java | 9 +- .../persistence/enhance/identity/Person3.java | 8 +- .../persistence/enhance/identity/Person4.java | 2 + .../enhance/identity/PersonId1.java | 4 +- .../enhance/identity/PersonId3.java | 2 + .../enhance/identity/PersonId4.java | 4 +- .../enhance/identity/PhoneNumber.java | 6 +- .../enhance/identity/TestDerivedIdentity.java | 1 + .../enhance/identity/TestMappedById.java | 34 +- .../enhance/identity/TestMapsIdXml.java | 5 +- .../TestMultipleLevelDerivedIdentity.java | 3 +- .../TestMultipleLevelDerivedIdentity1.java | 2 + .../openjpa/persistence/entity/EntityA.java | 2 +- .../openjpa/persistence/entity/EntityB.java | 2 +- .../TestEntityManagerConfiguration.java | 1 + .../entityoperation/TestCascades.java | 5 +- .../common/apps/CascadesEntity.java | 1 + .../openjpa/persistence/event/AnEntity.java | 3 +- .../event/JMSRemoteEventsTest.java | 6 +- .../persistence/event/RemoteEventBase.java | 19 +- .../persistence/event/TestBeforeCommit.java | 11 +- .../openjpa/persistence/event/TestEvents.java | 27 +- .../event/TestFakeRemoteEvents.java | 13 +- .../event/TestLifecycleEventManager.java | 14 +- .../event/TestLocalRemoteEvents.java | 4 +- .../event/TestOrphanedKeyAction.java | 11 +- .../event/TestTCPRemoteClassChanges.java | 21 +- .../event/TestTCPRemoteEvents.java | 4 +- .../event/TestTCPRemoteEventsDuration.java | 21 +- .../event/TestTCPRemoteRecovery.java | 21 +- .../TestTCPRemoteRecoveryTransmitAdds.java | 21 +- .../event/common/apps/Duration.java | 2 + .../event/common/apps/RuntimeTest1.java | 4 + .../event/common/apps/RuntimeTest2.java | 2 + .../event/common/apps/RuntimeTest4.java | 1 + .../persistence/exception/TestException.java | 6 +- .../exception/TestParameterLogging.java | 6 +- .../external/TestExternalValues.java | 5 +- .../persistence/fetchgroups/FGAddress.java | 1 + .../persistence/fetchgroups/FGDepartment.java | 1 + .../persistence/fetchgroups/FGEmployee.java | 1 + .../persistence/fetchgroups/FGManager.java | 4 +- .../fetchgroups/TestFetchGroupStacks.java | 1 + .../fetchgroups/TestFetchGroupStacksXML.java | 2 + .../fetchgroups/TestFetchGroups.java | 5 +- .../persistence/fields/ByteArrayHolder.java | 7 +- .../persistence/fields/EnumFieldType.java | 9 +- .../persistence/fields/EnumSetOwner.java | 7 +- .../persistence/fields/TestByteArray.java | 1 + .../fields/TestEnumQueryConstructor.java | 1 + .../persistence/fields/TestEnumSets.java | 1 + .../persistence/fields/TestEnumsInJPQL.java | 1 + .../persistence/flush/TestCascadingFlush.java | 19 +- .../foreign/keys/TestMultForeignKeys.java | 3 +- .../persistence/generationtype/CustomSeq.java | 5 + .../persistence/generationtype/Dog1.java | 12 +- .../persistence/generationtype/Dog2.java | 12 +- .../persistence/generationtype/DogTable.java | 13 +- .../persistence/generationtype/DogTable2.java | 13 +- .../persistence/generationtype/DogTable3.java | 13 +- .../persistence/generationtype/DogTable4.java | 13 +- ...ntityWithGeneratedValueAndPostPersist.java | 7 +- ...ntityWithGeneratedValueAndPostPersist.java | 4 +- .../generationtype/TestGeneratedValues.java | 1 + .../TestMultipleSchemaNames.java | 1 + .../generationtype/TestTableGenerator.java | 1 + .../TestTableGeneratorMultithreaded.java | 5 +- ...eGeneratorMultithreadedInitialization.java | 1 + .../TestTableGeneratorUseSchemaNameProp.java | 1 + .../generationtype/ValueCache.java | 2 +- .../openjpa/persistence/graph/City.java | 2 +- .../openjpa/persistence/graph/Graph.java | 14 +- .../openjpa/persistence/graph/People.java | 2 +- .../persistence/graph/PersistentGraph.java | 3 +- .../persistence/graph/PersistentRelation.java | 11 +- .../openjpa/persistence/graph/Relation.java | 14 +- .../persistence/graph/RelationGraph.java | 23 +- .../graph/TestPersistentGraph.java | 3 +- .../TestHungarianNotationRemoval.java | 1 + .../identity/SQLBigIntegerIdEntity.java | 1 + .../persistence/identity/SQLDateIdEntity.java | 1 + .../identity/TestCompundIdWithNull.java | 1 + .../identity/TestFloatingPointIds.java | 4 +- .../identity/TestGenerationType.java | 5 +- .../identity/TestSQLBigDecimalId.java | 5 +- .../identity/TestSQLBigIntegerId.java | 5 +- .../persistence/identity/TestSQLDateId.java | 5 +- .../entityasidentity/AccountGroup.java | 2 +- .../identity/entityasidentity/AccountId.java | 2 + .../TestEntityAsIdentityFields.java | 1 + .../entityasidentity2/Attendance.java | 3 + .../TestEntityAsIdentityFields2.java | 1 + .../TestDefaultInheritanceStrategy.java | 3 +- .../inheritance/TestFindAbstractClass.java | 4 +- .../TestIdentityWithSingleTableStrategy.java | 3 +- .../inheritance/TestInheritanceWithMSCID.java | 1 + .../inheritance/TestJoinTableStrategy.java | 5 +- .../inheritance/TestMappedSuperclass.java | 1 + ...TestMultipleMappedSuperclassHierarchy.java | 4 +- .../TestSharedMappedSuperclassIdValue.java | 4 +- .../TestSharedUnqualifiedClassNames.java | 1 + .../abstractjoinedappid/RelationOwner.java | 14 +- .../abstractjoinedappid/SubID.java | 3 + .../abstractjoinedappid/Subclass.java | 5 +- .../abstractjoinedappid/SuperID.java | 10 +- .../abstractjoinedappid/Superclass.java | 8 +- .../TestAbstractJoinedAppId.java | 4 +- .../inheritance/entities/EntityMapping.java | 61 ++ .../chardiscriminator/PIdJTCDMSCEntityB.java | 2 + .../chardiscriminator/PIdJTCDMSCEntityD.java | 2 + .../chardiscriminator/PIdJTCDMSCLeafA.java | 2 + .../chardiscriminator/PIdJTCDMSCLeafB1.java | 2 + .../chardiscriminator/PIdJTCDMSCLeafB2.java | 2 + .../chardiscriminator/PIdJTCDMSCLeafC.java | 2 + .../chardiscriminator/PIdJTCDMSCLeafD1.java | 2 + .../chardiscriminator/PIdJTCDMSCLeafD2.java | 2 + .../PIdJTCDMSCMappedSuperclass.java | 2 + .../PIdJTCDMSCRootEntity.java | 2 + .../intdiscriminator/PIdJTIDMSCEntityB.java | 2 + .../intdiscriminator/PIdJTIDMSCEntityD.java | 2 + .../intdiscriminator/PIdJTIDMSCLeafA.java | 2 + .../intdiscriminator/PIdJTIDMSCLeafB1.java | 2 + .../intdiscriminator/PIdJTIDMSCLeafB2.java | 2 + .../intdiscriminator/PIdJTIDMSCLeafC.java | 2 + .../intdiscriminator/PIdJTIDMSCLeafD1.java | 2 + .../intdiscriminator/PIdJTIDMSCLeafD2.java | 2 + .../PIdJTIDMSCMappedSuperclass.java | 2 + .../PIdJTIDMSCRootEntity.java | 2 + .../PIdJTSDMSCEntityB.java | 2 + .../PIdJTSDMSCEntityD.java | 2 + .../stringdiscriminator/PIdJTSDMSCLeafA.java | 2 + .../stringdiscriminator/PIdJTSDMSCLeafB1.java | 2 + .../stringdiscriminator/PIdJTSDMSCLeafB2.java | 2 + .../stringdiscriminator/PIdJTSDMSCLeafC.java | 2 + .../stringdiscriminator/PIdJTSDMSCLeafD1.java | 2 + .../stringdiscriminator/PIdJTSDMSCLeafD2.java | 2 + .../PIdJTSDMSCMappedSuperclass.java | 2 + .../PIdJTSDMSCRootEntity.java | 2 + .../chardiscriminator/PIdSTCDMSCEntityB.java | 2 + .../chardiscriminator/PIdSTCDMSCEntityD.java | 2 + .../chardiscriminator/PIdSTCDMSCLeafA.java | 2 + .../chardiscriminator/PIdSTCDMSCLeafB1.java | 2 + .../chardiscriminator/PIdSTCDMSCLeafB2.java | 2 + .../chardiscriminator/PIdSTCDMSCLeafC.java | 2 + .../chardiscriminator/PIdSTCDMSCLeafD1.java | 2 + .../chardiscriminator/PIdSTCDMSCLeafD2.java | 2 + .../PIdSTCDMSCMappedSuperclass.java | 2 + .../PIdSTCDMSCRootEntity.java | 2 + .../intdiscriminator/PIdSTIDMSCEntityB.java | 2 + .../intdiscriminator/PIdSTIDMSCEntityD.java | 2 + .../intdiscriminator/PIdSTIDMSCLeafA.java | 2 + .../intdiscriminator/PIdSTIDMSCLeafB1.java | 2 + .../intdiscriminator/PIdSTIDMSCLeafB2.java | 2 + .../intdiscriminator/PIdSTIDMSCLeafC.java | 2 + .../intdiscriminator/PIdSTIDMSCLeafD1.java | 2 + .../intdiscriminator/PIdSTIDMSCLeafD2.java | 2 + .../PIdSTIDMSCMappedSuperclass.java | 2 + .../PIdSTIDMSCRootEntity.java | 2 + .../PIdSTSDMSCEntityB.java | 2 + .../PIdSTSDMSCEntityD.java | 2 + .../stringdiscriminator/PIdSTSDMSCLeafA.java | 2 + .../stringdiscriminator/PIdSTSDMSCLeafB1.java | 2 + .../stringdiscriminator/PIdSTSDMSCLeafB2.java | 2 + .../stringdiscriminator/PIdSTSDMSCLeafC.java | 2 + .../stringdiscriminator/PIdSTSDMSCLeafD1.java | 2 + .../stringdiscriminator/PIdSTSDMSCLeafD2.java | 2 + .../PIdSTSDMSCMappedSuperclass.java | 2 + .../PIdSTSDMSCRootEntity.java | 2 + .../entities/testinterfaces/EntityB.java | 4 +- .../entities/testinterfaces/EntityD.java | 4 +- .../entities/testinterfaces/LeafA.java | 4 +- .../entities/testinterfaces/LeafB1.java | 4 +- .../entities/testinterfaces/LeafB2.java | 4 +- .../entities/testinterfaces/LeafC.java | 4 +- .../entities/testinterfaces/LeafD1.java | 4 +- .../entities/testinterfaces/LeafD2.java | 4 +- .../entities/testinterfaces/MSC.java | 4 +- .../entities/testinterfaces/RootEntity.java | 8 +- .../inheritance/entity/AbstractClass.java | 1 + .../persistence/inheritance/entity/Admin.java | 2 +- .../inheritance/entity/BaseClass.java | 1 + .../inheritance/entity/BaseClass2.java | 1 + .../inheritance/entity/BaseClass3.java | 1 + .../inheritance/entity/BaseClass4.java | 1 + .../inheritance/entity/BaseClass5.java | 1 + .../inheritance/entity/BaseClass6.java | 1 + .../inheritance/entity/Department.java | 4 +- .../inheritance/entity/ImplClassA.java | 5 + .../inheritance/entity/ManagedIface.java | 9 +- .../inheritance/entity/ManagedIface2.java | 9 +- .../inheritance/entity/Manager.java | 1 + .../inheritance/entity/MappedSuper.java | 1 + .../inheritance/entity/MidClass.java | 1 + .../inheritance/entity/MidClass2.java | 1 + .../inheritance/entity/MidClass3.java | 1 + .../inheritance/entity/PTEmployee.java | 3 +- .../inheritance/entity/SubclassA.java | 1 + .../inheritance/entity/SubclassB.java | 1 + .../inheritance/entity/SubclassC.java | 1 + .../inheritance/entity/SubclassD.java | 1 + .../inheritance/entity/SubclassE.java | 1 + .../inheritance/entity/SubclassF.java | 3 + .../inheritance/entity/SubclassG.java | 1 + .../inheritance/entity/SubclassH.java | 1 + .../inheritance/entity/SubclassI.java | 3 + .../inheritance/entity/SubclassJ.java | 3 + .../inheritance/entity/SubclassK.java | 1 + .../inheritance/jointable/Contractor.java | 1 + .../jointable/FulltimeEmployee.java | 1 + .../jointable/ParttimeEmployee.java | 1 + .../TestInheritanceTypeJoinedQuery.java | 3 +- .../onetomany/TestJointableOneToMany.java | 1 + .../TestMapsIdWithAutoGeneratedKey.java | 1 + .../jointable/onetomany/UMLPackage.java | 4 +- .../mappedsuperclass/CashBaseEntity.java | 4 +- .../mappedsuperclass/SituationDA.java | 8 +- .../TestMappedSuperClass.java | 1 + .../mappedsuperclass/ValuableItemDA.java | 5 +- .../mappedsuperclass/idclass/TIdClass.java | 10 +- .../mappedsuperclass/idclass/TestIdClass.java | 3 +- ...lePerClassInheritanceWithAbstractRoot.java | 4 +- .../inheritance/polymorphic/Translatable.java | 2 +- .../inheritance/serializable/Employee.java | 2 + .../serializable/TestSerialization.java | 1 + .../openjpa/persistence/jdbc/SQLSniffer.java | 2 +- .../jdbc/TestIsolationFecthHint.java | 3 +- .../jdbc/TestIsolationLevelOverride.java | 15 +- .../TestJDBCEnumToKernelConstantMappings.java | 3 +- .../openjpa/persistence/jdbc/TestLobs.java | 5 +- .../jdbc/TestOptimizeForClause.java | 19 +- .../jdbc/TestSelectForUpdateOverride.java | 11 +- .../jdbc/TestTimestampPKDeletion.java | 1 + .../jdbc/annotations/AnnoTest1.java | 33 +- .../jdbc/annotations/AnnoTest2.java | 25 +- .../jdbc/annotations/AnnoTest3.java | 10 +- .../jdbc/annotations/EmbedValue.java | 8 +- .../jdbc/annotations/EmbedValue2.java | 4 +- .../jdbc/annotations/EmbedValue3.java | 4 +- .../jdbc/annotations/EmbeddableSuper.java | 8 +- .../jdbc/annotations/EmbeddableSuperSub.java | 7 +- .../jdbc/annotations/EmbeddedIdClass.java | 7 +- .../jdbc/annotations/EmbeddedIdEntity.java | 11 +- .../jdbc/annotations/ExtensionsEntity.java | 34 +- .../persistence/jdbc/annotations/Flat1.java | 10 +- .../persistence/jdbc/annotations/Flat2.java | 3 +- .../jdbc/annotations/Generator.java | 13 +- .../annotations/NativeSequenceEntity.java | 6 +- .../annotations/NonstandardMappingEntity.java | 47 +- .../NonstandardMappingEntity3.java | 2 +- .../NonstandardMappingMappedSuper.java | 12 +- .../NonstandardMappingMappedSuper4.java | 7 +- .../jdbc/annotations/PointHandler.java | 8 +- .../jdbc/annotations/PropertyAccess1.java | 3 +- .../jdbc/annotations/TablePerClass1.java | 10 +- .../jdbc/annotations/TablePerClass2.java | 3 +- .../jdbc/annotations/TestDiscriminator.java | 1 + .../jdbc/annotations/TestEJBEmbedded.java | 3 +- .../annotations/TestEmbeddableSuperclass.java | 4 +- .../jdbc/annotations/TestEmbeddedId.java | 1 + .../jdbc/annotations/TestEnumerated.java | 8 +- .../annotations/TestExtensionAnnotations.java | 4 +- .../jdbc/annotations/TestFlatInheritance.java | 1 + .../jdbc/annotations/TestGenerators.java | 1 + .../annotations/TestJoinedInheritance.java | 1 + .../jdbc/annotations/TestManyToMany.java | 2 + .../jdbc/annotations/TestMapKey.java | 1 + .../annotations/TestMultiColumnVersion.java | 1 + .../TestMultiColumnVersionXML.java | 2 + .../TestNonstandardMappingAnnotations.java | 6 +- .../jdbc/annotations/TestOneToMany.java | 1 + .../jdbc/annotations/TestOneToOne.java | 1 + .../jdbc/annotations/TestPropertyAccess.java | 1 + .../annotations/TestSequenceGenerator.java | 1 + .../jdbc/annotations/TestSerializedLobs.java | 2 + .../TestTablePerClassInheritance.java | 1 + .../jdbc/annotations/TestVersion.java | 1 + .../UnenhancedInappropriateTransient.java | 2 +- .../jdbc/auto/TestAutoIncrement.java | 1 + .../persistence/jdbc/common/apps/AttachA.java | 11 +- .../persistence/jdbc/common/apps/AttachB.java | 7 +- .../persistence/jdbc/common/apps/AttachC.java | 5 +- .../persistence/jdbc/common/apps/AttachD.java | 11 +- .../persistence/jdbc/common/apps/AttachE.java | 7 +- .../persistence/jdbc/common/apps/AttachF.java | 13 +- .../common/apps/AutoIncrementOpOrderPC.java | 6 +- .../apps/AutoIncrementOpOrderPCSub.java | 1 + .../jdbc/common/apps/AutoIncrementPC1.java | 13 +- .../jdbc/common/apps/AutoIncrementPC2.java | 3 +- .../jdbc/common/apps/AutoIncrementPC3.java | 12 +- .../jdbc/common/apps/AutoIncrementPC3Id.java | 17 +- .../persistence/jdbc/common/apps/Base.java | 1 + .../jdbc/common/apps/ByteArrayPKPC.java | 6 +- .../jdbc/common/apps/ByteArrayPKPC2.java | 2 + .../jdbc/common/apps/ByteArrayPKPCId.java | 7 +- .../jdbc/common/apps/ComplexEmbeddedPC.java | 4 +- .../jdbc/common/apps/ConstantJoinPC.java | 4 +- .../jdbc/common/apps/ConstantJoinPC4.java | 12 +- .../jdbc/common/apps/ConstantJoinPC5.java | 5 +- .../jdbc/common/apps/CustomMappingPC.java | 5 +- .../jdbc/common/apps/EagerOuterJoinPC.java | 7 +- .../jdbc/common/apps/EagerOuterJoinPC2.java | 5 +- .../persistence/jdbc/common/apps/EagerPC.java | 13 +- .../jdbc/common/apps/EagerPCSub.java | 9 +- .../jdbc/common/apps/HelperPC.java | 11 +- .../jdbc/common/apps/HelperPC2.java | 10 +- .../jdbc/common/apps/HelperPC3.java | 6 +- .../jdbc/common/apps/HelperPC4.java | 3 +- .../persistence/jdbc/common/apps/HorizA.java | 8 +- .../jdbc/common/apps/HorizAppA.java | 16 +- .../jdbc/common/apps/HorizAppB.java | 8 +- .../jdbc/common/apps/HorizAppC.java | 8 +- .../jdbc/common/apps/HorizAppD.java | 8 +- .../common/apps/HorizAppInterVerticalA.java | 9 + .../common/apps/HorizAppInterVerticalB.java | 4 + .../common/apps/HorizAppInterVerticalC.java | 4 + .../common/apps/HorizAppInterVerticalD.java | 4 + .../jdbc/common/apps/HorizAppMultiA.java | 19 +- .../jdbc/common/apps/HorizAppMultiB.java | 7 + .../jdbc/common/apps/HorizAppMultiC.java | 7 + .../jdbc/common/apps/HorizAppMultiD.java | 7 + .../jdbc/common/apps/HorizAppSingleA.java | 19 +- .../jdbc/common/apps/HorizAppSingleB.java | 4 + .../jdbc/common/apps/HorizAppSingleC.java | 4 + .../jdbc/common/apps/HorizAppSingleD.java | 4 + .../persistence/jdbc/common/apps/HorizB.java | 2 + .../persistence/jdbc/common/apps/HorizC.java | 2 + .../persistence/jdbc/common/apps/HorizD.java | 2 + .../persistence/jdbc/common/apps/HorizE.java | 2 + .../persistence/jdbc/common/apps/HorizF.java | 2 + .../persistence/jdbc/common/apps/HorizG.java | 2 + .../persistence/jdbc/common/apps/HorizH.java | 2 + .../persistence/jdbc/common/apps/HorizI.java | 2 + .../jdbc/common/apps/HorizInterA.java | 8 +- .../jdbc/common/apps/HorizInterB.java | 8 +- .../jdbc/common/apps/HorizInterC.java | 8 +- .../jdbc/common/apps/HorizInterD.java | 8 +- .../jdbc/common/apps/HorizInterFlatA.java | 4 + .../jdbc/common/apps/HorizInterFlatB.java | 4 + .../jdbc/common/apps/HorizInterFlatC.java | 4 + .../jdbc/common/apps/HorizInterFlatD.java | 4 + .../jdbc/common/apps/HorizInterVerticalA.java | 4 + .../jdbc/common/apps/HorizInterVerticalB.java | 4 + .../jdbc/common/apps/HorizInterVerticalC.java | 4 + .../jdbc/common/apps/HorizInterVerticalD.java | 4 + .../persistence/jdbc/common/apps/HorizJ.java | 2 + .../persistence/jdbc/common/apps/HorizK.java | 2 + .../persistence/jdbc/common/apps/HorizL.java | 2 + .../persistence/jdbc/common/apps/HorizM.java | 2 + .../persistence/jdbc/common/apps/HorizN.java | 2 + .../persistence/jdbc/common/apps/HorizO.java | 2 + .../jdbc/common/apps/HorizRelation.java | 2 + .../jdbc/common/apps/InverseKeyMapPC.java | 5 +- .../persistence/jdbc/common/apps/InvertA.java | 11 +- .../persistence/jdbc/common/apps/InvertB.java | 10 +- .../jdbc/common/apps/JoinSubclassBase.java | 1 + .../jdbc/common/apps/JoinTableMapPC.java | 5 +- .../jdbc/common/apps/LRSCompoundPC.java | 23 +- .../persistence/jdbc/common/apps/LRSPC.java | 23 +- .../jdbc/common/apps/LRSPCIntf.java | 32 +- .../jdbc/common/apps/LockGroupSubclass.java | 2 + .../jdbc/common/apps/MappedByMapPC.java | 4 +- .../jdbc/common/apps/MappingTest1.java | 8 +- .../jdbc/common/apps/MappingTest2.java | 6 +- .../jdbc/common/apps/MappingTest2ID.java | 21 +- .../persistence/jdbc/common/apps/MultiA.java | 3 +- .../persistence/jdbc/common/apps/MultiC.java | 3 +- .../jdbc/common/apps/NonPKJoinPC.java | 3 +- .../jdbc/common/apps/NonPKJoinPC3.java | 3 +- .../persistence/jdbc/common/apps/OpOrder.java | 18 +- .../jdbc/common/apps/OpOrderPC.java | 5 +- .../jdbc/common/apps/OpOrderPCSub.java | 1 + .../jdbc/common/apps/PagingAppIdPC.java | 4 +- .../jdbc/common/apps/PagingPC.java | 5 +- .../jdbc/common/apps/PartialJoinPC.java | 3 +- .../jdbc/common/apps/PartialJoinPC3.java | 3 +- .../jdbc/common/apps/PostAttachCallback.java | 3 +- .../jdbc/common/apps/PostDetachCallback.java | 3 +- .../jdbc/common/apps/PreAttachCallback.java | 3 +- .../jdbc/common/apps/PreDetachCallback.java | 3 +- .../jdbc/common/apps/QueryTest1.java | 3 +- .../jdbc/common/apps/RawField.java | 12 +- .../persistence/jdbc/common/apps/RawSQL.java | 1 + .../jdbc/common/apps/Relations.java | 3 +- .../jdbc/common/apps/RuntimeTest1.java | 7 +- .../jdbc/common/apps/RuntimeTest2.java | 2 + .../jdbc/common/apps/RuntimeTest3.java | 2 + .../common/apps/mappingApp/CompositeId.java | 7 +- .../jdbc/common/apps/mappingApp/Entity1.java | 3 +- .../jdbc/common/apps/mappingApp/Entity2.java | 7 +- .../mappingApp/EntityWithCompositeId.java | 6 +- .../OwnerOfEntityWithCompositeId.java | 13 +- .../RecursiveEntityWithCompositeId.java | 14 +- .../common/apps/mappingApp/SQLMapAddress.java | 15 +- .../common/apps/mappingApp/SQLMapItem.java | 16 +- .../common/apps/mappingApp/SQLMapOrder.java | 14 +- .../common/apps/mappingApp/SQLMapPerson.java | 13 +- .../persistence/jdbc/dbcs/TestDBCS.java | 4 +- .../persistence/jdbc/kernel/JDBCTestCase.java | 11 +- .../jdbc/kernel/TestByteArrayAppId.java | 26 +- .../jdbc/kernel/TestCircularFK.java | 6 +- .../jdbc/kernel/TestDataStoreTrips.java | 22 +- .../jdbc/kernel/TestEJBAutoIncrement.java | 3 +- .../jdbc/kernel/TestEfficientAttach.java | 17 +- .../TestEmbeddedPessimisticLocking.java | 19 +- .../kernel/TestIncrementalJDBCFlushes.java | 18 +- .../TestOperationOrderUpdateManager.java | 11 +- .../TestPagingResultObjectProvider.java | 27 +- .../persistence/jdbc/kernel/TestRawSQL.java | 40 +- .../jdbc/kernel/TestSQLListenerTestCase.java | 13 +- .../jdbc/kernel/TestUnknownSubclass.java | 16 +- .../jdbc/kernel/TestUpdateWithSubSelect.java | 1 + .../TestCompositeIdTraversalInSQLMapping.java | 10 +- .../jdbc/mapping/TestEnumXmlTypeMapping.java | 1 + .../jdbc/mapping/TestNativeQueries.java | 1 + .../jdbc/mapping/TestPrecisionMapping.java | 1 + .../jdbc/mapping/bidi/IParent.java | 12 +- .../mapping/bidi/ParentWithAppIdentity.java | 20 +- .../mapping/bidi/ParentWithAutoIdentity.java | 20 +- .../bidi/ParentWithSequenceIdentity.java | 20 +- .../persistence/jdbc/mapping/bidi/Person.java | 4 +- .../bidi/TestBiDirectionalJoinTable.java | 3 +- .../jdbc/maps/m2mmapex0/Division.java | 6 +- .../jdbc/maps/m2mmapex0/Employee.java | 12 +- .../jdbc/maps/m2mmapex0/PhoneNumber.java | 12 +- .../jdbc/maps/m2mmapex0/TestMany2ManyMap.java | 9 +- .../jdbc/maps/m2mmapex1/Department.java | 2 + .../jdbc/maps/m2mmapex1/Division.java | 2 + .../jdbc/maps/m2mmapex1/Employee.java | 12 +- .../jdbc/maps/m2mmapex1/PhoneNumber.java | 13 +- .../maps/m2mmapex1/TestMany2ManyMapEx1.java | 9 +- .../jdbc/maps/m2mmapex10/Employee.java | 13 +- .../jdbc/maps/m2mmapex10/EmployeePK.java | 6 +- .../jdbc/maps/m2mmapex10/PhoneNumber.java | 12 +- .../jdbc/maps/m2mmapex10/PhonePK.java | 6 +- .../maps/m2mmapex10/TestMany2ManyMapEx10.java | 15 +- .../jdbc/maps/m2mmapex2/Department.java | 2 + .../jdbc/maps/m2mmapex2/Employee.java | 12 +- .../jdbc/maps/m2mmapex2/PhoneNumber.java | 12 +- .../maps/m2mmapex2/TestMany2ManyMapEx2.java | 9 +- .../jdbc/maps/m2mmapex3/Department.java | 2 + .../jdbc/maps/m2mmapex3/Employee.java | 12 +- .../jdbc/maps/m2mmapex3/FullName.java | 2 + .../jdbc/maps/m2mmapex3/PhoneNumber.java | 12 +- .../maps/m2mmapex3/TestMany2ManyMapEx3.java | 9 +- .../jdbc/maps/m2mmapex4/Address.java | 5 +- .../jdbc/maps/m2mmapex4/Division.java | 2 + .../jdbc/maps/m2mmapex4/Employee.java | 12 +- .../jdbc/maps/m2mmapex4/Office.java | 2 + .../jdbc/maps/m2mmapex4/PhoneNumber.java | 12 +- .../maps/m2mmapex4/TestMany2ManyMapEx4.java | 15 +- .../jdbc/maps/m2mmapex5/Employee.java | 12 +- .../jdbc/maps/m2mmapex5/PhoneNumber.java | 12 +- .../maps/m2mmapex5/TestMany2ManyMapEx5.java | 13 +- .../jdbc/maps/m2mmapex6/Employee.java | 12 +- .../jdbc/maps/m2mmapex6/FullName.java | 2 + .../jdbc/maps/m2mmapex6/PhoneNumber.java | 13 +- .../maps/m2mmapex6/TestMany2ManyMapEx6.java | 13 +- .../jdbc/maps/m2mmapex7/Division.java | 2 + .../jdbc/maps/m2mmapex7/Employee.java | 12 +- .../jdbc/maps/m2mmapex7/FullName.java | 2 + .../jdbc/maps/m2mmapex7/PhoneNumber.java | 12 +- .../maps/m2mmapex7/TestMany2ManyMapEx7.java | 15 +- .../jdbc/maps/m2mmapex8/Employee.java | 12 +- .../jdbc/maps/m2mmapex8/FullName.java | 2 + .../jdbc/maps/m2mmapex8/PhoneNumber.java | 12 +- .../maps/m2mmapex8/TestMany2ManyMapEx8.java | 11 +- .../jdbc/maps/m2mmapex9/Employee.java | 13 +- .../jdbc/maps/m2mmapex9/FullName.java | 2 + .../jdbc/maps/m2mmapex9/FullPhoneName.java | 2 + .../jdbc/maps/m2mmapex9/PhoneNumber.java | 12 +- .../maps/m2mmapex9/TestMany2ManyMapEx9.java | 13 +- .../jdbc/maps/qualified/path/Division.java | 2 +- .../maps/qualified/path/PersonalInfo.java | 2 +- .../qualified/path/TestQualifiedPath.java | 3 +- .../maps/spec_10_1_26_ex0/Department1.java | 9 +- .../maps/spec_10_1_26_ex0/Department2.java | 8 +- .../maps/spec_10_1_26_ex0/Department3.java | 2 +- .../jdbc/maps/spec_10_1_26_ex0/Employee1.java | 6 +- .../jdbc/maps/spec_10_1_26_ex0/Employee2.java | 6 +- .../jdbc/maps/spec_10_1_26_ex0/Employee3.java | 7 +- .../maps/spec_10_1_26_ex0/EmployeeName3.java | 2 + .../maps/spec_10_1_26_ex0/EmployeePK2.java | 6 +- .../spec_10_1_26_ex0/TestSpec10_1_26.java | 9 +- .../maps/spec_10_1_26_ex1/Department.java | 10 +- .../jdbc/maps/spec_10_1_26_ex1/Employee.java | 6 +- .../spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java | 7 +- .../maps/spec_10_1_26_ex2/Department.java | 9 +- .../jdbc/maps/spec_10_1_26_ex2/Employee.java | 6 +- .../maps/spec_10_1_26_ex2/EmployeePK.java | 6 +- .../spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java | 5 +- .../maps/spec_10_1_26_ex3/Department.java | 2 +- .../jdbc/maps/spec_10_1_26_ex3/Employee.java | 7 +- .../maps/spec_10_1_26_ex3/EmployeeName.java | 2 + .../spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java | 7 +- .../jdbc/maps/spec_10_1_27_ex0/Compny1.java | 6 +- .../jdbc/maps/spec_10_1_27_ex0/Compny2.java | 6 +- .../jdbc/maps/spec_10_1_27_ex0/Division.java | 2 + .../jdbc/maps/spec_10_1_27_ex0/Item1.java | 6 +- .../jdbc/maps/spec_10_1_27_ex0/Item2.java | 7 +- .../spec_10_1_27_ex0/TestSpec10_1_27.java | 5 +- .../maps/spec_10_1_27_ex0/VicePresident.java | 7 +- .../jdbc/maps/spec_10_1_27_ex3/Company.java | 6 +- .../jdbc/maps/spec_10_1_27_ex3/Division.java | 2 + .../spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java | 7 +- .../maps/spec_10_1_27_ex3/VicePresident.java | 5 +- .../jdbc/maps/spec_10_1_27_ex4/Company.java | 7 +- .../jdbc/maps/spec_10_1_27_ex4/Division.java | 2 + .../spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java | 5 +- .../maps/spec_10_1_27_ex4/VicePresident.java | 6 +- .../jdbc/maps/spec_10_1_27_ex5/Company.java | 7 +- .../jdbc/maps/spec_10_1_27_ex5/Division.java | 2 + .../spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java | 7 +- .../maps/spec_10_1_27_ex5/VicePresident.java | 5 +- .../jdbc/maps/spec_10_1_27_ex6/Company.java | 8 +- .../jdbc/maps/spec_10_1_27_ex6/Division.java | 2 + .../spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java | 5 +- .../maps/spec_10_1_27_ex6/VicePresident.java | 6 +- .../jdbc/maps/spec_10_1_27_ex7/Company.java | 8 +- .../jdbc/maps/spec_10_1_27_ex7/Division.java | 2 + .../spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java | 7 +- .../maps/spec_10_1_27_ex7/VicePresident.java | 6 +- .../jdbc/maps/spec_10_1_27_ex8/Company.java | 7 +- .../jdbc/maps/spec_10_1_27_ex8/FileName.java | 2 + .../spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java | 7 +- .../maps/spec_10_1_27_ex8/VicePresident.java | 5 +- .../jdbc/maps/spec_10_1_29_ex1/Company.java | 10 +- .../jdbc/maps/spec_10_1_29_ex1/Division.java | 4 +- .../spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java | 7 +- .../maps/spec_10_1_29_ex1/VicePresident.java | 4 +- .../jdbc/maps/spec_10_1_29_ex3/Course.java | 2 + .../jdbc/maps/spec_10_1_29_ex3/Student.java | 10 +- .../spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java | 5 +- .../jdbc/maps/update/MultilingualString.java | 2 +- .../jdbc/maps/update/TestMapUpdate.java | 3 +- .../jdbc/meta/TestBuildSchema.java | 5 +- .../persistence/jdbc/meta/TestDFG.java | 7 +- .../jdbc/meta/TestEJBByteArray.java | 5 +- .../jdbc/meta/TestEJBColumnIOMappings.java | 5 +- .../TestEJBConstantJoinOnSameRefTable.java | 3 +- .../jdbc/meta/TestEJBCustomMapping.java | 3 +- .../jdbc/meta/TestEJBDateVersion.java | 17 +- .../persistence/jdbc/meta/TestEJBEager.java | 10 +- .../jdbc/meta/TestEJBInverseOneToOne.java | 3 +- .../jdbc/meta/TestEJBOuterJoinValues.java | 3 +- .../jdbc/meta/TestEagerDistinct.java | 18 +- .../jdbc/meta/TestEagerOuterToManyJoins.java | 16 +- .../jdbc/meta/TestIntermediate.java | 6 +- .../jdbc/meta/TestIrregularJoins.java | 15 +- .../persistence/jdbc/meta/TestJDBCType.java | 8 +- .../jdbc/meta/TestJoinToBaseClass.java | 9 +- .../persistence/jdbc/meta/TestLRSProxies.java | 15 +- .../persistence/jdbc/meta/TestLocators.java | 14 +- .../jdbc/meta/TestMappedByKeyMaps.java | 16 +- .../jdbc/meta/TestMetaDataValueIndicator.java | 9 +- .../persistence/jdbc/meta/TestMultiDFG.java | 6 +- .../jdbc/meta/TestMultiTableMappings.java | 16 +- .../meta/TestMultiTableSelfCollection.java | 9 +- .../jdbc/meta/TestNoClassColumn.java | 10 +- .../persistence/jdbc/meta/TestRangeQuery.java | 13 +- .../persistence/jdbc/meta/TestRawField.java | 5 +- .../persistence/jdbc/meta/TestStateImage.java | 11 +- .../jdbc/meta/TestUseSchemaElement.java | 1 + .../TestLockGroupsWithHorizontalBaseType.java | 5 +- ...TestQueryAgainstEntireMappedHierarchy.java | 7 +- .../TestUnionPlaceholderTypes.java | 5 +- .../meta/vertical/TestJoinSubclasses.java | 19 +- .../meta/vertical/TestSubclassJoinExtent.java | 18 +- .../TestSubclassJoinGetObjectById.java | 16 +- .../vertical/TestSubclassJoinRelations.java | 20 +- .../jdbc/oracle/TestAutoIncrement.java | 1 + .../jdbc/order/BaseTestElement.java | 3 +- .../jdbc/order/BaseTestElement1.java | 3 +- .../jdbc/order/BaseTestElement2.java | 3 +- .../jdbc/order/BaseTestElement3.java | 3 +- .../persistence/jdbc/order/BiOrderEntity.java | 1 + .../jdbc/order/BiOrderMappedByEntity.java | 5 +- .../persistence/jdbc/order/Bicycle.java | 1 + .../openjpa/persistence/jdbc/order/Car.java | 1 + .../jdbc/order/ColDefTestElement.java | 3 +- .../persistence/jdbc/order/Course.java | 1 + .../openjpa/persistence/jdbc/order/Game.java | 3 +- .../openjpa/persistence/jdbc/order/Home.java | 1 + .../persistence/jdbc/order/Inning.java | 1 + .../openjpa/persistence/jdbc/order/Owner.java | 4 +- .../persistence/jdbc/order/Person.java | 1 + .../persistence/jdbc/order/Player.java | 1 + .../persistence/jdbc/order/Student.java | 1 + .../jdbc/order/TestOrderColumn.java | 47 +- .../jdbc/order/TestOrderColumnXML.java | 8 +- .../persistence/jdbc/order/Widget.java | 1 + .../persistence/jdbc/query/JDBCTestCase.java | 3 +- .../query/TestAggregateQueryWithNoResult.java | 3 +- .../jdbc/query/TestEJBQLSelectNPlusOne.java | 3 +- .../jdbc/query/TestGroupByQuery.java | 7 +- .../jdbc/query/TestHintedQuery.java | 1 + .../jdbc/query/TestJDBCGrouping.java | 1 + .../query/TestMultipleEntityProjection.java | 3 +- .../jdbc/query/TestNamedSQLQueries.java | 10 +- .../jdbc/query/TestNativeQueryProcedures.java | 3 +- .../jdbc/query/TestNewJavaObjectQuery.java | 1 + .../jdbc/query/TestOrderByQuery.java | 5 +- .../jdbc/query/TestSQLQueries.java | 18 +- .../jdbc/query/TestStringFunctions.java | 10 +- .../TestUpdateSingleValuedAssociationXML.java | 2 + .../query/cache/AbstractQueryCacheTest.java | 2 + .../jdbc/query/cache/Department.java | 4 +- .../jdbc/query/cache/DepartmentId.java | 10 +- .../jdbc/query/cache/EmployeeId.java | 6 +- .../persistence/jdbc/query/cache/Invoice.java | 8 +- .../jdbc/query/cache/LineItem.java | 4 +- .../persistence/jdbc/query/cache/Part.java | 2 +- .../jdbc/query/cache/PartBase.java | 3 +- .../jdbc/query/cache/PartComposite.java | 3 +- .../jdbc/query/cache/Supplier.java | 9 +- .../TestNonPrimaryKeyQueryParameters.java | 3 +- .../query/cache/TestQueryDefaultEviction.java | 3 +- .../cache/TestQueryTimestampEviction.java | 6 +- .../persistence/jdbc/query/cache/Usage.java | 9 +- .../jdbc/query/domain/Applicant.java | 4 +- .../jdbc/query/domain/Application.java | 6 +- .../jdbc/query/domain/Customer.java | 2 +- .../persistence/jdbc/query/domain/DtaSrc.java | 11 +- .../jdbc/query/domain/DtaSrcField.java | 10 +- .../jdbc/query/domain/Magazine.java | 6 +- .../jdbc/query/domain/Publisher.java | 5 +- .../query/procedure/DerbyProcedureList.java | 10 +- .../jdbc/query/procedure/ProcedureList.java | 12 +- .../jdbc/query/sub/TestSubQuery.java | 1 + .../jdbc/query/xml/TestTableNameInXml.java | 2 + .../schema/TestClassDBSequenceFactory.java | 17 +- .../jdbc/schema/TestClassSequenceFactory.java | 2 + .../jdbc/schema/TestDBSequenceFactory.java | 10 +- .../jdbc/schema/TestDynamicSchemaFactory.java | 4 +- .../jdbc/schema/TestJDBCListener.java | 12 +- .../jdbc/schema/TestLazySchemaFactory.java | 2 +- .../schema/TestPerClassSequenceFactory.java | 18 +- .../jdbc/schema/TestSchemaClone.java | 1 + .../TestSchemaGenerationProperties.java | 53 +- .../jdbc/schema/TestSchemaGenerator.java | 3 +- ...stSequenceGeneratorEnsureCapacityCall.java | 6 +- .../jdbc/schema/TestXMLSchemaParser.java | 1 + .../jdbc/schema/TestXMLSchemaSerializer.java | 4 +- .../persistence/jdbc/sqlcache/Author.java | 2 +- .../persistence/jdbc/sqlcache/Book.java | 2 +- .../persistence/jdbc/sqlcache/Company.java | 11 +- .../persistence/jdbc/sqlcache/Department.java | 9 +- .../persistence/jdbc/sqlcache/Employee.java | 9 +- .../persistence/jdbc/sqlcache/Parent.java | 4 +- .../persistence/jdbc/sqlcache/ParentId.java | 2 + .../persistence/jdbc/sqlcache/Singer.java | 2 +- .../sqlcache/TestDefaultQueryStatistics.java | 5 +- .../sqlcache/TestExternalizedParameter.java | 5 +- .../jdbc/sqlcache/TestFinderCache.java | 3 +- .../TestInExpressionParameterBinding.java | 2 + .../TestMultithreadedReparameterization.java | 6 +- .../jdbc/sqlcache/TestPreparedQueryCache.java | 7 +- .../TestPreparedQueryCacheExclusion.java | 10 +- .../persistence/jdbc/strategy/Address.java | 8 +- .../jdbc/strategy/InnerJoinStrategy.java | 4 + .../jdbc/strategy/MapperEntity.java | 2 +- .../persistence/jdbc/strategy/Person.java | 11 +- .../persistence/jdbc/unique/NamedUniqueB.java | 11 +- .../unique/TestNamedUniqueConstraint.java | 4 +- ...amedUniqueConstraintWithXMLDescriptor.java | 1 + ...TestUniqueConstraintWithXMLDescriptor.java | 3 +- .../persistence/jdbc/unique/UniqueB.java | 9 +- .../persistence/jdbc/update/Parent.java | 4 +- .../jdbc/update/TestParentChild.java | 3 +- .../jdbc/update/TestTimestampVersion.java | 3 +- .../jdbc/version/TestVersionColumn.java | 1 + .../jdbc/xml/TestNonstandardMappingXML.java | 1 + .../jpql/TestOneToManySubQuery.java | 1 + .../jpql/clauses/TestBulkUpdate.java | 4 +- .../jpql/clauses/TestEJBClauses.java | 10 +- .../jpql/clauses/TestEJBDeleteUpdateImpl.java | 1 + .../jpql/clauses/TestEJBPolymorphicQuery.java | 2 + .../jpql/clauses/TestEJBQueryInterface.java | 2 + .../jpql/entities/IColumnEntity.java | 8 +- .../jpql/entities/INameEntity.java | 10 +- .../jpql/entities/IOrderedElements.java | 16 +- .../jpql/entities/IOrderedEntity.java | 16 +- .../jpql/entities/OrderedElementEntity.java | 15 +- .../entities/OrderedManyToManyEntity.java | 15 +- .../jpql/entities/OrderedNameEntity.java | 14 +- .../jpql/entities/OrderedOneToManyEntity.java | 15 +- .../jpql/entities/UnorderedNameEntity.java | 8 + .../entities/XMLOrderedElementEntity.java | 15 +- .../entities/XMLOrderedManyToManyEntity.java | 15 +- .../jpql/entities/XMLOrderedNameEntity.java | 10 +- .../entities/XMLOrderedOneToManyEntity.java | 15 +- .../jpql/entities/XMLUnorderedNameEntity.java | 8 + .../expressions/TestEJBQLCondExpression.java | 7 +- .../expressions/TestEntityTypeExpression.java | 7 +- .../TestInMemoryScalarExpressions.java | 7 +- .../jpql/expressions/TestIndex.java | 10 +- .../TestJPQLScalarExpressions.java | 8 +- .../jpql/functions/TestEJBQLFunction.java | 2 + .../jpql/functions/TestSetParameter.java | 1 + .../persistence/jpql/joins/Department.java | 1 + .../persistence/jpql/joins/Department_.java | 2 - .../persistence/jpql/joins/Employee.java | 11 +- .../persistence/jpql/joins/Employee_.java | 2 - .../persistence/jpql/joins/TestEJBJoins.java | 6 +- .../TestJoinFetchWithQueryDataCache.java | 7 +- .../jpql/joins/leftfetch/DepartmentTest.java | 2 +- .../joins/leftfetch/TestJoinLeftFetch.java | 1 + .../jpql/literals/TestLiteralInSQL.java | 1 + .../jpql/version/TestJoinVersionField.java | 1 + .../jpql/version/type/BaseEntity.java | 3 +- .../jpql/version/type/LongVersionEntity.java | 7 +- .../type/PrimativeLongVersionEntity.java | 7 +- .../type/PrimativeShortVersionEntity.java | 7 +- .../jpql/version/type/ShortVersionEntity.java | 7 +- .../version/type/TestVersionFieldType.java | 1 + .../version/type/TimestampVersionEntity.java | 7 +- .../persistence/kernel/BaseKernelTest.java | 4 +- .../kernel/DummyBrokerFactory.java | 2 +- .../kernel/Test2EJBConcurrency.java | 4 +- .../persistence/kernel/TestArrayValues2.java | 7 +- .../persistence/kernel/TestBigDecimals.java | 8 +- .../kernel/TestCalendarFields.java | 6 +- .../kernel/TestCheckConsistency.java | 4 +- .../kernel/TestClassStringConstructor.java | 4 +- .../kernel/TestConnectionRetainMode.java | 3 - .../persistence/kernel/TestDateQueries.java | 6 +- .../kernel/TestDependentFields2.java | 4 +- .../kernel/TestDetachedStateManager.java | 15 +- .../kernel/TestDynamicFetchPlan.java | 3 +- .../persistence/kernel/TestEJBEmbedded.java | 2 +- .../kernel/TestEJBEntityManager.java | 6 +- .../kernel/TestEJBGetObjectByIdValue.java | 4 +- .../kernel/TestEJBIncrementalFlushes.java | 4 +- .../persistence/kernel/TestEJBInterfaces.java | 3 +- .../persistence/kernel/TestEJBLobs.java | 5 +- .../persistence/kernel/TestEJBLocales.java | 5 +- .../kernel/TestEJBManagedInverses.java | 4 +- .../kernel/TestEJBNoPersistentFields.java | 7 +- .../persistence/kernel/TestEJBNullValues.java | 4 +- .../kernel/TestEJBObjectCollections.java | 6 +- .../kernel/TestEJBRetainValues.java | 5 +- .../persistence/kernel/TestEJBState.java | 5 +- .../kernel/TestEJBTransactionalClass.java | 3 +- .../kernel/TestEJBTransactions.java | 3 + .../persistence/kernel/TestExtents.java | 8 +- .../persistence/kernel/TestExtents2.java | 8 +- .../persistence/kernel/TestFetchGroups.java | 14 +- .../kernel/TestFetchGroupsExtent.java | 12 +- .../kernel/TestFetchGroupsQuery.java | 10 +- .../persistence/kernel/TestFetchPlan.java | 10 +- .../persistence/kernel/TestFieldRange.java | 9 +- .../persistence/kernel/TestFieldRange2.java | 9 +- .../persistence/kernel/TestFieldState.java | 8 +- .../kernel/TestGetObjectsById.java | 4 +- .../kernel/TestIncrementalFlushes.java | 13 +- .../kernel/TestIncrementalFlushesDeletes.java | 9 +- .../kernel/TestIndirectRecursion.java | 1 + .../persistence/kernel/TestInheritance.java | 8 +- .../kernel/TestInitialValueFetching.java | 12 +- .../kernel/TestInitializeEagerly.java | 1 + .../kernel/TestInstanceCallbacks.java | 6 +- .../persistence/kernel/TestMultiThreaded.java | 6 +- .../TestMultipleInsertDeleteSameId.java | 1 + .../openjpa/persistence/kernel/TestNTW.java | 4 +- .../kernel/TestOpenResultsCommit.java | 8 +- .../kernel/TestOptimisticLockGroups.java | 4 +- .../persistence/kernel/TestPCClass.java | 8 +- .../persistence/kernel/TestPMMemory.java | 13 +- .../kernel/TestPersistenceManager.java | 16 +- .../TestPersistenceManagerFactoryImpl.java | 12 +- .../kernel/TestPersistentMaps.java | 10 +- .../kernel/TestPessimisticLockException.java | 1 + .../kernel/TestPessimisticLocking.java | 18 +- ...joWithoutAnnotationsCannotBePersisted.java | 1 + .../persistence/kernel/TestProxies2.java | 4 +- .../persistence/kernel/TestQueries.java | 1 + .../persistence/kernel/TestRestoreValues.java | 7 +- .../kernel/TestRetainValuesInOptimistic.java | 6 +- .../kernel/TestSavepointEmbedded.java | 7 +- .../kernel/TestSavepointEmbeddedPreFlush.java | 2 + .../kernel/TestSavepointOrdering.java | 30 +- .../persistence/kernel/TestSavepoints.java | 13 +- .../kernel/TestSecondClassValues.java | 12 +- .../kernel/TestSecurityContext.java | 48 +- .../persistence/kernel/TestSequence.java | 4 +- .../persistence/kernel/TestSerialize.java | 4 +- .../persistence/kernel/TestSimple.java | 10 +- .../kernel/TestSpecialNumbers.java | 9 +- .../kernel/TestSpecialNumbers2.java | 13 +- .../kernel/TestStateManagerImplData.java | 6 +- .../kernel/TestStaticInnerClasses.java | 2 + .../persistence/kernel/TestStoreBlob.java | 4 +- .../kernel/TestSuppressBatchOLE.java | 2 +- .../persistence/kernel/TestTransition2.java | 8 +- .../kernel/common/apps/AImplB.java | 6 + .../persistence/kernel/common/apps/AIntf.java | 4 +- .../kernel/common/apps/AllFieldTypesTest.java | 4 + .../kernel/common/apps/AllFieldsTypeTest.java | 3 + .../kernel/common/apps/AppIdClassString.java | 3 + .../kernel/common/apps/AppIdHolder.java | 1 + .../kernel/common/apps/AppIdSubA.java | 6 + .../kernel/common/apps/AppIdSubB.java | 7 + .../kernel/common/apps/AppIdSuper.java | 5 + .../kernel/common/apps/ArraysTest.java | 3 + .../kernel/common/apps/AttachA.java | 4 + .../kernel/common/apps/AttachB.java | 6 +- .../kernel/common/apps/AttachC.java | 3 + .../kernel/common/apps/AttachD.java | 7 +- .../kernel/common/apps/AttachE.java | 4 + .../kernel/common/apps/AttachF.java | 4 + .../kernel/common/apps/AttachVersionA.java | 1 + .../persistence/kernel/common/apps/Blobs.java | 1 + .../kernel/common/apps/CalendarFields.java | 1 + .../kernel/common/apps/ComplexEmbeddedPC.java | 3 +- .../kernel/common/apps/DateVersion.java | 1 + .../kernel/common/apps/DependentFieldsPC.java | 2 +- .../kernel/common/apps/DetachSMPC.java | 6 +- .../kernel/common/apps/EmbeddedOwnerPC.java | 3 + .../kernel/common/apps/Entity1.java | 2 + .../kernel/common/apps/Entity2.java | 6 +- .../common/apps/FetchGroupTestObject.java | 1 + .../persistence/kernel/common/apps/Inner.java | 2 +- .../kernel/common/apps/InterfaceHolder.java | 5 + .../kernel/common/apps/InterfaceTest.java | 4 +- .../kernel/common/apps/InterfaceTest2.java | 4 +- .../common/apps/InterfaceTestImpl1.java | 6 +- .../common/apps/InterfaceTestImpl2.java | 5 + .../common/apps/InterfaceTestImpl3.java | 4 + .../common/apps/InterfaceTestImpl4.java | 4 + .../kernel/common/apps/InverseA.java | 1 + .../kernel/common/apps/InverseB.java | 1 + .../persistence/kernel/common/apps/Lobs.java | 1 + .../kernel/common/apps/LockGroupPC.java | 3 + .../kernel/common/apps/LockGroupPC2.java | 1 + .../common/apps/LockGroupPCKnownSubclass.java | 2 + .../kernel/common/apps/ManagedInterface.java | 30 +- .../common/apps/ManagedInterfaceAppId.java | 30 +- .../common/apps/ManagedInterfaceEmbed.java | 4 +- .../common/apps/ManagedInterfaceSup.java | 4 +- .../common/apps/ManagedInterfaceSupAppId.java | 17 +- .../kernel/common/apps/MapElementIntf.java | 2 +- .../kernel/common/apps/MapElementPC.java | 4 + .../kernel/common/apps/MapElementPCChild.java | 3 + .../kernel/common/apps/MixedInterface.java | 4 +- .../common/apps/MixedInterfaceImpl.java | 2 + .../kernel/common/apps/ModRuntimeTest1.java | 4 +- .../kernel/common/apps/ModRuntimeTest2.java | 1 + .../common/apps/NonMappedInterface.java | 4 +- .../common/apps/NonMappedInterfaceImpl.java | 2 + .../common/apps/ObjectCollectionHolder.java | 1 + .../kernel/common/apps/PCClassPC.java | 4 + .../kernel/common/apps/PCCompany.java | 1 + .../kernel/common/apps/PCDepartment.java | 1 + .../kernel/common/apps/PCDirectory.java | 7 +- .../kernel/common/apps/PCFile.java | 6 +- .../kernel/common/apps/PCPerson.java | 1 + .../common/apps/PersistentMapHolder.java | 25 +- .../kernel/common/apps/ProxiesPC.java | 4 +- .../kernel/common/apps/RuntimeTest1.java | 4 +- .../kernel/common/apps/RuntimeTest2.java | 1 + .../kernel/common/apps/RuntimeTest3.java | 2 + .../kernel/common/apps/RuntimeTest4.java | 1 + .../kernel/common/apps/SCOTest.java | 3 +- .../kernel/common/apps/SequenceAssigned.java | 8 +- .../kernel/common/apps/SequenceAssigned3.java | 8 +- .../kernel/common/apps/SingleId.java | 8 +- .../kernel/common/apps/SingleIdByte.java | 4 + .../kernel/common/apps/SingleIdChar.java | 4 + .../kernel/common/apps/SingleIdInt.java | 4 + .../kernel/common/apps/SingleIdLong.java | 4 + .../kernel/common/apps/SingleIdShort.java | 4 + .../kernel/common/apps/SingleIdString.java | 4 + .../kernel/common/apps/SingleIdWrapper.java | 4 + .../persistence/kernel/common/apps/State.java | 9 +- .../kernel/common/apps/Transition.java | 3 +- ...estMergeAndPersistWithManagedRelation.java | 1 + .../TestPessimisticPNonTransToPDirty.java | 1 + .../log/TestConnectionRetainModeWarning.java | 6 +- .../managedinterface/ManagedIface.java | 48 +- .../ManagedInterfaceEmbed.java | 4 +- .../ManagedInterfaceOwner.java | 6 +- .../managedinterface/ManagedInterfaceSup.java | 11 +- .../managedinterface/MixedInterface.java | 9 +- .../managedinterface/MixedInterfaceImpl.java | 6 +- .../managedinterface/NonMappedInterface.java | 4 +- .../NonMappedInterfaceImpl.java | 2 + .../SimpleManagedInterface.java | 11 +- .../TestManagedInterfaces.java | 19 +- .../TestSimpleManagedInterface.java | 9 +- .../openjpa/persistence/merge/Child.java | 2 +- .../openjpa/persistence/merge/Order.java | 2 +- .../openjpa/persistence/merge/Parent.java | 2 +- .../merge/TestCascadeOneToManyMerge.java | 1 + .../persistence/merge/TestLazyFields.java | 1 + .../openjpa/persistence/merge/TestMerge.java | 1 + .../merge/TestMergeDetachStateField.java | 3 +- .../persistence/merge/TestMergeNew.java | 1 + .../persistence/merge/TestMultipleMerge.java | 1 + .../persistence/merge/model/Inner.java | 2 +- .../persistence/merge/model/ToyBox.java | 4 +- .../ImplicitFieldAccessMappedSuperclass_.java | 1 + .../persistence/meta/TestClassMetaData.java | 15 +- .../persistence/meta/TestExternalValues.java | 5 +- .../persistence/meta/TestFactoryMethod.java | 1 + .../meta/TestFieldDeclarationOrder.java | 6 +- .../persistence/meta/TestMetamodel.java | 7 +- .../meta/TestNonPersistentFields.java | 5 +- .../openjpa/persistence/meta/TestOrderBy.java | 10 +- .../meta/TestPersistentClasses.java | 8 +- .../meta/TestQueryTypeAliasRegistration.java | 4 +- .../meta/TestSequenceAssigned.java | 5 +- .../persistence/meta/TestValueStrategies.java | 7 +- .../TestXMLPersistenceMetaDataSerializer.java | 15 +- .../meta/common/apps/MetaTest2.java | 1 + .../meta/common/apps/MetaTest3.java | 1 + .../meta/common/apps/MetaTest5.java | 3 + .../common/apps/NonPersistentFieldsPC.java | 1 + .../meta/common/apps/OrderByPC.java | 1 + .../meta/common/apps/RuntimeTest1.java | 4 + .../meta/common/apps/RuntimeTest2.java | 2 + .../meta/common/apps/RuntimeTest3.java | 2 + .../meta/common/apps/SequenceAssigned.java | 5 + .../meta/common/apps/SequenceAssigned3.java | 5 + .../models/company/CompanyModelTest.java | 26 +- .../persistence/models/company/IAddress.java | 20 +- .../persistence/models/company/ICompany.java | 18 +- .../persistence/models/company/ICustomer.java | 14 +- .../persistence/models/company/IEmployee.java | 18 +- .../models/company/IFullTimeEmployee.java | 4 +- .../persistence/models/company/ILineItem.java | 8 +- .../models/company/IPartTimeEmployee.java | 8 +- .../persistence/models/company/IPerson.java | 12 +- .../persistence/models/company/IProduct.java | 18 +- .../models/company/IProductOrder.java | 19 +- .../models/company/basic/Address.java | 17 +- .../models/company/basic/Company.java | 29 +- .../models/company/basic/Customer.java | 21 +- .../models/company/basic/Employee.java | 20 +- .../company/basic/FullTimeEmployee.java | 8 +- .../models/company/basic/LineItem.java | 13 +- .../company/basic/PartTimeEmployee.java | 10 +- .../models/company/basic/Person.java | 17 +- .../models/company/basic/Product.java | 23 +- .../models/company/basic/ProductOrder.java | 26 +- .../company/basic/TestBasicCompanyModel.java | 2 +- .../models/company/fetchlazy/Address.java | 18 +- .../models/company/fetchlazy/Company.java | 30 +- .../models/company/fetchlazy/Customer.java | 22 +- .../models/company/fetchlazy/Employee.java | 21 +- .../company/fetchlazy/FullTimeEmployee.java | 9 +- .../models/company/fetchlazy/LineItem.java | 14 +- .../company/fetchlazy/PartTimeEmployee.java | 11 +- .../models/company/fetchlazy/Person.java | 18 +- .../models/company/fetchlazy/Product.java | 24 +- .../company/fetchlazy/ProductOrder.java | 27 +- .../fetchlazy/TestLazyCompanyModel.java | 2 +- .../models/company/idclass/Address.java | 17 +- .../models/company/idclass/Company.java | 29 +- .../models/company/idclass/Customer.java | 21 +- .../models/company/idclass/Employee.java | 20 +- .../company/idclass/FullTimeEmployee.java | 8 +- .../models/company/idclass/LineItem.java | 13 +- .../company/idclass/PartTimeEmployee.java | 10 +- .../models/company/idclass/Person.java | 17 +- .../models/company/idclass/Product.java | 23 +- .../models/company/idclass/ProductOrder.java | 26 +- .../idclass/TestIdClassCompanyModel.java | 2 +- .../models/company/joined/Address.java | 17 +- .../models/company/joined/Company.java | 29 +- .../models/company/joined/Customer.java | 23 +- .../models/company/joined/Employee.java | 22 +- .../company/joined/FullTimeEmployee.java | 10 +- .../models/company/joined/LineItem.java | 13 +- .../company/joined/PartTimeEmployee.java | 12 +- .../models/company/joined/Person.java | 17 +- .../models/company/joined/Product.java | 23 +- .../models/company/joined/ProductOrder.java | 26 +- .../joined/TestJoinedCompanyModel.java | 2 +- .../persistence/models/library/Book.java | 24 +- .../persistence/models/library/Borrower.java | 22 +- .../persistence/models/library/Subject.java | 19 +- .../persistence/models/library/Volunteer.java | 10 +- .../nullity/TestBasicFieldNullity.java | 1 + .../nullity/TestReadOnlyNullity.java | 1 + .../property/EmbeddableAddress.java | 13 + .../persistence/property/EntityContact.java | 9 + .../persistence/property/IAddress.java | 24 +- .../persistence/property/IContact.java | 16 +- .../persistence/property/TestAccessMods.java | 1 + .../persistence/property/TestCompatible.java | 1 + .../persistence/proxy/AbstractEntity.java | 4 +- .../persistence/proxy/TestDetachMerge.java | 21 +- .../proxy/TestEntitySerialize.java | 1 + .../proxy/TestProxyCollection.java | 3 +- .../openjpa/persistence/proxy/TreeNode.java | 7 +- .../DelayedProxyCollectionsTestCase.java | 9 +- .../persistence/proxy/delayed/IAccount.java | 12 +- .../proxy/delayed/IDepartment.java | 24 +- .../persistence/proxy/delayed/IEmployee.java | 12 +- .../persistence/proxy/delayed/IMember.java | 8 +- .../proxy/delayed/IUserIdentity.java | 8 +- .../proxy/delayed/alist/Account.java | 6 + .../proxy/delayed/alist/Employee.java | 7 + .../proxy/delayed/alist/Member.java | 4 + .../alist/TestDelayedArrayListProxy.java | 22 +- .../proxy/delayed/alist/UserIdentity.java | 4 + .../proxy/delayed/hset/Account.java | 6 + .../proxy/delayed/hset/Employee.java | 7 + .../proxy/delayed/hset/Member.java | 4 + .../delayed/hset/TestDelayedHashSetProxy.java | 22 +- .../proxy/delayed/hset/UserIdentity.java | 4 + .../proxy/delayed/lhset/Account.java | 6 + .../proxy/delayed/lhset/Employee.java | 7 + .../proxy/delayed/lhset/Member.java | 4 + .../lhset/TestDelayedLinkedHashSetProxy.java | 22 +- .../proxy/delayed/lhset/UserIdentity.java | 4 + .../proxy/delayed/llist/Account.java | 6 + .../proxy/delayed/llist/Employee.java | 7 + .../proxy/delayed/llist/Member.java | 4 + .../llist/TestDelayedLinkedListProxy.java | 22 +- .../proxy/delayed/llist/UserIdentity.java | 4 + .../proxy/delayed/pqueue/Account.java | 6 + .../proxy/delayed/pqueue/Employee.java | 7 + .../proxy/delayed/pqueue/Member.java | 4 + .../pqueue/TestDelayedPriorityQueueProxy.java | 24 +- .../proxy/delayed/pqueue/UserIdentity.java | 4 + .../proxy/delayed/tset/Account.java | 6 + .../proxy/delayed/tset/Employee.java | 7 + .../proxy/delayed/tset/Member.java | 4 + .../delayed/tset/TestDelayedTreeSetProxy.java | 22 +- .../proxy/delayed/tset/UserIdentity.java | 4 + .../proxy/delayed/vec/Account.java | 6 + .../proxy/delayed/vec/Employee.java | 7 + .../persistence/proxy/delayed/vec/Member.java | 4 + .../delayed/vec/TestDelayedVectorProxy.java | 22 +- .../proxy/delayed/vec/UserIdentity.java | 4 + .../persistence/proxy/entities/Address.java | 36 +- .../persistence/proxy/entities/Annuity.java | 29 +- .../proxy/entities/AnnuityHolder.java | 6 +- .../entities/AnnuityPersistebleObject.java | 12 +- .../proxy/entities/Configrable.java | 4 +- .../persistence/proxy/entities/Contact.java | 24 +- .../proxy/entities/EquityAnnuity.java | 10 +- .../proxy/entities/FixedAnnuity.java | 6 +- .../persistence/proxy/entities/IAddress.java | 24 +- .../persistence/proxy/entities/IAnnuity.java | 40 +- .../proxy/entities/IAnnuityHolder.java | 4 +- .../proxy/entities/IAnnuityObject.java | 4 +- .../persistence/proxy/entities/IContact.java | 16 +- .../proxy/entities/IEquityAnnuity.java | 8 +- .../proxy/entities/IFixedAnnuity.java | 4 +- .../persistence/proxy/entities/IPayor.java | 4 +- .../persistence/proxy/entities/IPayout.java | 16 +- .../persistence/proxy/entities/IPerson.java | 28 +- .../persistence/proxy/entities/IRider.java | 12 +- .../proxy/entities/Identifiable.java | 4 +- .../proxy/entities/Parameterizable.java | 12 +- .../persistence/proxy/entities/Payor.java | 6 +- .../persistence/proxy/entities/Payout.java | 24 +- .../persistence/proxy/entities/Person.java | 42 +- .../persistence/proxy/entities/Rider.java | 18 +- .../proxy/entities/StringParameterizable.java | 20 +- .../TestOpenJPASchemaPUDefault.java | 2 + .../pudefaults/TestSchemaPUDefault.java | 2 + .../persistence/query/BaseQueryTest.java | 1 - .../openjpa/persistence/query/Customer.java | 30 +- .../persistence/query/GroupingTestCase.java | 6 +- .../openjpa/persistence/query/Magazine.java | 7 +- .../persistence/query/ManyOneEntity.java | 4 + .../persistence/query/ManyOneEntitySub.java | 2 + .../openjpa/persistence/query/Order.java | 19 +- .../openjpa/persistence/query/OrderItem.java | 9 +- .../openjpa/persistence/query/Publisher.java | 5 +- .../persistence/query/SimpleEntity.java | 3 + .../query/Test1x1OrderByResultCollection.java | 3 +- .../query/TestAbstractSchemaName.java | 4 +- .../query/TestAccessPathsOfSubqueries.java | 7 +- .../persistence/query/TestComplexQueries.java | 5 +- .../query/TestDataStoreActions.java | 2 +- .../query/TestDistinctQueries.java | 13 +- .../TestDoubleQuotedStringLiteralInJPQL.java | 1 + .../persistence/query/TestDupNamedQuery.java | 5 +- .../query/TestEJBDeleteUpdateImpl.java | 4 +- .../query/TestEJBPolymorphicQuery.java | 4 +- .../query/TestEJBQueryInterface.java | 4 +- .../query/TestEscapedSingleQuotesInJPQL.java | 6 +- .../query/TestInMemoryQueryMatchEscapes.java | 3 +- .../persistence/query/TestJDBCEscapeDate.java | 5 +- .../query/TestJPAQuerySubclassFunc.java | 6 +- ...TestJPQLWithoutIdentificationVariable.java | 1 + .../openjpa/persistence/query/TestLocate.java | 1 + .../persistence/query/TestMathQueries.java | 6 +- .../persistence/query/TestNamedQueries.java | 8 +- .../query/TestNewEntityAsQueryParameter.java | 6 +- .../query/TestNewlinesInQueries.java | 1 + .../persistence/query/TestOutOfBoundsEx.java | 3 +- ...estProjectionQueryWithIdenticalResult.java | 1 + .../query/TestQueryEscapeCharacters.java | 2 + .../query/TestQueryExcludingSubclasses.java | 5 +- .../query/TestQueryExpressionSplit.java | 3 - .../TestQueryIdOfRelationDoesNotJoin.java | 5 +- .../persistence/query/TestQueryLock.java | 1 + .../query/TestQueryPagination.java | 2 + .../query/TestQueryParameters.java | 2 +- .../query/TestQueryResultClassAPI.java | 3 +- .../persistence/query/TestQueryResults.java | 8 +- .../persistence/query/TestQueryTimeout.java | 4 +- .../query/TestQuotedNumbersInFilters2.java | 5 +- .../query/TestResultSetMapping.java | 5 +- .../openjpa/persistence/query/TestSimple.java | 3 +- .../persistence/query/TestSubquery.java | 1 + .../persistence/query/TestSubstring.java | 1 + .../query/TestTimeoutException.java | 5 +- .../persistence/query/TestWildCardCount.java | 1 + .../persistence/query/TupleQueryTest.java | 10 +- .../query/common/apps/ComplexA.java | 1 + .../query/common/apps/ComplexB.java | 1 + .../query/common/apps/ComplexC.java | 1 + .../query/common/apps/ComplexD.java | 1 + .../query/common/apps/ComplexE.java | 1 + .../query/common/apps/ComplexF.java | 1 + .../query/common/apps/ComplexG.java | 1 + .../query/common/apps/CompoundAppIdPC.java | 4 + .../query/common/apps/Entity1.java | 2 + .../query/common/apps/Entity2.java | 6 +- .../query/common/apps/ModRuntimeTest1.java | 2 + .../query/common/apps/ModRuntimeTest2.java | 1 + .../persistence/query/common/apps/Osoba.java | 2 +- .../query/common/apps/Projekt.java | 2 +- .../query/common/apps/QueryTest1.java | 1 + .../query/common/apps/QueryTest2.java | 1 + .../query/common/apps/QueryTest4.java | 1 + .../query/common/apps/RuntimeTest1.java | 4 + .../query/common/apps/RuntimeTest2.java | 1 + .../query/common/apps/RuntimeTest3.java | 2 + .../query/common/apps/RuntimeTest4.java | 1 + .../TestJPQLMultiSelectTypedResults.java | 2 + .../results/TestListResultSerialization.java | 7 +- .../query/results/TestResultSetMapping.java | 1 + .../CrtRequisicaoChequePersEntity.java | 1 - .../sqlresultmapping/CrtRequisicaoEntity.java | 2 - .../TestSQLResultSetMapping.java | 5 +- .../persistence/querycache/QCEntityM2O.java | 2 - .../querycache/TestQueryCache.java | 1 + .../TestQueryCacheWithDataCache.java | 3 +- .../querycache/TestQuerySQLCache.java | 1 + .../apps/BidirectionalOne2OneOwned.java | 10 +- .../apps/BidirectionalOne2OneOwner.java | 8 +- .../querycache/common/apps/Entity1.java | 2 + .../querycache/common/apps/Entity2.java | 6 +- .../apps/UnidirectionalOne2OneOwned.java | 9 +- .../apps/UnidirectionalOne2OneOwner.java | 10 +- .../openjpa/persistence/recursive/Node.java | 2 +- .../recursive/TestRecursiveRelationships.java | 1 + .../openjpa/persistence/relations/AText.java | 2 +- .../persistence/relations/BidiChild.java | 3 + .../persistence/relations/BidiParent.java | 5 +- .../openjpa/persistence/relations/C.java | 2 +- .../openjpa/persistence/relations/CM.java | 2 +- .../relations/CascadingOneManyParent.java | 2 +- .../persistence/relations/ChainEntityA.java | 4 +- .../persistence/relations/ChainEntityB.java | 4 +- .../relations/ChildChildClass.java | 6 +- .../persistence/relations/ChildClass.java | 6 +- .../relations/ConcurrentEntityRight.java | 2 +- .../persistence/relations/Customer.java | 20 +- .../openjpa/persistence/relations/E.java | 4 +- .../relations/EmbeddableWithRelation.java | 2 +- .../relations/EntityA1InverseEager.java | 2 +- .../relations/EntityA2InverseEager.java | 2 +- .../relations/EntityAInverseEager.java | 2 +- .../relations/GrandChildClass.java | 7 +- .../relations/HandlerCollectionInstance.java | 3 +- .../HandlerToHandlerMapInstance.java | 3 +- .../HandlerToRelationMapInstance.java | 3 +- .../openjpa/persistence/relations/IFace.java | 2 +- .../relations/IdOrderedOneManyParent.java | 4 +- .../InheritanceHierarchyAbstract.java | 3 + .../InheritanceHierarchyConcrete.java | 4 +- .../persistence/relations/LRSEntity.java | 5 +- .../relations/ManyOneCompoundIdOwnerId.java | 16 +- .../persistence/relations/MapKeyChild.java | 3 + .../persistence/relations/MapKeyParent.java | 3 + .../relations/MultipleSameTypedEmbedded.java | 2 +- .../relations/OneManyEagerParent.java | 4 +- .../openjpa/persistence/relations/Order.java | 1 + .../persistence/relations/ParentClass.java | 4 +- .../RelationToHandlerMapInstance.java | 3 +- .../RelationToRelationMapInstance.java | 3 +- .../TargetedIFaceRelationParent.java | 1 + .../persistence/relations/TblChild.java | 2 +- .../persistence/relations/TblParent.java | 2 +- .../TestBulkUpdatesAndEmbeddedFields.java | 1 + .../TestCascadingOneManyWithForeignKey.java | 5 +- .../relations/TestChainEntities.java | 3 +- .../relations/TestConcurrentMap.java | 3 +- .../relations/TestEagerBidiSQL.java | 6 +- .../relations/TestHandlerCollections.java | 1 + .../relations/TestHandlerToHandlerMaps.java | 1 + .../relations/TestHandlerToRelationMaps.java | 1 + .../relations/TestIdOrderedOneMany.java | 4 +- .../relations/TestIncompleteRelationship.java | 3 +- .../relations/TestInverseEagerSQL.java | 5 +- .../relations/TestInverseManager.java | 1 + .../TestJoinedInheritanceHierarchy.java | 3 +- ...stJoinedInheritanceHierarchyWithCache.java | 3 +- .../TestJoinedMultiInheritanceHierarchy.java | 1 + .../persistence/relations/TestLRS.java | 5 +- .../relations/TestLazyManyToOne.java | 5 +- .../relations/TestManyEagerSQL.java | 5 +- .../relations/TestManyOneAsId.java | 4 +- .../relations/TestMapCollectionToBlob.java | 1 + ...leSameTypedEmbeddedWithEagerRelations.java | 5 +- .../relations/TestO2ORefColumn.java | 5 +- .../relations/TestOneOneNulls.java | 5 +- .../TestOneToManyWithEagerLazyFetch.java | 4 +- .../relations/TestParallelEagerMap.java | 3 +- ...elationFieldAsPrimaryKeyAndForeignKey.java | 10 +- .../relations/TestRelationOrphanRemoval.java | 1 + .../relations/TestRelationToHandlerMaps.java | 1 + .../relations/TestRelationToRelationMaps.java | 1 + .../relations/TestTargetedIFaceRelations.java | 4 +- .../relations/UnidirectionalManyToOne.java | 6 +- .../persistence/relations/Util1xmLf.java | 4 +- .../openjpa/persistence/relations/VC.java | 5 +- .../openjpa/persistence/relations/VCS.java | 2 +- .../IncompleteRelationshipChildEntity.java | 1 + .../relations/entity/LrsEntityA.java | 6 +- .../results/cls/TestResultClsAnnotation.java | 1 + .../results/cls/TestResultClsXml.java | 2 + .../persistence/sequence/TestSequence.java | 10 +- .../sequence/TestSequenceGenerationOnMT.java | 4 +- .../sequence/hsql/TestHSQLSequence.java | 1 + .../persistence/simple/AllFieldTypes.java | 11 +- .../persistence/simple/SubclassPerson.java | 4 +- .../simple/TemporalFieldTypes.java | 1 + .../simple/TestBasicAnnotation.java | 4 +- .../TestCaseInsensitiveKeywordsInJPQL.java | 3 +- .../simple/TestEntityManagerClear.java | 7 +- .../simple/TestEntityManagerMerge.java | 4 +- ...stEntityManagerMethodsThrowAfterClose.java | 4 +- .../simple/TestFlushBeforeDetach.java | 3 +- .../openjpa/persistence/simple/TestJoin.java | 1 + .../simple/TestMissingMetaData.java | 10 +- .../persistence/simple/TestPersistence.java | 4 +- .../simple/TestPropertiesMethods.java | 3 +- .../persistence/simple/TestRefresh.java | 5 +- .../simple/TestSerializedFactory.java | 11 +- .../TestSubclassOfAbstractSuperclass.java | 4 +- .../TestTableNamesDefaultToEntityNames.java | 1 + .../persistence/spring/LibService.java | 13 +- .../persistence/spring/LibServiceImpl.java | 12 +- .../persistence/spring/LibTestingService.java | 8 +- .../persistence/spring/TestLibService.java | 14 +- .../TransactionalEntityManagerFactory.java | 2 +- .../value/PrincipalValueStrategyHandler.java | 4 + .../value/TestImplicitValueStrategy.java | 3 +- .../strategy/value/TestValueStrategy.java | 1 + .../strategy/value/ValueStrategyHandler.java | 6 +- .../temporal/TestTemporalTimestamp.java | 1 + .../test/AbstractCachedEMFTestCase.java | 4 +- .../test/AbstractPersistenceTestCase.java | 16 +- .../persistence/test/AllowFailure.java | 7 +- .../persistence/test/ClassSelector.java | 10 +- .../CombinatorialPersistenceTestCase.java | 8 +- .../test/CombinatorialTestHelper.java | 4 +- .../persistence/test/DatabasePlatform.java | 2 +- .../test/FilteringJDBCListener.java | 4 +- .../persistence/test/JPAEntityClassEnum.java | 4 +- .../persistence/test/PersistenceTestCase.java | 19 +- .../persistence/test/SQLListenerTestCase.java | 2 +- .../persistence/test/SingleEMFTestCase.java | 2 + .../persistence/test/SingleEMTestCase.java | 1 + .../persistence/util/TestJPAFacadeHelper.java | 1 + .../util/TestPersistenceUnitUtil.java | 9 +- .../persistence/util/TestPersistenceUtil.java | 3 +- .../persistence/util/TestProviderUtil.java | 9 +- .../openjpa/persistence/util/ToManyEager.java | 2 +- .../validation/TestValidationFactory.java | 6 +- .../validation/TestValidationMode.java | 8 +- .../xml/TestPersistenceUnitWithoutXSD.java | 4 +- .../xml/TestSchemaVersionValidation.java | 4 +- .../persistence/xml/TestSimpleXmlEntity.java | 2 + .../xml/TestXmlOverrideEntity.java | 2 + .../xmlmapping/entities/Customer.java | 22 +- .../xmlmapping/entities/EAddress.java | 3 +- .../xmlmapping/entities/Order.java | 11 +- .../query/TestXMLCustomerOrder.java | 7 +- .../xmlbindings/myaddress/Address.java | 4 +- .../xmlbindings/myaddress/CANAddress.java | 1 + .../xmlbindings/myaddress/GBRAddress.java | 1 + .../xmlbindings/myaddress/ObjectFactory.java | 8 +- .../xmlbindings/myaddress/USAAddress.java | 1 + .../persistence/xs/AccountingHierarchy.java | 2 +- .../xs/AccountingHierarchyRateOpenJPAKey.java | 13 +- .../persistence/lock/extended/LSE1x1Lf.java | 3 + .../persistence/lock/extended/LSE1x1LfJT.java | 3 + .../lock/extended/LSE1x1LfJTLzy.java | 3 + .../lock/extended/LSE1x1LfLzy.java | 3 + .../persistence/lock/extended/LSE1x1Rt.java | 3 + .../persistence/lock/extended/LSE1xmLf.java | 5 +- .../lock/extended/LSE1xmLfEgr.java | 5 +- .../persistence/lock/extended/LSE1xmLfJT.java | 5 +- .../lock/extended/LSE1xmLfJTEgr.java | 5 +- .../persistence/lock/extended/LSE1xmRt.java | 3 + .../persistence/lock/extended/LSEBase.java | 3 + .../persistence/lock/extended/LSEEleCol.java | 5 +- .../lock/extended/LSEEleColEgr.java | 5 +- .../persistence/lock/extended/LSEJoinAbs.java | 3 + .../persistence/lock/extended/LSEJoinCon.java | 3 + .../persistence/lock/extended/LSESecTbl.java | 3 + .../lock/extended/LSESngTblAbs.java | 3 + .../lock/extended/LSESngTblCon.java | 3 + .../lock/extended/LockScopeTestCase.java | 19 +- .../lock/extended/Test1x1LockScope.java | 25 + .../lock/extended/Test1xmLockScope.java | 25 + .../lock/extended/TestBasicLockScope.java | 37 ++ .../persistence/lockmgr/Department.java | 3 + .../openjpa/persistence/lockmgr/Employee.java | 3 + .../persistence/lockmgr/LockEmployee.java | 3 + .../lockmgr/LockEmployeeNonVersion.java | 3 + .../lockmgr/MixedLockManagerGenericTest.java | 1 + .../openjpa/persistence/lockmgr/Person.java | 3 + .../lockmgr/SequencedActionsTest.java | 13 +- .../persistence/lockmgr/TestEmLockMode.java | 1 + .../lockmgr/TestEmLockTimeout.java | 3 +- .../persistence/lockmgr/TestFetchHints.java | 90 +-- .../persistence/lockmgr/TestLocking.java | 3 +- .../lockmgr/TestMixedLockManagerDeadlock.java | 3 +- .../TestMixedLockManagerFindBasic.java | 1 + .../TestMixedLockManagerFindException.java | 1 + .../TestMixedLockManagerFindPermutation.java | 1 + .../TestMixedLockManagerLockBasic.java | 1 + .../TestMixedLockManagerLockException.java | 1 + .../TestMixedLockManagerLockPermutation.java | 1 + .../TestMixedLockManagerNonVersion.java | 2 + .../TestMixedLockManagerRefreshBasic.java | 1 + .../TestMixedLockManagerRefreshException.java | 1 + ...estMixedLockManagerRefreshPermutation.java | 1 + .../lockmgr/TestNamedQueryLockMode.java | 1 + .../TestOptimisticNamedQueryLockMode.java | 1 + .../lockmgr/TestPessimisticLocks.java | 21 +- .../openjpa/persistence/AbstractQuery.java | 42 +- .../persistence/AnnotationBuilder.java | 17 +- .../AnnotationPersistenceMetaDataParser.java | 19 +- ...notationPersistenceMetaDataSerializer.java | 60 +- ...nnotationPersistenceXMLMetaDataParser.java | 3 +- .../persistence/ArgumentException.java | 15 +- .../apache/openjpa/persistence/DataCache.java | 3 +- .../openjpa/persistence/DataStoreId.java | 4 +- .../apache/openjpa/persistence/Dependent.java | 3 +- .../openjpa/persistence/DetachedState.java | 3 +- .../openjpa/persistence/ElementDependent.java | 3 +- .../openjpa/persistence/ElementType.java | 3 +- .../persistence/EntityExistsException.java | 12 + .../persistence/EntityManagerFactoryImpl.java | 41 +- .../EntityManagerFactoryValue.java | 2 + .../persistence/EntityManagerImpl.java | 218 ++++++- .../persistence/EntityNotFoundException.java | 12 + .../apache/openjpa/persistence/Extent.java | 18 +- .../openjpa/persistence/ExtentImpl.java | 12 + .../openjpa/persistence/ExternalValues.java | 3 +- .../openjpa/persistence/Externalizer.java | 3 +- .../apache/openjpa/persistence/Factory.java | 3 +- .../openjpa/persistence/FetchAttribute.java | 3 +- .../openjpa/persistence/FetchGroup.java | 3 +- .../openjpa/persistence/FetchGroups.java | 3 +- .../apache/openjpa/persistence/FetchPlan.java | 112 ++-- .../openjpa/persistence/FetchPlanImpl.java | 61 +- .../apache/openjpa/persistence/Generator.java | 18 +- .../openjpa/persistence/GeneratorImpl.java | 7 + .../openjpa/persistence/HintHandler.java | 2 +- .../persistence/HintValueConverter.java | 8 + .../persistence/InvalidStateException.java | 14 +- .../openjpa/persistence/InverseLogical.java | 3 +- .../openjpa/persistence/JPAProperties.java | 4 +- .../openjpa/persistence/KeyDependent.java | 3 +- .../apache/openjpa/persistence/KeyType.java | 3 +- .../org/apache/openjpa/persistence/LRS.java | 3 +- .../openjpa/persistence/LoadFetchGroup.java | 3 +- .../persistence/LockTimeoutException.java | 12 +- .../openjpa/persistence/ManagedInterface.java | 3 +- .../persistence/MixedLockLevelsHelper.java | 22 +- .../persistence/NoResultException.java | 12 + .../persistence/NonUniqueResultException.java | 12 + .../persistence/OpenJPAEntityManager.java | 362 +++++------ .../OpenJPAEntityManagerFactory.java | 38 +- .../OpenJPAEntityManagerFactorySPI.java | 14 +- .../persistence/OpenJPAEntityManagerSPI.java | 28 +- .../persistence/OpenJPAEntityTransaction.java | 8 +- .../persistence/OpenJPAPersistence.java | 15 + .../persistence/OpenJPAPersistenceUtil.java | 2 +- .../openjpa/persistence/OpenJPAQuery.java | 96 +-- .../openjpa/persistence/OpenJPAQuerySPI.java | 10 +- .../persistence/OptimisticLockException.java | 12 + .../openjpa/persistence/ParameterImpl.java | 4 + .../persistence/PersistenceException.java | 12 + .../persistence/PersistenceExceptions.java | 16 +- .../PersistenceListenerAdapter.java | 13 +- .../PersistenceMetaDataDefaults.java | 57 +- .../PersistenceMetaDataFactory.java | 27 +- .../PersistenceProductDerivation.java | 16 +- .../persistence/PersistenceProviderImpl.java | 10 +- .../persistence/PersistenceUnitInfoImpl.java | 36 +- .../openjpa/persistence/Persistent.java | 4 +- .../persistence/PersistentCollection.java | 4 +- .../openjpa/persistence/PersistentMap.java | 4 +- .../persistence/PessimisticLockException.java | 12 +- .../apache/openjpa/persistence/QueryImpl.java | 109 ++-- .../openjpa/persistence/QueryResultCache.java | 12 +- .../persistence/QueryResultCacheImpl.java | 9 + .../persistence/QueryTimeoutException.java | 12 +- .../apache/openjpa/persistence/ReadOnly.java | 3 +- .../persistence/RollbackException.java | 13 + .../openjpa/persistence/StoreCache.java | 32 +- .../openjpa/persistence/StoreCacheImpl.java | 18 + .../persistence/StoredProcedureQueryImpl.java | 25 +- .../TransactionRequiredException.java | 12 + .../openjpa/persistence/TupleFactory.java | 3 +- .../apache/openjpa/persistence/TupleImpl.java | 7 + .../org/apache/openjpa/persistence/Type.java | 3 +- .../XMLPersistenceMetaDataParser.java | 103 +++- .../XMLPersistenceMetaDataSerializer.java | 60 +- .../criteria/CompareByExample.java | 2 +- .../persistence/criteria/ComparisonStyle.java | 12 + .../criteria/CompoundSelections.java | 18 +- .../criteria/CriteriaBuilderImpl.java | 242 ++++++-- .../criteria/CriteriaExpressionBuilder.java | 18 +- .../criteria/CriteriaExpressionVisitor.java | 6 +- .../criteria/CriteriaQueryImpl.java | 64 +- .../persistence/criteria/ExpressionImpl.java | 21 +- .../persistence/criteria/Expressions.java | 132 ++-- .../persistence/criteria/FetchPathImpl.java | 15 +- .../persistence/criteria/FromImpl.java | 44 +- .../openjpa/persistence/criteria/Joins.java | 28 +- .../criteria/OpenJPACriteriaBuilder.java | 19 +- .../criteria/OpenJPACriteriaQuery.java | 4 +- .../persistence/criteria/OrderImpl.java | 13 +- .../criteria/ParameterExpressionImpl.java | 4 + .../persistence/criteria/PathImpl.java | 19 +- .../persistence/criteria/PredicateImpl.java | 10 +- .../persistence/criteria/RootImpl.java | 3 + .../persistence/criteria/SelectionImpl.java | 9 + .../persistence/criteria/SubqueryImpl.java | 44 +- .../persistence/meta/AbstractManagedType.java | 74 ++- .../meta/AnnotationProcessor6.java | 2 +- .../openjpa/persistence/meta/Members.java | 33 +- .../persistence/meta/MetadataProcessor.java | 17 +- .../persistence/meta/MetamodelImpl.java | 41 +- .../meta/SourceAnnotationHandler.java | 34 +- .../openjpa/persistence/meta/Types.java | 14 + .../osgi/PersistenceActivator.java | 8 +- .../persistence/query/AbsExpression.java | 5 +- .../query/AbstractDomainObject.java | 182 ++++-- .../persistence/query/AbstractPath.java | 28 +- .../persistence/query/AbstractVisitable.java | 16 +- .../persistence/query/AliasContext.java | 4 +- .../persistence/query/AllExpression.java | 5 +- .../persistence/query/AndPredicate.java | 8 +- .../persistence/query/AnyExpression.java | 5 +- .../persistence/query/ArrayExpression.java | 4 +- .../persistence/query/AverageExpression.java | 5 +- .../persistence/query/BetweenExpression.java | 5 +- .../query/BinaryConditionalOperator.java | 3 +- .../query/BinaryExpressionPredicate.java | 16 +- .../query/BinaryFunctionalOperator.java | 3 +- .../query/BinaryOperatorExpression.java | 10 +- .../persistence/query/CaseExpressionImpl.java | 82 ++- .../persistence/query/ConcatExpression.java | 5 +- .../persistence/query/ConstantExpression.java | 4 +- .../persistence/query/CountExpression.java | 5 +- .../query/CurrentTimeExpression.java | 5 +- .../persistence/query/DistinctExpression.java | 5 +- .../query/DividedByExpression.java | 5 +- .../persistence/query/ElseExpression.java | 4 +- .../persistence/query/EntryExpression.java | 5 +- .../persistence/query/EqualExpression.java | 5 +- .../persistence/query/ExistsExpression.java | 5 +- .../persistence/query/ExpressionImpl.java | 307 ++++++---- .../openjpa/persistence/query/FetchPath.java | 3 + .../query/GreaterEqualExpression.java | 5 +- .../query/GreaterThanExpression.java | 5 +- .../persistence/query/InExpression.java | 5 +- .../persistence/query/IndexExpression.java | 5 +- .../persistence/query/IsEmptyExpression.java | 5 +- .../persistence/query/IsNullExpression.java | 5 +- .../openjpa/persistence/query/JoinPath.java | 6 +- .../persistence/query/KeyExpression.java | 5 +- .../persistence/query/LengthExpression.java | 5 +- .../query/LessEqualExpression.java | 5 +- .../persistence/query/LessThanExpression.java | 5 +- .../persistence/query/LikeExpression.java | 4 +- .../persistence/query/LiteralExpression.java | 5 +- .../persistence/query/LocateExpression.java | 7 +- .../persistence/query/LogicalPredicate.java | 6 + .../persistence/query/LowerExpression.java | 5 +- .../persistence/query/MaxExpression.java | 5 +- .../persistence/query/MemberOfExpression.java | 5 +- .../persistence/query/MinExpression.java | 5 +- .../persistence/query/MinusExpression.java | 5 +- .../persistence/query/ModExpression.java | 5 +- .../persistence/query/NavigationPath.java | 6 +- .../persistence/query/NewInstance.java | 13 +- .../persistence/query/NotEqualExpression.java | 5 +- .../query/OpenJPAQueryBuilder.java | 6 +- .../persistence/query/OperatorPath.java | 6 +- .../persistence/query/OrPredicate.java | 8 +- .../persistence/query/OrderableItem.java | 7 +- .../query/ParameterExpression.java | 4 +- .../persistence/query/PathOperator.java | 3 +- .../persistence/query/PlusExpression.java | 5 +- .../persistence/query/QueryBuilderImpl.java | 18 +- .../query/QueryDefinitionImpl.java | 172 ++++-- .../persistence/query/QueryExpression.java | 3 + .../persistence/query/RangeExpression.java | 5 +- .../openjpa/persistence/query/RootPath.java | 8 +- .../persistence/query/SizeExpression.java | 5 +- .../persistence/query/SomeExpression.java | 5 +- .../query/SquareRootExpression.java | 5 +- .../query/SubStringExpression.java | 7 +- .../persistence/query/SumExpression.java | 5 +- .../persistence/query/TimesExpression.java | 5 +- .../persistence/query/TrimExpression.java | 7 +- .../persistence/query/TypeExpression.java | 5 +- .../query/UnaryConditionalOperator.java | 3 +- .../query/UnaryExpressionPredicate.java | 16 +- .../query/UnaryFunctionalOperator.java | 3 +- .../query/UnaryMinusExpression.java | 5 +- .../persistence/query/UnaryOperator.java | 3 +- .../query/UnaryOperatorExpression.java | 13 +- .../persistence/query/UpperExpression.java | 5 +- .../persistence/query/ValueExpression.java | 5 +- .../persistence/query/VarArgsExpression.java | 4 +- .../persistence/util/ReservedWords.java | 2 +- .../openjpa/persistence/util/SourceCode.java | 93 +-- .../validation/TraversableResolverImpl.java | 4 +- .../persistence/validation/ValidatorImpl.java | 8 +- .../TestEnumToKernelConstantMappings.java | 11 +- .../TestPersistenceProductDerivation.java | 12 +- .../openjpa/slice/DistributedBroker.java | 1 + .../slice/DistributedBrokerFactory.java | 2 +- .../openjpa/slice/DistributedBrokerImpl.java | 6 +- .../openjpa/slice/DistributedQueryImpl.java | 2 +- .../slice/DistributedStoreManager.java | 2 +- .../openjpa/slice/DistributionPolicy.java | 1 + .../openjpa/slice/ProductDerivation.java | 10 +- .../openjpa/slice/ReentrantSliceLock.java | 2 +- .../openjpa/slice/ReplicationPolicy.java | 3 +- .../java/org/apache/openjpa/slice/Slice.java | 5 +- .../org/apache/openjpa/slice/SliceInfo.java | 4 +- .../org/apache/openjpa/slice/SliceThread.java | 1 + .../slice/jdbc/DistributedConnection.java | 105 +++- .../slice/jdbc/DistributedDataSource.java | 28 +- .../jdbc/DistributedJDBCBrokerFactory.java | 8 +- .../DistributedJDBCConfigurationImpl.java | 41 +- .../jdbc/DistributedJDBCStoreManager.java | 42 +- .../jdbc/DistributedPreparedStatement.java | 105 +++- .../slice/jdbc/DistributedResultSet.java | 409 ++++++++----- .../slice/jdbc/DistributedSQLStoreQuery.java | 40 +- .../slice/jdbc/DistributedStoreQuery.java | 41 +- .../slice/jdbc/DistributedTemplate.java | 116 ++-- .../slice/jdbc/TargetFetchConfiguration.java | 4 +- .../jdbc/UniqueResultObjectProvider.java | 9 + .../org/apache/openjpa/slice/Address.java | 7 +- .../java/org/apache/openjpa/slice/Car.java | 6 +- .../openjpa/slice/PersistenceTestCase.java | 14 +- .../java/org/apache/openjpa/slice/Person.java | 10 +- .../openjpa/slice/ReplicatedParent.java | 7 +- .../openjpa/slice/SingleEMFTestCase.java | 2 + .../apache/openjpa/slice/SliceTestCase.java | 1 + .../org/apache/openjpa/slice/TestBasic.java | 5 +- .../apache/openjpa/slice/TestBulkDelete.java | 8 +- .../openjpa/slice/TestConfiguration.java | 1 + .../org/apache/openjpa/slice/TestQuery.java | 6 +- .../openjpa/slice/TestQueryMultiThreaded.java | 15 +- .../openjpa/slice/TestQueryTargetPolicy.java | 2 + .../apache/openjpa/slice/TestReplication.java | 2 + .../apache/openjpa/slice/TestTransaction.java | 3 + .../java/org/apache/openjpa/slice/TestXA.java | 4 +- .../policy/EvenOddDistributionPolicy.java | 7 +- .../slice/policy/SampleQueryTargetPolicy.java | 1 + .../slice/policy/UserDistributionPolicy.java | 2 +- .../stats/FetchStatisticsAuxEnhancer.java | 4 +- .../enhance/stats/FetchStatsCollector.java | 8 +- .../enhance/stats/TestFetchStatistics.java | 5 +- .../maven/AbstractOpenJpaEnhancerMojo.java | 11 +- .../maven/AbstractOpenJpaMappingToolMojo.java | 2 + .../tools/maven/AbstractOpenJpaMojo.java | 4 +- .../tools/maven/OpenJpaSchemaMojo.java | 1 + .../openjpa/tools/maven/OpenJpaSqlMojo.java | 1 + .../tools/maven/OpenJpaTestEnhancerMojo.java | 3 + .../tools/maven/OpenJpaEnhancerMojoTest.java | 4 +- .../tools/maven/testentity/SampleEntity.java | 3 +- .../apache/openjpa/xmlstore/ObjectData.java | 4 +- .../openjpa/xmlstore/XMLFileHandler.java | 14 +- .../openjpa/xmlstore/XMLStoreManager.java | 13 + .../xmlstore/simple/AllFieldTypes.java | 11 +- 3476 files changed, 29036 insertions(+), 10094 deletions(-) diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java index ff2c569ce..2605fda13 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java +++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java @@ -18,18 +18,19 @@ */ package org.apache.openjpa.example.gallery.constraint; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static org.apache.openjpa.example.gallery.ImageType.GIF; +import static org.apache.openjpa.example.gallery.ImageType.JPEG; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import javax.validation.Constraint; import javax.validation.Payload; import org.apache.openjpa.example.gallery.ImageType; -import static org.apache.openjpa.example.gallery.ImageType.GIF; -import static org.apache.openjpa.example.gallery.ImageType.JPEG; /** * Type-level annotation used to specify an image constraint. Uses diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java index ee9153d07..fb663a981 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java +++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java @@ -18,19 +18,20 @@ */ package org.apache.openjpa.example.gallery.constraint; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static org.apache.openjpa.example.gallery.ImageType.GIF; +import static org.apache.openjpa.example.gallery.ImageType.JPEG; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import javax.validation.Constraint; import javax.validation.Payload; import org.apache.openjpa.example.gallery.ImageType; -import static org.apache.openjpa.example.gallery.ImageType.GIF; -import static org.apache.openjpa.example.gallery.ImageType.JPEG; /** * Attribute-level annotation used to specify an image content constraint. Uses diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java index b07ac3ed1..16eabc558 100644 --- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java +++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java @@ -37,6 +37,7 @@ public class ImageContentValidator implements ConstraintValidator _attr; public AttributeView(Attribute attr) { diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ConfigurationViewer.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ConfigurationViewer.java index 52c7accbf..c4c18428c 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ConfigurationViewer.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ConfigurationViewer.java @@ -28,14 +28,14 @@ import javax.swing.JTextPane; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class ConfigurationViewer extends JTextPane { + private static final long serialVersionUID = 1L; private static final char SPACE = ' '; public ConfigurationViewer(String title, Map config) { super(); setBorder(BorderFactory.createTitledBorder(title)); - TreeSet sortedKeys = new TreeSet(config.keySet()); + TreeSet sortedKeys = new TreeSet<>(config.keySet()); int L = getMaxLength(sortedKeys); for (String key : sortedKeys) { setCaretPosition(getDocument().getLength()); diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java index f712c00a8..927b85cbb 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java @@ -39,8 +39,8 @@ import javax.swing.table.TableModel; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class EntityDataModel extends AbstractTableModel implements TableModel, Iterable { + private static final long serialVersionUID = 1L; /** * Constant designates to include non-relation fields. */ @@ -84,10 +84,10 @@ public class EntityDataModel extends AbstractTableModel implements TableModel this.data = data; EntityType entityType = meta.entity(cls); - columnNames = new ArrayList(); - columnClasses = new ArrayList>(); - attributes = new ArrayList>(); - methods = new ArrayList(); + columnNames = new ArrayList<>(); + columnClasses = new ArrayList<>(); + attributes = new ArrayList<>(); + methods = new ArrayList<>(); showsRowCount = (styleBits & ROW_COUNT) != 0; showsBasicAttr = (styleBits & BASIC_ATTR) != 0; diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java index 48a520c2f..3434ce431 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java @@ -23,9 +23,9 @@ import javax.persistence.PersistenceUnitUtil; import javax.persistence.metamodel.Attribute; import javax.swing.DefaultCellEditor; import javax.swing.JComboBox; -import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.ListSelectionModel; +import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; @@ -48,8 +48,8 @@ import org.apache.openjpa.enhance.StateManager; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class EntityTable extends JTable { + private static final long serialVersionUID = 1L; private InstanceCellRenderer instanceCellRenderer; private CollectionCellRenderer collectionCellRenderer; @@ -59,7 +59,7 @@ public class EntityTable extends JTable { collectionCellRenderer = new CollectionCellRenderer(); setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - setModel(new EntityDataModel(cls, data, unit.getMetamodel(), styleBits)); + setModel(new EntityDataModel<>(cls, data, unit.getMetamodel(), styleBits)); getModel().addTableModelListener(this); initColumnSizes(); setFillsViewportHeight(true); @@ -74,6 +74,7 @@ public class EntityTable extends JTable { * Gets the special renderer for single- and multi-valued association. * Otherwise uses the super classes' renderer defined by the field type. */ + @Override public TableCellRenderer getCellRenderer(int row, int column) { Attribute attr = ((EntityDataModel)getModel()).getAttribute(column); TableCellRenderer renderer = null; @@ -87,12 +88,13 @@ public class EntityTable extends JTable { renderer = super.getCellRenderer(row, column); } if (renderer instanceof DefaultTableCellRenderer) { - ((DefaultTableCellRenderer)renderer).setHorizontalAlignment(JLabel.CENTER); + ((DefaultTableCellRenderer)renderer).setHorizontalAlignment(SwingConstants.CENTER); } return renderer; } + @Override public TableCellEditor getCellEditor(int row, int column) { Attribute attr = ((EntityDataModel)getModel()).getAttribute(column); if (attr == null) @@ -145,6 +147,8 @@ public class EntityTable extends JTable { * */ public class InstanceCellRenderer extends DefaultTableCellRenderer { + + private static final long serialVersionUID = 1L; private final PersistenceUnitUtil util; public InstanceCellRenderer(PersistenceUnitUtil util) { @@ -171,6 +175,7 @@ public class EntityTable extends JTable { return id == null ? "null" : id.toString(); } + @Override public void setValue(Object instance) { setForeground(Color.BLUE); setText(renderAsString(instance)); @@ -186,6 +191,8 @@ public class EntityTable extends JTable { * */ public class CollectionCellRenderer extends DefaultTableCellRenderer { + + private static final long serialVersionUID = 1L; public CollectionCellRenderer() { setPreferredSize(new Dimension(10,20)); } diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java index 0f0dac207..3f499ab90 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java @@ -28,6 +28,7 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.ListSelectionModel; +import javax.swing.ScrollPaneConstants; import javax.swing.border.Border; import javax.swing.border.TitledBorder; import javax.swing.event.ListSelectionEvent; @@ -42,18 +43,18 @@ import jpa.tools.swing.EntityTable.InstanceCellRenderer; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class EntityTableView extends JPanel implements ListSelectionListener { + private static final long serialVersionUID = 1L; private EntityTable _table; private JTextArea _details; public EntityTableView(Class cls, int styleBits, EntityManagerFactory unit) { - this(cls, (List)Collections.EMPTY_LIST, styleBits, unit); + this(cls, Collections.emptyList(), styleBits, unit); } public EntityTableView(Class cls, List data, int styleBits, EntityManagerFactory unit) { super(true); - _table = new EntityTable(cls, data, styleBits, unit); + _table = new EntityTable<>(cls, data, styleBits, unit); _table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); if ((styleBits & EntityDataModel.PLURAL_ATTR) != 0) { @@ -68,8 +69,8 @@ public class EntityTableView extends JPanel implements ListSelectionListener setLayout(new BoxLayout(this,BoxLayout.Y_AXIS)); add(new JScrollPane(_table, - JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, - JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS)); + ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS)); if (_details != null) add(_details); } diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java index 54c8b4098..14ff81e7a 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java @@ -31,8 +31,8 @@ import javax.swing.JPanel; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class EntityTypeView extends JPanel { + private static final long serialVersionUID = 1L; final EntityType type; final int hgap = 4; final int vgap = 4; diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ErrorDialog.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ErrorDialog.java index ed8fad3dc..cf87c540c 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ErrorDialog.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ErrorDialog.java @@ -32,6 +32,8 @@ import javax.swing.JEditorPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextPane; +import javax.swing.ScrollPaneConstants; +import javax.swing.WindowConstants; /** * A dialog to display runtime error. @@ -39,8 +41,8 @@ import javax.swing.JTextPane; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class ErrorDialog extends JDialog { + private static final long serialVersionUID = 1L; private static List filters = Arrays.asList( "java.awt.", "javax.swing.", @@ -87,7 +89,7 @@ public class ErrorDialog extends JDialog { setModal(true); if (icon != null && icon instanceof ImageIcon) setIconImage(((ImageIcon)icon).getImage()); - setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); _error = t; _message = createErrorMessage(_error); _main = createContent(); @@ -106,6 +108,7 @@ public class ErrorDialog extends JDialog { JComponent createContent() { final JButton showDetails = new JButton("Show Details >>"); showDetails.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { if (_showingDetails) { _main.remove(_details); @@ -133,6 +136,7 @@ public class ErrorDialog extends JDialog { final JCheckBox filter = new JCheckBox("Filter stack traces"); filter.setSelected(_isFiltering); filter.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { _isFiltering = filter.isSelected(); StringBuilder buffer = new StringBuilder(); @@ -178,8 +182,8 @@ public class ErrorDialog extends JDialog { _stacktrace = new JTextPane(); _stacktrace.setEditable(false); JScrollPane pane = new JScrollPane(_stacktrace, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); return pane; } diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/FileScanner.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/FileScanner.java index 911c813e3..1f84436f9 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/FileScanner.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/FileScanner.java @@ -36,7 +36,7 @@ public class FileScanner { * Scans the given */ public List scan(File dir) { - List bag = new ArrayList(); + List bag = new ArrayList<>(); scan(dir, bag); return bag; } diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/Finder.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/Finder.java index 4e7461097..a87ef0804 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/Finder.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/Finder.java @@ -79,6 +79,7 @@ public class Finder { private void scan(File dir, String cls) throws IOException { File[] classes = dir.listFiles(new FileFilter() { + @Override public boolean accept(File path) { return path.getName().endsWith(CLASS_SUFFIX); } @@ -91,6 +92,7 @@ public class Finder { } File[] jars = dir.listFiles(new FileFilter() { + @Override public boolean accept(File path) { return path.getName().endsWith(JAR_SUFFIX); } @@ -102,6 +104,7 @@ public class Finder { } File[] dirs = dir.listFiles(new FileFilter() { + @Override public boolean accept(File path) { return path.isDirectory(); } diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/GraphicOutputStream.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/GraphicOutputStream.java index e83cc30cf..39613e6ec 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/GraphicOutputStream.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/GraphicOutputStream.java @@ -32,7 +32,7 @@ public class GraphicOutputStream extends OutputStream { ScrollingTextPane _sink; private char[] buffer = new char[1024]; private int count; - private Map _styles = new HashMap(); + private Map _styles = new HashMap<>(); private static AttributeSet _defaultStyle = StyleContext.getDefaultStyleContext() .getStyle(StyleContext.DEFAULT_STYLE); diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/IndexedMap.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/IndexedMap.java index d2babd7ab..96867bcd9 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/IndexedMap.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/IndexedMap.java @@ -39,21 +39,24 @@ import java.util.Set; * @param */ public class IndexedMap implements Map { - private final List _keys = new ArrayList(); - private final List _values = new ArrayList(); - private final Set _nulls = new HashSet(); + private final List _keys = new ArrayList<>(); + private final List _values = new ArrayList<>(); + private final Set _nulls = new HashSet<>(); + @Override public void clear() { _keys.clear(); _values.clear(); } + @Override public boolean containsKey(Object key) { return _keys.contains(key) && !_nulls.contains(key); } + @Override public boolean containsValue(Object value) { return _values.contains(value); } @@ -61,26 +64,31 @@ public class IndexedMap implements Map { /** * Not supported. */ + @Override public Set> entrySet() { throw new UnsupportedOperationException(); } + @Override public V get(Object key) { int i = indexOf(key); return i == -1 ? null : _values.get(i); } + @Override public boolean isEmpty() { return (_keys.size() - _nulls.size()) == 0; } + @Override public Set keySet() { - Set result = new HashSet(_keys); + Set result = new HashSet<>(_keys); result.removeAll(_nulls); return result; } + @Override public V put(K key, V value) { int i = _keys.indexOf(key); if (i == -1) { @@ -93,12 +101,14 @@ public class IndexedMap implements Map { } } + @Override public void putAll(Map m) { for (K k : m.keySet()) { this.put(k, m.get(k)); } } + @Override @SuppressWarnings("unchecked") public V remove(Object key) { V v = get(key); @@ -106,12 +116,14 @@ public class IndexedMap implements Map { return v; } + @Override public int size() { return _keys.size() - _nulls.size(); } + @Override public Collection values() { - Collection result = new ArrayList(); + Collection result = new ArrayList<>(); for (int i = 0; i < _values.size(); i++) { if (!_nulls.contains(_keys.get(i))) result.add(_values.get(i)); diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java index 143433ca3..62005bc11 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java @@ -19,8 +19,8 @@ import javax.persistence.metamodel.Attribute; import javax.persistence.metamodel.EntityType; import javax.swing.table.AbstractTableModel; -@SuppressWarnings("serial") public class InstanceDataModel extends AbstractTableModel { + private static final long serialVersionUID = 1L; List> attributes; private T _instance; diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java index 6aa907113..906e4dd87 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java @@ -16,10 +16,11 @@ package jpa.tools.swing; import javax.persistence.metamodel.EntityType; import javax.swing.JTable; -@SuppressWarnings("serial") public class InstanceView extends JTable { + private static final long serialVersionUID = 1L; + public InstanceView(EntityType type, T instance) { - super(new InstanceDataModel(type, instance)); + super(new InstanceDataModel<>(type, instance)); setShowHorizontalLines(false); setShowVerticalLines(false); } diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java index 35639054e..39b401665 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java @@ -88,7 +88,7 @@ public class MetamodelHelper { public static List> getAttributes(EntityType type) { - List> list = new ArrayList>(type.getAttributes()); + List> list = new ArrayList<>(type.getAttributes()); Collections.sort(list, new AttributeComparator()); return list; } @@ -110,7 +110,7 @@ public class MetamodelHelper { public static Set> getIdAttributes(EntityType type) { Set> attrs = type.getSingularAttributes(); - Set> idAttrs = new HashSet>(); + Set> idAttrs = new HashSet<>(); for (SingularAttribute attr : attrs) { if (attr.isId()) { idAttrs.add(attr); @@ -192,7 +192,7 @@ public class MetamodelHelper { default: return 5; } } - private static Map, Method> members = new HashMap, Method>(); + private static Map, Method> members = new HashMap<>(); private static Object[] EMPTY_ARGS = null; private static Class[] EMPTY_CLASSES = null; /** diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java index 2fa09d620..f29576b0b 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java @@ -43,9 +43,8 @@ import javax.swing.JPanel; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class MetamodelView extends JPanel implements Maze { - + private static final long serialVersionUID = 1L; private static final int GRID = 8; int hgap = 40; int vgap = 40; @@ -63,7 +62,7 @@ public class MetamodelView extends JPanel implements Maze { layout.setVgap(80); // getInsets(new Insets(100,100,100,100)); Set> types = model.getEntities(); - List> sorted = new ArrayList>(types); + List> sorted = new ArrayList<>(types); Collections.sort(sorted, new MetamodelHelper.EntityComparator()); for (EntityType type : sorted) { EntityTypeView view = new EntityTypeView(type); diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PathFinder.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PathFinder.java index a70543586..e81c21004 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PathFinder.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PathFinder.java @@ -58,8 +58,8 @@ public class PathFinder { Node source = new Node(null, x1, y1); Node target = new Node(null, x2, y2); int maxCost = distance(source, target)*2; - LinkedList openList = new LinkedList(); - List closedList = new ArrayList(); + LinkedList openList = new LinkedList<>(); + List closedList = new ArrayList<>(); openList.add(source); do { Node current = openList.remove(0); @@ -119,7 +119,7 @@ public class PathFinder { } List traceBackPath(Node target) { - LinkedList path = new LinkedList(); + LinkedList path = new LinkedList<>(); path.add(new Point(target.x, target.y)); Node next = target.parent; while (next != null) { @@ -132,7 +132,7 @@ public class PathFinder { List straighten(List path) { if (path.size() < 3) return path; - List mids = new ArrayList(); + List mids = new ArrayList<>(); Point prev = path.get(0); Point mid = path.get(1); for (int i = 2; i < path.size(); i++) { @@ -158,6 +158,7 @@ public class PathFinder { this.y = y; } + @Override public boolean equals(Object o) { if (this == o) return true; if (o instanceof Node) { @@ -173,6 +174,7 @@ public class PathFinder { return f > o.f ? 1 : -1; } + @Override public String toString() { return "(" + x + "," + y + ":" + g + ")"; } diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PowerPointViewer.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PowerPointViewer.java index 49415dff2..efa6fdcaa 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PowerPointViewer.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PowerPointViewer.java @@ -40,9 +40,9 @@ import openbook.client.Images; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class PowerPointViewer extends JPanel { - private List> _slides = new ArrayList>(); + private static final long serialVersionUID = 1L; + private List> _slides = new ArrayList<>(); private int _total; // Total number of slides in the deck. private String _dir; private List _slideURLs; @@ -89,6 +89,7 @@ public class PowerPointViewer extends JPanel { _prev = new RoundButton(Images.BACK); buttons.add(_prev); _prev.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { prevPage(); } @@ -101,6 +102,7 @@ public class PowerPointViewer extends JPanel { buttons.add(gotoLabel); buttons.add(_goto); _goto.addChangeListener(new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { Integer page = (Integer)_goto.getValue(); showPage(page-1); @@ -112,6 +114,7 @@ public class PowerPointViewer extends JPanel { buttons.add(_navButtons[i]); _navButtons[i].putClientProperty(SLIDE_INDEX, i+1); _navButtons[i].addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { JButton button = (JButton)e.getSource(); int index = (Integer)button.getClientProperty(SLIDE_INDEX); @@ -123,6 +126,7 @@ public class PowerPointViewer extends JPanel { buttons.add(Box.createHorizontalGlue()); buttons.add(_next); _next.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { nextPage(); } @@ -198,12 +202,12 @@ public class PowerPointViewer extends JPanel { ImageIcon loadSlide(int index) { URL imgURL = _slideURLs.get(index); ImageIcon icon = new ImageIcon(imgURL); - _slides.add(index, new WeakReference(icon)); + _slides.add(index, new WeakReference<>(icon)); return icon; } List validateSlides(String dir, List slides) { - List valid = new ArrayList(); + List valid = new ArrayList<>(); for (String slide : slides) { URL url = findResource(dir + slide); if (url != null) { diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PreparedQueryViewer.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PreparedQueryViewer.java index 9b62c28f3..fdedec9b9 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PreparedQueryViewer.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PreparedQueryViewer.java @@ -15,7 +15,6 @@ package jpa.tools.swing; import javax.swing.JTable; - import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; @@ -25,8 +24,8 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class PreparedQueryViewer extends JTable { + private static final long serialVersionUID = 1L; public PreparedQueryViewer(OpenJPAEntityManagerFactory emf) { super(new QueryStatisticsModel(((OpenJPAEntityManagerFactorySPI)emf).getConfiguration() diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryStatisticsModel.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryStatisticsModel.java index 65e22997a..f4b04f164 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryStatisticsModel.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryStatisticsModel.java @@ -21,10 +21,10 @@ import javax.swing.table.AbstractTableModel; import org.apache.openjpa.kernel.QueryStatistics; -@SuppressWarnings("serial") class QueryStatisticsModel extends AbstractTableModel { + private static final long serialVersionUID = 1L; QueryStatistics _stats; - private List _keys = new ArrayList(); + private List _keys = new ArrayList<>(); QueryStatisticsModel(QueryStatistics stats) { _stats = stats; @@ -65,7 +65,7 @@ class QueryStatisticsModel extends AbstractTableModel { void sortKeys(QueryStatistics stats) { if (_stats.keys().size() != _keys.size()) { - _keys = new ArrayList(_stats.keys()); + _keys = new ArrayList<>(_stats.keys()); if (_keys.size() > 1) { Collections.sort(_keys); } diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/RoundButton.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/RoundButton.java index 004ef25f5..4d4e4d28c 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/RoundButton.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/RoundButton.java @@ -34,8 +34,8 @@ import javax.swing.JButton; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class RoundButton extends JButton { + private static final long serialVersionUID = 1L; protected Shape shape, base; public RoundButton() { diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ScrollingTextPane.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ScrollingTextPane.java index d4ab5ef57..2ab82efef 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ScrollingTextPane.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ScrollingTextPane.java @@ -32,8 +32,8 @@ import javax.swing.text.Document; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class ScrollingTextPane extends JTextPane { + private static final long serialVersionUID = 1L; public void appendText(String text) { if (text == null) diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/SourceCodeViewer.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/SourceCodeViewer.java index 6a7c8f972..48b156a11 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/SourceCodeViewer.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/SourceCodeViewer.java @@ -28,6 +28,7 @@ import javax.swing.JEditorPane; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.ScrollPaneConstants; /** @@ -39,12 +40,12 @@ import javax.swing.JScrollPane; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class SourceCodeViewer extends JPanel { + private static final long serialVersionUID = 1L; private final JEditorPane _editor; private final JComboBox _bookmarks; - private IndexedMap _anchors = new IndexedMap(); - private LinkedList _visited = new LinkedList(); + private IndexedMap _anchors = new IndexedMap<>(); + private LinkedList _visited = new LinkedList<>(); /** * Create a Source Code Browser. @@ -62,6 +63,7 @@ public class SourceCodeViewer extends JPanel { _bookmarks.setEditable(false); _bookmarks.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { showAnchor((String)_bookmarks.getSelectedItem()); } @@ -75,8 +77,8 @@ public class SourceCodeViewer extends JPanel { add(new JScrollPane(_editor, - JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, - JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS), + ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS), BorderLayout.CENTER); add(topPanel, BorderLayout.NORTH); } diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/StatusBar.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/StatusBar.java index fcdc406e4..3be13b9ad 100644 --- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/StatusBar.java +++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/StatusBar.java @@ -28,8 +28,8 @@ import javax.swing.JProgressBar; import javax.swing.SwingWorker; import javax.swing.Timer; -@SuppressWarnings("serial") public class StatusBar extends JPanel implements PropertyChangeListener { + private static final long serialVersionUID = 1L; private JProgressBar progressBar; private JProgressBar memoryBar; private JLabel messageText; @@ -76,6 +76,7 @@ public class StatusBar extends JPanel implements PropertyChangeListener { /** * Invoked when task's progress property changes. */ + @Override public void propertyChange(PropertyChangeEvent evt) { if ("progress".equals(evt.getPropertyName())) { progressBar.setValue((Integer)evt.getNewValue()); @@ -138,7 +139,7 @@ public class StatusBar extends JPanel implements PropertyChangeListener { long usedMemory = totalMemory-jvm.freeMemory(); int usedPct = (int)((100*usedMemory)/totalMemory); bar.setForeground(getColor(usedPct)); - bar.setValue((int)usedPct); + bar.setValue(usedPct); bar.setString(usedPct + "% (" + mb(usedMemory) + "/" + mb(totalMemory) + "MB) "); } diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/BuyBookPage.java b/openjpa-examples/openbooks/src/main/java/openbook/client/BuyBookPage.java index 93985ef20..e868840d8 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/client/BuyBookPage.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/client/BuyBookPage.java @@ -37,6 +37,8 @@ import javax.swing.SwingWorker; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; +import org.apache.openjpa.lib.jdbc.SQLFormatter; + import jpa.tools.swing.EntityDataModel; import jpa.tools.swing.EntityTable; import jpa.tools.swing.EntityTableView; @@ -50,8 +52,6 @@ import openbook.domain.ShoppingCart; import openbook.server.OpenBookService; import openbook.server.QueryDecorator; -import org.apache.openjpa.lib.jdbc.SQLFormatter; - /** * A visual page coordinates the following functions of {@link OpenBookService} : *
  • query for books @@ -71,8 +71,8 @@ import org.apache.openjpa.lib.jdbc.SQLFormatter; * * @author Pinaki Poddar */ -@SuppressWarnings("serial") public final class BuyBookPage extends JPanel { + private static final long serialVersionUID = 1L; private final OpenBookService _service; private final Customer _customer; private final SearchPanel _searchPanel; @@ -124,6 +124,8 @@ public final class BuyBookPage extends JPanel { * */ class SearchPanel extends JPanel implements ActionListener { + + private static final long serialVersionUID = 1L; private final JTextField _title = new JTextField("", 20); private final JTextField _author = new JTextField("", 20); private final JTextField _maxPrice = new JTextField("", 6); @@ -208,6 +210,7 @@ public final class BuyBookPage extends JPanel { * * The query is executed in a background, non-AWT thread. */ + @Override public void actionPerformed(ActionEvent e) { new SwingWorker, Void>() { private String queryString; @@ -260,6 +263,8 @@ public final class BuyBookPage extends JPanel { * */ class SelectBookPanel extends JPanel { + + private static final long serialVersionUID = 1L; private final JLabel _bookCount; private final EntityTableView _selectedBooks; @@ -267,7 +272,7 @@ public final class BuyBookPage extends JPanel { setLayout(new BorderLayout()); setBorder(BorderFactory.createTitledBorder(title)); - _selectedBooks = new EntityTableView(Book.class, + _selectedBooks = new EntityTableView<>(Book.class, EntityDataModel.BASIC_ATTR | EntityDataModel.ROW_COUNT, _service.getUnit()); _bookCount = new JLabel(); @@ -290,6 +295,8 @@ public final class BuyBookPage extends JPanel { * */ class BuyPanel extends JPanel implements ListSelectionListener { + + private static final long serialVersionUID = 1L; JLabel _bookTitle; JLabel _bookAuthors; JLabel _bookPrice; @@ -385,6 +392,8 @@ public final class BuyBookPage extends JPanel { * */ class ShoppingCartPanel extends JPanel implements ActionListener { + + private static final long serialVersionUID = 1L; private static final int MAX_ITEMS = 10; private final ShoppingCart _cart; private final JButton _placeOrder; diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/DeliveryPage.java b/openjpa-examples/openbooks/src/main/java/openbook/client/DeliveryPage.java index 50a069f51..304ee47be 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/client/DeliveryPage.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/client/DeliveryPage.java @@ -40,8 +40,8 @@ import openbook.server.OpenBookService; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class DeliveryPage extends JPanel { + private static final long serialVersionUID = 1L; private final JButton _deliver; private EntityTableView _orders; private final OpenBookService _service; @@ -55,7 +55,7 @@ public class DeliveryPage extends JPanel { _service = service; - _orders = new EntityTableView(PurchaseOrder.class, getOrders(PurchaseOrder.Status.PENDING), + _orders = new EntityTableView<>(PurchaseOrder.class, getOrders(PurchaseOrder.Status.PENDING), EntityDataModel.ALL_ATTR, service.getUnit()); _title = new JLabel(_orders.getDataModel().getRowCount() + " " + PurchaseOrder.Status.PENDING @@ -116,7 +116,7 @@ public class DeliveryPage extends JPanel { new SwingWorker, Void>() { @Override protected List doInBackground() throws Exception { - List updated = new ArrayList(); + List updated = new ArrayList<>(); EntityDataModel orders = _orders.getDataModel(); int n = orders.getRowCount(); for (int i = 0; i < n; i++) { diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java b/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java index 0a5badee9..3a6486c1f 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java @@ -52,6 +52,10 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeCellRenderer; +import org.apache.openjpa.conf.OpenJPAVersion; +import org.apache.openjpa.lib.jdbc.JDBCListener; +import org.apache.openjpa.persistence.OpenJPAPersistence; + import jpa.tools.swing.AttributeLegendView; import jpa.tools.swing.ConfigurationViewer; import jpa.tools.swing.ErrorDialog; @@ -67,18 +71,14 @@ import openbook.server.OpenBookService; import openbook.server.ServiceFactory; import openbook.util.PropertyHelper; -import org.apache.openjpa.conf.OpenJPAVersion; -import org.apache.openjpa.lib.jdbc.JDBCListener; -import org.apache.openjpa.persistence.OpenJPAPersistence; - /** * A graphical user interface based client of OpenBooks for demonstration. * * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class Demo extends JFrame { + private static final long serialVersionUID = 1L; private static Dimension TAB_VIEW = new Dimension(800,600); private static Dimension OUT_VIEW = new Dimension(800,200); private static Dimension NAV_VIEW = new Dimension(400,800); @@ -124,6 +124,7 @@ public class Demo extends JFrame { SwingHelper.setLookAndFeel(14); adjustWidgetSize(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { Demo demo = Demo.getInstance(); demo.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); @@ -207,7 +208,7 @@ public class Demo extends JFrame { SwingWorker getService = new SwingWorker () { @Override protected OpenBookService doInBackground() throws Exception { - Map runtimeConfig = new HashMap(); + Map runtimeConfig = new HashMap<>(); runtimeConfig.put("openjpa.jdbc.JDBCListeners", new JDBCListener[]{_sqlListener}); OpenBookService service = ServiceFactory.getService(unitName, runtimeConfig); service.initialize(null); @@ -302,6 +303,9 @@ public class Demo extends JFrame { * */ public abstract class OpenBookAction extends AbstractAction { + + private static final long serialVersionUID = 1L; + public OpenBookAction(String name, Icon icon, String tooltip) { putValue(Action.NAME, name); putValue(Action.SHORT_DESCRIPTION, tooltip); @@ -310,11 +314,14 @@ public class Demo extends JFrame { } public class BuyBookAction extends OpenBookAction { + + private static final long serialVersionUID = 1L; BuyBookPage _buyBookPage; public BuyBookAction(String name, Icon icon, String tooltip) { super(name, icon, tooltip); } + @Override public void actionPerformed(ActionEvent e) { if (_buyBookPage == null) { _buyBookPage = new BuyBookPage(getService(), getCustomer()); @@ -325,10 +332,13 @@ public class Demo extends JFrame { } public class DeliveryAction extends OpenBookAction { + + private static final long serialVersionUID = 1L; DeliveryPage _deliveryPage; public DeliveryAction(String name, Icon icon, String tooltip) { super(name, icon, tooltip); } + @Override public void actionPerformed(ActionEvent e) { if (_deliveryPage == null) { _deliveryPage = new DeliveryPage(getService()); @@ -340,10 +350,13 @@ public class Demo extends JFrame { } public class SupplyAction extends OpenBookAction { + + private static final long serialVersionUID = 1L; SupplyPage _supplyPage; public SupplyAction(String name, Icon icon, String tooltip) { super(name, icon, tooltip); } + @Override public void actionPerformed(ActionEvent e) { if (_supplyPage == null) { _supplyPage = new SupplyPage(getService()); @@ -355,10 +368,13 @@ public class Demo extends JFrame { } public class ViewConfigAction extends OpenBookAction { + + private static final long serialVersionUID = 1L; ConfigurationViewer _configView; public ViewConfigAction(String name, Icon icon, String tooltip) { super(name, icon, tooltip); } + @Override public void actionPerformed(ActionEvent e) { if (_configView == null) { _configView = new ConfigurationViewer("Unit Configuration", getService().getUnit().getProperties()); @@ -371,11 +387,14 @@ public class Demo extends JFrame { } public class ViewDomainAction extends OpenBookAction { + + private static final long serialVersionUID = 1L; MetamodelView _domainView; AttributeLegendView _legends; public ViewDomainAction(String name, Icon icon, String tooltip) { super(name, icon, tooltip); } + @Override public void actionPerformed(ActionEvent e) { if (_domainView == null) { _domainView = new MetamodelView(getService().getUnit().getMetamodel()); @@ -388,9 +407,12 @@ public class Demo extends JFrame { } public class ViewDataAction extends OpenBookAction { + + private static final long serialVersionUID = 1L; public ViewDataAction(String name, Icon icon, String tooltip) { super(name, icon, tooltip); } + @Override public void actionPerformed(ActionEvent e) { showTab(_tabbedPane, "Buy Books", null); } @@ -398,10 +420,13 @@ public class Demo extends JFrame { } public class ViewQueryCacheAction extends OpenBookAction { + + private static final long serialVersionUID = 1L; PreparedQueryViewer _queryView; public ViewQueryCacheAction(String name, Icon icon, String tooltip) { super(name, icon, tooltip); } + @Override public void actionPerformed(ActionEvent e) { if (_queryView == null) { _queryView = new PreparedQueryViewer(OpenJPAPersistence.cast(getService().getUnit())); @@ -413,10 +438,14 @@ public class Demo extends JFrame { } public class ViewSourceAction extends OpenBookAction { + + private static final long serialVersionUID = 1L; + public ViewSourceAction(String name, Icon icon, String tooltip) { super(name, icon, tooltip); } + @Override public void actionPerformed(ActionEvent e) { getSourceCodeBrowser(); } @@ -427,6 +456,8 @@ public class Demo extends JFrame { * */ public class ShowCodeAction extends OpenBookAction { + + private static final long serialVersionUID = 1L; private String _key; private String _page; @@ -439,6 +470,7 @@ public class Demo extends JFrame { _page = page; } + @Override public void actionPerformed(ActionEvent e) { getSourceCodeBrowser().showPage(_key, _page); } @@ -451,6 +483,8 @@ public class Demo extends JFrame { * */ public class WelcomeAction extends OpenBookAction { + + private static final long serialVersionUID = 1L; PowerPointViewer _powerpoint; JLabel _logoLabel = new JLabel(Images.LOGO_OPENBOOKS); boolean _showPresentation = true; @@ -459,6 +493,7 @@ public class Demo extends JFrame { super(name, icon, tooltip); } + @Override public void actionPerformed(ActionEvent e) { if (_powerpoint == null && _showPresentation) { String dir = getConfiguration("openbook.slides.dir", "slides/"); @@ -493,12 +528,15 @@ public class Demo extends JFrame { } public class AboutAction extends OpenBookAction { + + private static final long serialVersionUID = 1L; AboutDialog _dialog; public AboutAction(String name, Icon icon, String tooltip) { super(name, icon, tooltip); } + @Override public void actionPerformed(ActionEvent e) { if (_dialog == null) { _dialog = new AboutDialog(Images.LOGO_OPENBOOKS); @@ -605,6 +643,7 @@ public class Demo extends JFrame { tree.setShowsRootHandles(true); tree.addTreeSelectionListener(new TreeSelectionListener() { + @Override public void valueChanged(TreeSelectionEvent e) { Object treeNode = _navigator.getLastSelectedPathComponent(); if (treeNode instanceof ActionTreeNode) { @@ -628,11 +667,14 @@ public class Demo extends JFrame { * */ public static class ActionTreeNode extends DefaultMutableTreeNode { + + private static final long serialVersionUID = 1L; private final Action _action; public ActionTreeNode(Action action) { _action = action; } + @Override public String toString() { return _action.getValue(Action.SHORT_DESCRIPTION).toString(); } @@ -640,6 +682,9 @@ public class Demo extends JFrame { } public class TypedTreeCellRenderer extends DefaultTreeCellRenderer { + + private static final long serialVersionUID = 1L; + @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { @@ -648,6 +693,9 @@ public class Demo extends JFrame { } public static class AboutDialog extends JDialog { + + private static final long serialVersionUID = 1L; + public AboutDialog(Icon logo) { setModal(true); setLayout(new BorderLayout()); diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/ErrorHandler.java b/openjpa-examples/openbooks/src/main/java/openbook/client/ErrorHandler.java index 542ed3770..8aebb6776 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/client/ErrorHandler.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/client/ErrorHandler.java @@ -38,6 +38,7 @@ public class ErrorHandler implements Thread.UncaughtExceptionHandler{ uncaughtException(Thread.currentThread(), e); } + @Override public void uncaughtException(Thread t, Throwable e) { if (SwingUtilities.isEventDispatchThread()) { new ErrorDialog(null, Images.ERROR, e).setVisible(true); diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java b/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java index 0c1c1c508..69d43d98d 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java @@ -30,7 +30,7 @@ import javax.swing.ImageIcon; */ public class Images { - private static Map images = new HashMap(); + private static Map images = new HashMap<>(); public static Icon NEXT = getIcon("images/arrow_right.jpg", 24, -1); public static Icon BACK = getIcon("images/arrow_left.jpg", 24, -1); diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/SQLLogger.java b/openjpa-examples/openbooks/src/main/java/openbook/client/SQLLogger.java index 834da3718..c801141c9 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/client/SQLLogger.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/client/SQLLogger.java @@ -22,13 +22,11 @@ import javax.swing.text.SimpleAttributeSet; import javax.swing.text.StyleConstants; import javax.swing.text.StyleContext; -import jpa.tools.swing.GraphicOutputStream; - - - import org.apache.openjpa.lib.jdbc.AbstractJDBCListener; import org.apache.openjpa.lib.jdbc.JDBCEvent; +import jpa.tools.swing.GraphicOutputStream; + /** * Logs SQL statement to a graphic console. * @@ -59,6 +57,7 @@ public class SQLLogger extends AbstractJDBCListener { if (out == null) return; SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { out.println(event.getSQL()); } diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/SupplyPage.java b/openjpa-examples/openbooks/src/main/java/openbook/client/SupplyPage.java index 9eed4fa25..4fe1a7f80 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/client/SupplyPage.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/client/SupplyPage.java @@ -39,8 +39,9 @@ import openbook.server.OpenBookService; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class SupplyPage extends JPanel { + private static final long serialVersionUID = 1L; + private final OpenBookService _service; private final EntityTableView _lowInventories; @@ -62,7 +63,7 @@ public class SupplyPage extends JPanel { _supply = new JButton("Supply " + REORDER_QUANTITY + " to each item"); List orders = getInventory(REORDER_LIMIT); - _lowInventories = new EntityTableView(Inventory.class, + _lowInventories = new EntityTableView<>(Inventory.class, orders, EntityDataModel.BASIC_ATTR | EntityDataModel.ASSOCIATION_ATTR, service.getUnit()); @@ -76,6 +77,7 @@ public class SupplyPage extends JPanel { _view.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { _lowInventories.getDataModel().updateData(getInventory(REORDER_LIMIT)); } @@ -91,7 +93,7 @@ public class SupplyPage extends JPanel { @Override protected List doInBackground() throws Exception { EntityDataModel invs = _lowInventories.getDataModel(); - List updated = new ArrayList(); + List updated = new ArrayList<>(); for (Inventory inv : invs) { Book supplied = _service.supply(inv.getBook(), REORDER_QUANTITY); updated.add(supplied.getInventory()); @@ -99,6 +101,7 @@ public class SupplyPage extends JPanel { return updated; } + @Override public void done() { try { _lowInventories.getDataModel().updateData(get(1, TimeUnit.SECONDS)); diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java index bcd9b7b13..b685c07dd 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java @@ -67,7 +67,7 @@ public class Author { public void addBook(Book book) { if (books == null) - books = new HashSet(); + books = new HashSet<>(); books.add(book); } diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java index 3c8a1833a..78c653140 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java @@ -44,9 +44,10 @@ import javax.persistence.Version; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") @Entity public class Book implements Serializable { + private static final long serialVersionUID = 1L; + @Id private String ISBN; @@ -108,7 +109,7 @@ public class Book implements Serializable { public void addAuthor(Author...authors) { if (this.authors == null) - this.authors = new ArrayList(); + this.authors = new ArrayList<>(); for (Author a : authors) { if (!this.authors.contains(a)) this.authors.add(a); diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java index 94c0f43fe..2e24083dd 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java @@ -32,9 +32,9 @@ import javax.persistence.Version; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") @Entity public class Customer implements Serializable { + private static final long serialVersionUID = 1L; @Id @GeneratedValue private long id; @@ -71,6 +71,7 @@ public class Customer implements Serializable { return new ShoppingCart(this); } + @Override public String toString() { return name; } diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java index a321bcb82..f60149693 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java @@ -28,9 +28,10 @@ import javax.persistence.Version; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") @Entity public class Inventory implements Serializable { + private static final long serialVersionUID = 1L; + @Id @OneToOne(fetch=FetchType.EAGER, optional=false) private Book book; diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java index a72b8d601..7dd791c80 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java @@ -32,10 +32,11 @@ import javax.persistence.OrderColumn; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") @Entity @IdClass(LineItem.LineItemId.class) public class LineItem implements Serializable { + private static final long serialVersionUID = 1L; + /** * * An example of a compound derived identity. @@ -122,6 +123,8 @@ public class LineItem implements Serializable { * */ public static class LineItemId implements Serializable { + + private static final long serialVersionUID = 1L; long order; int index; diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java index 477ca8020..3c59f784c 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java @@ -54,9 +54,10 @@ import javax.persistence.TemporalType; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") @Entity public class PurchaseOrder implements Serializable { + private static final long serialVersionUID = 1L; + /** * Enumerates the status of a Purchase Order. * @@ -195,7 +196,7 @@ public class PurchaseOrder implements Serializable { throw new IllegalArgumentException("Can not add Line Item to Purchase Order for negative (=" + quantity + ") number of Book " + book); if (items == null) - items = new ArrayList(); + items = new ArrayList<>(); items.add(new LineItem(this, items.size()+1, book, quantity)); total += (book.getPrice() * quantity); } diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/ShoppingCart.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/ShoppingCart.java index 4cd303fff..396c4b913 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/domain/ShoppingCart.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/ShoppingCart.java @@ -27,8 +27,9 @@ import java.util.Map; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") public class ShoppingCart implements Serializable { + private static final long serialVersionUID = 1L; + /** * The owner of this cart. */ @@ -47,7 +48,7 @@ public class ShoppingCart implements Serializable { */ ShoppingCart(Customer c) { customer = c; - items = new HashMap(); + items = new HashMap<>(); } /** diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java index 936bf9ca6..06d9a8f5a 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java @@ -33,7 +33,7 @@ import openbook.domain.ShoppingCart; * */ public interface OpenBookService { - public static final String DEFAULT_UNIT_NAME = "OpenBooks"; + String DEFAULT_UNIT_NAME = "OpenBooks"; /** * Starts a session for the given named Customer. @@ -43,7 +43,7 @@ public interface OpenBookService { * * @return a Customer */ - public Customer login(String name); + Customer login(String name); /** * Selects a list of Books matching the given conditions. @@ -56,7 +56,7 @@ public interface OpenBookService { * @param author name of author * @param decorators to modify the executable query such as its range. */ - public List select(String title, + List select(String title, Double min, Double max, String author, QueryDecorator...decorators); @@ -71,7 +71,7 @@ public interface OpenBookService { * @param author name of author * @param decorators to modify the executable query such as its range. */ - public String getQuery(String title, + String getQuery(String title, Double min, Double max, String author); @@ -92,7 +92,7 @@ public interface OpenBookService { * @param cart a non-empty cart. * @return a PurchaseOrder for the content of the cart. */ - public PurchaseOrder placeOrder(ShoppingCart cart); + PurchaseOrder placeOrder(ShoppingCart cart); /** * Delivers the given order. Delivery changes the status of the order, decrements @@ -102,7 +102,7 @@ public interface OpenBookService { * @return the PurchaseOrder after delivery. * */ - public PurchaseOrder deliver(PurchaseOrder order); + PurchaseOrder deliver(PurchaseOrder order); /** * Add inventory of the given Book by the given quantity. @@ -112,7 +112,7 @@ public interface OpenBookService { * * @return the Book after incrementing its inventory. */ - public Book supply(Book b, int quantity); + Book supply(Book b, int quantity); /** * Gets the list of orders of given status. @@ -121,7 +121,7 @@ public interface OpenBookService { * * @return list of orders sorted by their placement dates. */ - public List getOrders(PurchaseOrder.Status status, Customer customer); + List getOrders(PurchaseOrder.Status status, Customer customer); /** @@ -131,7 +131,7 @@ public interface OpenBookService { * * @return list of Books with inventory lower than the given limit. */ - public List getReorderableBooks(int limit); + List getReorderableBooks(int limit); /** * Count the number of instances of the given persistent type. @@ -139,7 +139,7 @@ public interface OpenBookService { * @param cls a persistent type. * @return number of persistent entity of the given type. */ - public long count(Class cls); + long count(Class cls); /** * Populates the underlying data repository with sample values, only if @@ -150,31 +150,31 @@ public interface OpenBookService { * * @return true if the repository is initialized by this invocation. */ - public boolean initialize(Map loadParameters); + boolean initialize(Map loadParameters); /** * Cleans everything. Be careful. */ - public void clean(); + void clean(); /** * Gets the underlying persistence unit. * */ - public EntityManagerFactory getUnit(); + EntityManagerFactory getUnit(); /** * Gets the name of the underlying persistence unit. * */ - public String getUnitName(); + String getUnitName(); /** * Affirms if the transaction on this persistence unit is managed by a container. * */ - public boolean isManaged(); + boolean isManaged(); } diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java index c3039c4ac..75c42656b 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java @@ -31,6 +31,8 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; import javax.persistence.metamodel.EntityType; +import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder; + import openbook.domain.Author; import openbook.domain.Author_; import openbook.domain.Book; @@ -47,8 +49,6 @@ import openbook.domain.ShoppingCart; import openbook.util.PropertyHelper; import openbook.util.Randomizer; -import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder; - /** * A demonstrative example of a transaction service with persistent entity using Java Persistence API. *
    @@ -67,9 +67,8 @@ import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") class OpenBookServiceImpl extends PersistenceService implements OpenBookService { - + private static final long serialVersionUID = 1L; public static final int CUSTOMER_COUNT = 10; public static final int BOOK_COUNT = 100; public static final int AUTHOR_COUNT = 40; @@ -78,8 +77,8 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService /** * Range of number of queries executed for a {@linkplain #shop() shopping} trip. */ - public static final Range PRICE_RANGE = new Range(4.99, 120.99); - public static final Range STOCK_RANGE = new Range(5, 50); + public static final Range PRICE_RANGE = new Range<>(4.99, 120.99); + public static final Range STOCK_RANGE = new Range<>(5, 50); public static final int REORDER_LEVEL = 10; OpenBookServiceImpl(String unit, EntityManagerFactory emf, boolean managed, @@ -93,6 +92,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService * * @return true if new inventory is created. false otherwise. */ + @Override public boolean initialize(Map config) { if (isInitialized()) { return false; @@ -119,7 +119,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService em.persist(customer); } - List allAuthors = new ArrayList(); + List allAuthors = new ArrayList<>(); System.err.println("Creating " + nAuthor + " new Authors"); for (int i = 1; i <= nAuthor; i++) { Author author = new Author(); @@ -164,6 +164,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService * * @return a Customer */ + @Override public Customer login(String name) { EntityManager em = begin(); @@ -191,6 +192,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService /** * Find books that match title and price range. */ + @Override public List select(String title, Double minPrice, Double maxPrice, String author, QueryDecorator...decorators) { CriteriaQuery q = buildQuery(title, minPrice, maxPrice, author); @@ -208,6 +210,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService * But OpenJPA produces a readable form that is quite similar to * equivalent JPQL. */ + @Override public String getQuery(String title, Double minPrice, Double maxPrice, String author) { CriteriaQuery q = buildQuery(title, minPrice, maxPrice, author); return q.toString(); @@ -238,7 +241,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService q.select(book); // Builds the predicates conditionally for the filled-in input fields - List predicates = new ArrayList(); + List predicates = new ArrayList<>(); if (!isEmpty(title)) { Predicate matchTitle = cb.like(book.get(Book_.title), title); predicates.add(matchTitle); @@ -280,6 +283,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService * The transactions may fail because of either insufficient inventory or * concurrent modification of the same inventory by {@link #supply(Book, int) the supplier}. */ + @Override public PurchaseOrder deliver(PurchaseOrder o) { if (o.isDelivered()) return o; @@ -293,13 +297,14 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService return o; } + @Override public List getOrders(PurchaseOrder.Status status, Customer customer) { EntityManager em = begin(); CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery q = cb.createQuery(PurchaseOrder.class); Root order = q.from(PurchaseOrder.class); q.select(order); - List predicates = new ArrayList(); + List predicates = new ArrayList<>(); if (status != null) { predicates.add(cb.equal(order.get(PurchaseOrder_.status), status)); } @@ -326,6 +331,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService * * @param cart a non-null Shopping cart. */ + @Override public PurchaseOrder placeOrder(ShoppingCart cart) { EntityManager em = begin(); PurchaseOrder order = new PurchaseOrder(cart); @@ -342,6 +348,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService * transaction. Some of the transactions may fail due to concurrent modification on * the {@linkplain Inventory} by the {@linkplain #deliver() delivery} process. */ + @Override public Book supply(Book b, int quantity) { EntityManager em = begin(); b = em.merge(b); @@ -350,6 +357,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService return b; } + @Override public List getReorderableBooks(int limit) { EntityManager em = begin(); CriteriaBuilder cb = em.getCriteriaBuilder(); @@ -368,6 +376,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService return result; } + @Override public long count(Class cls) { EntityManager em = getEntityManager(); CriteriaBuilder cb = em.getCriteriaBuilder(); @@ -391,6 +400,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService return result; } + @Override public List getExtent(Class entityClass) { EntityManager em = begin(); CriteriaQuery c = em.getCriteriaBuilder().createQuery(entityClass); @@ -400,6 +410,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService return result; } + @Override public List query(String jpql, Class resultClass, QueryDecorator... decorators) { EntityManager em = begin(); TypedQuery query = em.createQuery(jpql, resultClass); @@ -413,6 +424,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService return result; } + @Override public void clean() { EntityManager em = begin(); Set> entities = em.getMetamodel().getEntities(); diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java b/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java index b055c7af1..6317b099f 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java @@ -32,14 +32,14 @@ import javax.persistence.PersistenceContextType; * @author Pinaki Poddar * */ -@SuppressWarnings("serial") abstract class PersistenceService implements Serializable { + private static final long serialVersionUID = 1L; private final EntityManagerFactory emf; private final String unitName; private final boolean isManaged; private final PersistenceContextType scope; - private ThreadLocal thread = new ThreadLocal(); + private ThreadLocal thread = new ThreadLocal<>(); private ReentrantLock lock = new ReentrantLock(); protected PersistenceService(String unit, EntityManagerFactory emf, boolean managed, diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java b/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java index 3c241c886..6000b8260 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java @@ -28,7 +28,7 @@ import javax.persistence.PersistenceContextType; * */ public class ServiceFactory { - private static final Map _services = new HashMap(); + private static final Map _services = new HashMap<>(); public synchronized static OpenBookService getService(String unit) { return getService(unit, null); diff --git a/openjpa-examples/openbooks/src/main/java/openbook/tools/CommandProcessor.java b/openjpa-examples/openbooks/src/main/java/openbook/tools/CommandProcessor.java index 52e5388de..f89200e26 100644 --- a/openjpa-examples/openbooks/src/main/java/openbook/tools/CommandProcessor.java +++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/CommandProcessor.java @@ -36,8 +36,8 @@ import java.util.Set; * */ public class CommandProcessor { - private final Map registeredOptions = new HashMap(); - private final Set