You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/09/12 13:59:15 UTC
(cayenne) 01/02: CAY-3020 Remove serialization contracts
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 3c62dfa04ebbfa139e56bc3120953ff703a475f3
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Sep 12 09:08:08 2026 -0400
CAY-3020 Remove serialization contracts
---
RELEASE-NOTES.txt | 1 +
UPGRADE.md | 8 +-
.../apache/cayenne/cache/invalidation/db/E1.java | 2 -
.../apache/cayenne/cache/invalidation/db/E2.java | 2 -
.../cayenne/cache/invalidation/db/auto/_E1.java | 2 -
.../cayenne/cache/invalidation/db/auto/_E2.java | 2 -
.../org/apache/cayenne/gen/CgenConfiguration.java | 3 +-
.../templates/v4_1/embeddable-singleclass.vm | 3 +-
.../templates/v4_1/embeddable-superclass.vm | 3 +-
.../main/resources/templates/v4_1/singleclass.vm | 55 -----
.../src/main/resources/templates/v4_1/subclass.vm | 2 -
.../main/resources/templates/v4_1/superclass.vm | 55 -----
.../cayenne/gen/ClassGenerationActionTest.java | 2 -
.../test/resources/templateTest/_ObjEntity.java | 2 -
.../resources/templateTest/_auto/_ObjEntity.java | 24 --
.../apache/cayenne/crypto/key/JceksKeySource.java | 2 -
.../java/org/apache/cayenne/crypto/db/Table1.java | 2 -
.../java/org/apache/cayenne/crypto/db/Table2.java | 2 -
.../java/org/apache/cayenne/crypto/db/Table3.java | 2 -
.../java/org/apache/cayenne/crypto/db/Table4.java | 2 -
.../java/org/apache/cayenne/crypto/db/Table5.java | 2 -
.../java/org/apache/cayenne/crypto/db/Table6.java | 2 -
.../java/org/apache/cayenne/crypto/db/Table7.java | 2 -
.../java/org/apache/cayenne/crypto/db/Table8.java | 2 -
.../org/apache/cayenne/crypto/db/auto/_Table1.java | 33 ---
.../org/apache/cayenne/crypto/db/auto/_Table2.java | 28 ---
.../org/apache/cayenne/crypto/db/auto/_Table3.java | 26 --
.../org/apache/cayenne/crypto/db/auto/_Table4.java | 28 ---
.../org/apache/cayenne/crypto/db/auto/_Table5.java | 30 ---
.../org/apache/cayenne/crypto/db/auto/_Table6.java | 28 ---
.../org/apache/cayenne/crypto/db/auto/_Table7.java | 30 ---
.../org/apache/cayenne/crypto/db/auto/_Table8.java | 26 --
.../reverse/dbimport/ReverseEngineering.java | 3 +-
.../apache/cayenne/lifecycle/id/StringIdQuery.java | 2 +-
.../java/org/apache/cayenne/lifecycle/db/E1.java | 1 -
.../java/org/apache/cayenne/lifecycle/db/E2.java | 1 -
.../java/org/apache/cayenne/lifecycle/db/E3.java | 2 -
.../java/org/apache/cayenne/lifecycle/db/E4.java | 2 -
.../org/apache/cayenne/lifecycle/db/SortDep.java | 1 -
.../org/apache/cayenne/lifecycle/db/SortRoot.java | 1 -
.../org/apache/cayenne/lifecycle/db/UuidRoot1.java | 1 -
.../org/apache/cayenne/lifecycle/db/auto/_E1.java | 2 -
.../org/apache/cayenne/lifecycle/db/auto/_E2.java | 2 -
.../org/apache/cayenne/lifecycle/db/auto/_E3.java | 2 -
.../org/apache/cayenne/lifecycle/db/auto/_E4.java | 2 -
.../apache/cayenne/lifecycle/db/auto/_SortDep.java | 2 -
.../cayenne/lifecycle/db/auto/_SortRoot.java | 2 -
.../cayenne/lifecycle/db/auto/_UuidRoot1.java | 2 -
.../toolkit/columnview/ColumnViewPanel.java | 3 +-
.../toolkit/combobox/CMComboBoxCellEditor.java | 3 +-
.../modeler/toolkit/copypaste/CMTransferable.java | 4 +-
.../editor/objentity/callbacks/CallbackType.java | 4 +-
.../objentity/callbacks/ObjCallbackMethod.java | 5 +-
.../src/main/java/org/apache/cayenne/Fault.java | 4 +-
.../apache/cayenne/GenericPersistentObject.java | 35 ---
.../org/apache/cayenne/HybridPersistentObject.java | 17 --
.../java/org/apache/cayenne/ObjectContext.java | 3 +-
.../org/apache/cayenne/ObjectContextChangeLog.java | 9 +-
.../src/main/java/org/apache/cayenne/ObjectId.java | 3 +-
.../java/org/apache/cayenne/ObjectIdCompound.java | 13 +-
.../java/org/apache/cayenne/ObjectIdNumber.java | 10 -
.../java/org/apache/cayenne/ObjectIdSingle.java | 12 +-
.../main/java/org/apache/cayenne/ObjectIdTmp.java | 9 -
.../main/java/org/apache/cayenne/Persistent.java | 4 +-
.../java/org/apache/cayenne/PersistentObject.java | 58 +----
.../org/apache/cayenne/access/DataContext.java | 61 +----
.../cayenne/access/DataContextGraphAction.java | 3 +-
.../cayenne/access/DataContextQueryAction.java | 2 +-
.../org/apache/cayenne/access/DataRowStore.java | 21 +-
.../cayenne/access/IncrementalFaultList.java | 5 +-
.../apache/cayenne/access/ListWithPrefetches.java | 3 +-
.../apache/cayenne/access/NoSyncObjectStore.java | 1 -
.../java/org/apache/cayenne/access/ObjectDiff.java | 9 +-
.../org/apache/cayenne/access/ObjectStore.java | 32 +--
.../org/apache/cayenne/access/ToManyHolder.java | 3 +-
.../cayenne/access/flush/IdGenerationMarker.java | 6 +-
.../org/apache/cayenne/cache/MapQueryCache.java | 3 +-
.../configuration/DataChannelDescriptor.java | 7 +-
.../configuration/DataSourceDescriptor.java | 3 +-
.../datasource/UnmanagedPoolingDataSource.java | 2 -
.../org/apache/cayenne/ejbql/parser/EJBQLSum.java | 1 -
.../apache/cayenne/ejbql/parser/SimpleNode.java | 3 +-
.../org/apache/cayenne/event/CayenneEvent.java | 2 +-
.../java/org/apache/cayenne/event/EventBridge.java | 12 +-
.../org/apache/cayenne/event/EventSubject.java | 3 +-
.../java/org/apache/cayenne/exp/Expression.java | 5 +-
.../apache/cayenne/exp/ExpressionParameter.java | 5 +-
.../java/org/apache/cayenne/exp/parser/ASTAdd.java | 2 -
.../java/org/apache/cayenne/exp/parser/ASTAnd.java | 2 -
.../org/apache/cayenne/exp/parser/ASTBetween.java | 2 -
.../apache/cayenne/exp/parser/ASTBitwiseAnd.java | 2 -
.../cayenne/exp/parser/ASTBitwiseLeftShift.java | 2 -
.../apache/cayenne/exp/parser/ASTBitwiseNot.java | 2 -
.../apache/cayenne/exp/parser/ASTBitwiseOr.java | 2 -
.../cayenne/exp/parser/ASTBitwiseRightShift.java | 2 -
.../apache/cayenne/exp/parser/ASTBitwiseXor.java | 2 -
.../org/apache/cayenne/exp/parser/ASTDbPath.java | 2 -
.../org/apache/cayenne/exp/parser/ASTDivide.java | 2 -
.../org/apache/cayenne/exp/parser/ASTEqual.java | 2 -
.../org/apache/cayenne/exp/parser/ASTFalse.java | 2 -
.../org/apache/cayenne/exp/parser/ASTGreater.java | 2 -
.../cayenne/exp/parser/ASTGreaterOrEqual.java | 2 -
.../java/org/apache/cayenne/exp/parser/ASTIn.java | 2 -
.../org/apache/cayenne/exp/parser/ASTLess.java | 2 -
.../apache/cayenne/exp/parser/ASTLessOrEqual.java | 2 -
.../org/apache/cayenne/exp/parser/ASTLike.java | 2 -
.../cayenne/exp/parser/ASTLikeIgnoreCase.java | 2 -
.../org/apache/cayenne/exp/parser/ASTList.java | 2 -
.../org/apache/cayenne/exp/parser/ASTMultiply.java | 2 -
.../cayenne/exp/parser/ASTNamedParameter.java | 2 -
.../org/apache/cayenne/exp/parser/ASTNegate.java | 2 -
.../java/org/apache/cayenne/exp/parser/ASTNot.java | 2 -
.../cayenne/exp/parser/ASTNotLikeIgnoreCase.java | 2 -
.../org/apache/cayenne/exp/parser/ASTObjPath.java | 2 -
.../java/org/apache/cayenne/exp/parser/ASTOr.java | 2 -
.../org/apache/cayenne/exp/parser/ASTPath.java | 2 -
.../cayenne/exp/parser/AggregateConditionNode.java | 2 -
.../cayenne/exp/parser/PatternMatchNode.java | 4 +-
.../org/apache/cayenne/exp/parser/SimpleNode.java | 2 -
.../org/apache/cayenne/exp/path/CayennePath.java | 3 +-
.../cayenne/exp/path/CayennePathSegment.java | 3 +-
.../apache/cayenne/exp/path/EmptyCayennePath.java | 3 +-
.../cayenne/exp/path/MultiSegmentCayennePath.java | 5 +-
.../org/apache/cayenne/exp/path/SegmentList.java | 3 +-
.../cayenne/exp/path/SingleSegmentCayennePath.java | 3 +-
.../apache/cayenne/graph/ArcCreateOperation.java | 2 -
.../apache/cayenne/graph/ArcDeleteOperation.java | 2 -
.../main/java/org/apache/cayenne/graph/ArcId.java | 5 +-
.../org/apache/cayenne/graph/CompoundDiff.java | 2 -
.../java/org/apache/cayenne/graph/GraphDiff.java | 4 +-
.../java/org/apache/cayenne/graph/GraphEvent.java | 2 -
.../apache/cayenne/graph/NodeCreateOperation.java | 2 -
.../apache/cayenne/graph/NodeDeleteOperation.java | 2 -
.../java/org/apache/cayenne/graph/NodeDiff.java | 2 -
.../cayenne/graph/NodeIdChangeOperation.java | 2 -
.../cayenne/graph/NodePropertyChangeOperation.java | 2 -
.../java/org/apache/cayenne/map/Attribute.java | 4 +-
.../org/apache/cayenne/map/CallbackDescriptor.java | 3 +-
.../java/org/apache/cayenne/map/CallbackMap.java | 4 +-
.../main/java/org/apache/cayenne/map/DataMap.java | 7 +-
.../main/java/org/apache/cayenne/map/DbJoin.java | 4 +-
.../org/apache/cayenne/map/DbKeyGenerator.java | 4 +-
.../java/org/apache/cayenne/map/Embeddable.java | 9 +-
.../apache/cayenne/map/EmbeddableAttribute.java | 5 +-
.../main/java/org/apache/cayenne/map/Entity.java | 11 +-
.../org/apache/cayenne/map/EntityResolver.java | 29 +--
.../java/org/apache/cayenne/map/Procedure.java | 4 +-
.../org/apache/cayenne/map/ProcedureParameter.java | 4 +-
.../org/apache/cayenne/map/QueryDescriptor.java | 3 +-
.../java/org/apache/cayenne/map/Relationship.java | 4 +-
.../apache/cayenne/map/SelectQueryDescriptor.java | 2 -
.../apache/cayenne/query/BaseQueryMetadata.java | 17 +-
.../apache/cayenne/query/ColumnSelectMetadata.java | 2 -
.../java/org/apache/cayenne/query/EJBQLQuery.java | 2 +-
.../org/apache/cayenne/query/IndirectQuery.java | 6 +-
.../org/apache/cayenne/query/ObjectIdQuery.java | 10 +-
.../org/apache/cayenne/query/ObjectSelect.java | 2 -
.../apache/cayenne/query/ObjectSelectMetadata.java | 2 -
.../java/org/apache/cayenne/query/Ordering.java | 7 +-
.../org/apache/cayenne/query/PrefetchTreeNode.java | 25 +-
.../cayenne/query/ProcedureQueryMetadata.java | 2 +-
.../main/java/org/apache/cayenne/query/Query.java | 4 +-
.../java/org/apache/cayenne/query/SQLExec.java | 2 -
.../java/org/apache/cayenne/query/SQLSelect.java | 2 -
.../java/org/apache/cayenne/query/SQLTemplate.java | 5 +-
.../java/org/apache/cayenne/query/SelectById.java | 7 +-
.../java/org/apache/cayenne/reflect/Accessor.java | 4 +-
.../org/apache/cayenne/reflect/BeanAccessor.java | 2 -
.../org/apache/cayenne/reflect/MapAccessor.java | 2 -
.../org/apache/cayenne/reflect/PropertyUtils.java | 2 -
.../DefaultValueComparisonStrategyFactory.java | 7 +-
.../generic/PersistentObjectBaseProperty.java | 4 +-
.../java/org/apache/cayenne/resource/Resource.java | 3 +-
.../org/apache/cayenne/runtime/CayenneRuntime.java | 9 +-
.../org/apache/cayenne/util/GenericResponse.java | 8 +-
.../java/org/apache/cayenne/util/ListResponse.java | 6 +-
.../java/org/apache/cayenne/util/ReferenceMap.java | 40 +--
.../org/apache/cayenne/util/SingleEntryMap.java | 5 +-
.../java/org/apache/cayenne/util/SoftValueMap.java | 5 +-
.../main/java/org/apache/cayenne/util/Util.java | 27 ---
.../java/org/apache/cayenne/util/WeakValueMap.java | 5 +-
.../cayenne/validation/ValidationFailure.java | 4 +-
.../cayenne/validation/ValidationResult.java | 3 +-
.../apache/cayenne/DataContextConcurrencyIT.java | 114 ---------
.../apache/cayenne/HybridPersistentObjectIT.java | 16 --
.../apache/cayenne/ObjectContextChangeLogTest.java | 15 --
.../test/java/org/apache/cayenne/ObjectIdTest.java | 29 ---
.../cayenne/PersistentObjectSerializationIT.java | 164 -------------
.../cayenne/access/DataContextSerializationIT.java | 268 ---------------------
.../cayenne/access/DataDomainQueryActionIT.java | 10 +-
.../cayenne/access/EmbeddingSerializeIT.java | 123 ----------
.../cayenne/access/IncrementalFaultListIT.java | 51 ----
.../apache/cayenne/cache/MapQueryCacheTest.java | 50 ----
.../org/apache/cayenne/commitlog/db/AuditLog.java | 2 -
.../apache/cayenne/commitlog/db/Auditable1.java | 2 -
.../apache/cayenne/commitlog/db/Auditable2.java | 2 -
.../apache/cayenne/commitlog/db/Auditable3.java | 2 -
.../apache/cayenne/commitlog/db/Auditable4.java | 2 -
.../apache/cayenne/commitlog/db/Auditable5.java | 2 -
.../cayenne/commitlog/db/AuditableChild1.java | 2 -
.../cayenne/commitlog/db/AuditableChild1x.java | 2 -
.../cayenne/commitlog/db/AuditableChild3.java | 1 -
.../cayenne/commitlog/db/AuditableChild5.java | 2 -
.../java/org/apache/cayenne/commitlog/db/E1.java | 1 -
.../java/org/apache/cayenne/commitlog/db/E2.java | 1 -
.../java/org/apache/cayenne/commitlog/db/E3.java | 2 -
.../java/org/apache/cayenne/commitlog/db/E4.java | 2 -
.../cayenne/commitlog/db/auto/_AuditLog.java | 26 --
.../cayenne/commitlog/db/auto/_Auditable1.java | 27 ---
.../cayenne/commitlog/db/auto/_Auditable2.java | 29 ---
.../cayenne/commitlog/db/auto/_Auditable3.java | 29 ---
.../cayenne/commitlog/db/auto/_Auditable4.java | 30 ---
.../cayenne/commitlog/db/auto/_Auditable5.java | 27 ---
.../commitlog/db/auto/_AuditableChild1.java | 28 ---
.../commitlog/db/auto/_AuditableChild1x.java | 28 ---
.../commitlog/db/auto/_AuditableChild3.java | 30 ---
.../commitlog/db/auto/_AuditableChild5.java | 28 ---
.../org/apache/cayenne/commitlog/db/auto/_E1.java | 24 --
.../org/apache/cayenne/commitlog/db/auto/_E2.java | 24 --
.../org/apache/cayenne/commitlog/db/auto/_E3.java | 25 --
.../org/apache/cayenne/commitlog/db/auto/_E4.java | 25 --
.../cayenne/commitlog/db/auto/_LifecycleMap.java | 2 -
.../org/apache/cayenne/event/EventSubjectTest.java | 12 -
.../java/org/apache/cayenne/map/DataMapTest.java | 15 --
.../java/org/apache/cayenne/map/DbEntityIT.java | 30 ---
.../test/java/org/apache/cayenne/map/EntityIT.java | 31 ---
.../org/apache/cayenne/map/ObjAttributeTest.java | 10 -
.../java/org/apache/cayenne/map/ObjEntityIT.java | 9 -
.../org/apache/cayenne/map/ObjRelationshipIT.java | 13 -
.../apache/cayenne/query/ObjectIdQueryTest.java | 12 -
.../apache/cayenne/query/PrefetchTreeNodeTest.java | 37 ---
.../org/apache/cayenne/query/SQLTemplateTest.java | 15 --
.../PersistentObjectAttributePropertyTest.java | 45 ----
.../testdo/annotation/ArtistAnnotation.java | 2 -
.../testdo/annotation/auto/_ArtistAnnotation.java | 28 ---
.../cayenne/testdo/array_type/ArrayTestEntity.java | 2 -
.../testdo/array_type/auto/_ArrayTestEntity.java | 26 --
.../testdo/binary_pk/auto/_BinaryPKTest1.java | 27 ---
.../testdo/binary_pk/auto/_BinaryPKTest2.java | 28 ---
.../org/apache/cayenne/testdo/cay_2032/Team.java | 2 -
.../org/apache/cayenne/testdo/cay_2032/Users.java | 2 -
.../apache/cayenne/testdo/cay_2032/auto/_Team.java | 25 --
.../cayenne/testdo/cay_2032/auto/_Users.java | 27 ---
.../apache/cayenne/testdo/cay_2641/ArtistLazy.java | 2 -
.../cayenne/testdo/cay_2641/PaintingLazy.java | 2 -
.../cayenne/testdo/cay_2641/auto/_ArtistLazy.java | 29 ---
.../testdo/cay_2641/auto/_PaintingLazy.java | 28 ---
.../apache/cayenne/testdo/cay_2666/CAY2666.java | 2 -
.../cayenne/testdo/cay_2666/auto/_CAY2666.java | 26 --
.../cayenne/testdo/compound/CompoundIntPk.java | 2 -
.../cayenne/testdo/compound/CompoundOrder.java | 2 -
.../cayenne/testdo/compound/CompoundOrderLine.java | 2 -
.../testdo/compound/CompoundOrderLineInfo.java | 2 -
.../testdo/compound/auto/_CharFkTestEntity.java | 28 ---
.../testdo/compound/auto/_CharPkTestEntity.java | 29 ---
.../compound/auto/_CompoundFkTestEntity.java | 28 ---
.../testdo/compound/auto/_CompoundIntPk.java | 30 ---
.../testdo/compound/auto/_CompoundOrder.java | 27 ---
.../testdo/compound/auto/_CompoundOrderLine.java | 30 ---
.../compound/auto/_CompoundOrderLineInfo.java | 28 ---
.../compound/auto/_CompoundPkTestEntity.java | 31 ---
.../testdo/datetime/DurationTestEntity.java | 2 -
.../testdo/datetime/LocalDateTestEntity.java | 2 -
.../testdo/datetime/LocalDateTimeTestEntity.java | 2 -
.../testdo/datetime/LocalTimeTestEntity.java | 2 -
.../cayenne/testdo/datetime/PeriodTestEntity.java | 2 -
.../testdo/datetime/auto/_DurationTestEntity.java | 35 ---
.../testdo/datetime/auto/_LocalDateTestEntity.java | 25 --
.../datetime/auto/_LocalDateTimeTestEntity.java | 25 --
.../testdo/datetime/auto/_LocalTimeTestEntity.java | 25 --
.../testdo/datetime/auto/_PeriodTestEntity.java | 25 --
.../cayenne/testdo/db1/auto/_CrossdbM1E1.java | 29 ---
.../cayenne/testdo/db2/auto/_CrossdbM2E1.java | 27 ---
.../cayenne/testdo/db2/auto/_CrossdbM2E2.java | 30 ---
.../cayenne/testdo/embeddable/EmbedChild.java | 2 -
.../cayenne/testdo/embeddable/EmbedEntity1.java | 2 -
.../cayenne/testdo/embeddable/EmbedEntity2.java | 2 -
.../cayenne/testdo/embeddable/EmbedRoot.java | 2 -
.../testdo/embeddable/auto/_EmbedChild.java | 26 --
.../testdo/embeddable/auto/_EmbedEntity1.java | 31 ---
.../testdo/embeddable/auto/_EmbedEntity2.java | 30 ---
.../cayenne/testdo/embeddable/auto/_EmbedRoot.java | 30 ---
.../testdo/embeddable/auto/_Embeddable1.java | 4 +-
.../cayenne/testdo/enum_test/EnumEntity2.java | 2 -
.../cayenne/testdo/enum_test/EnumEntity3.java | 2 -
.../cayenne/testdo/enum_test/auto/_EnumEntity.java | 26 --
.../testdo/enum_test/auto/_EnumEntity2.java | 26 --
.../testdo/enum_test/auto/_EnumEntity3.java | 26 --
.../extended_type/auto/_ExtendedTypeEntity.java | 26 --
.../testdo/generated/GeneratedReflexive.java | 2 -
.../generated/auto/_GeneratedColumnCompKey.java | 28 ---
.../generated/auto/_GeneratedColumnCompMaster.java | 27 ---
.../testdo/generated/auto/_GeneratedColumnDep.java | 28 ---
.../generated/auto/_GeneratedColumnTest2.java | 26 --
.../generated/auto/_GeneratedColumnTestEntity.java | 28 ---
.../testdo/generated/auto/_GeneratedF1.java | 25 --
.../testdo/generated/auto/_GeneratedF2.java | 25 --
.../testdo/generated/auto/_GeneratedReflexive.java | 28 ---
.../cayenne/testdo/generic/auto/_Generic.java | 2 -
.../cayenne/testdo/hybrid/HybridEntity1.java | 2 -
.../cayenne/testdo/hybrid/HybridEntity2.java | 2 -
.../cayenne/testdo/hybrid/auto/_HybridEntity1.java | 29 ---
.../cayenne/testdo/hybrid/auto/_HybridEntity2.java | 30 ---
.../testdo/inheritance/auto/_BaseEntity.java | 30 ---
.../inheritance/auto/_DirectToSubEntity.java | 25 --
.../testdo/inheritance/auto/_RelatedEntity.java | 27 ---
.../testdo/inheritance/auto/_SubEntity.java | 24 --
.../testdo/inheritance_flat/auto/_Group.java | 27 ---
.../inheritance_flat/auto/_GroupProperties.java | 30 ---
.../inheritance_flat/auto/_InheritanceFlat.java | 2 -
.../testdo/inheritance_flat/auto/_Role.java | 31 ---
.../testdo/inheritance_flat/auto/_User.java | 26 --
.../inheritance_flat/auto/_UserProperties.java | 30 ---
.../inheritance_people/auto/_AbstractPerson.java | 29 ---
.../testdo/inheritance_people/auto/_Address.java | 28 ---
.../inheritance_people/auto/_ClientCompany.java | 27 ---
.../auto/_CustomerRepresentative.java | 28 ---
.../inheritance_people/auto/_Department.java | 29 ---
.../testdo/inheritance_people/auto/_Employee.java | 29 ---
.../testdo/inheritance_people/auto/_Manager.java | 25 --
.../testdo/inheritance_people/auto/_People.java | 2 -
.../inheritance_people/auto/_PersonNotes.java | 28 ---
.../testdo/inheritance_vertical/IvAbstract.java | 2 -
.../testdo/inheritance_vertical/IvBase.java | 2 -
.../inheritance_vertical/IvBaseWithLock.java | 2 -
.../testdo/inheritance_vertical/IvConcrete.java | 2 -
.../testdo/inheritance_vertical/IvGenKeyRoot.java | 2 -
.../testdo/inheritance_vertical/IvGenKeySub.java | 2 -
.../testdo/inheritance_vertical/IvImpl.java | 2 -
.../inheritance_vertical/IvImplWithLock.java | 2 -
.../testdo/inheritance_vertical/IvOther.java | 2 -
.../testdo/inheritance_vertical/IvSub3.java | 2 -
.../auto/_InheritanceVertical.java | 2 -
.../testdo/inheritance_vertical/auto/_Iv1Root.java | 28 ---
.../testdo/inheritance_vertical/auto/_Iv1Sub1.java | 26 --
.../testdo/inheritance_vertical/auto/_Iv2Root.java | 26 --
.../testdo/inheritance_vertical/auto/_Iv2Sub1.java | 26 --
.../testdo/inheritance_vertical/auto/_Iv2X.java | 24 --
.../inheritance_vertical/auto/_IvAbstract.java | 28 ---
.../testdo/inheritance_vertical/auto/_IvBase.java | 29 ---
.../inheritance_vertical/auto/_IvBaseWithLock.java | 28 ---
.../inheritance_vertical/auto/_IvConcrete.java | 31 ---
.../inheritance_vertical/auto/_IvGenKeyRoot.java | 28 ---
.../inheritance_vertical/auto/_IvGenKeySub.java | 24 --
.../testdo/inheritance_vertical/auto/_IvImpl.java | 37 ---
.../inheritance_vertical/auto/_IvImplWithLock.java | 28 ---
.../testdo/inheritance_vertical/auto/_IvOther.java | 35 ---
.../testdo/inheritance_vertical/auto/_IvRoot.java | 28 ---
.../testdo/inheritance_vertical/auto/_IvSub1.java | 28 ---
.../inheritance_vertical/auto/_IvSub1Sub1.java | 26 --
.../testdo/inheritance_vertical/auto/_IvSub2.java | 28 ---
.../testdo/inheritance_vertical/auto/_IvSub3.java | 26 --
.../testdo/inheritance_with_enum/Dependent.java | 2 -
.../cayenne/testdo/inheritance_with_enum/Root.java | 2 -
.../cayenne/testdo/inheritance_with_enum/Sub.java | 2 -
.../inheritance_with_enum/auto/_Dependent.java | 28 ---
.../testdo/inheritance_with_enum/auto/_Root.java | 29 ---
.../testdo/inheritance_with_enum/auto/_Sub.java | 26 --
.../org/apache/cayenne/testdo/json/JsonOther.java | 2 -
.../apache/cayenne/testdo/json/JsonVarchar.java | 2 -
.../cayenne/testdo/json/auto/_JsonOther.java | 26 --
.../cayenne/testdo/json/auto/_JsonVarchar.java | 26 --
.../org/apache/cayenne/testdo/lazy/Lazyblob.java | 2 -
.../apache/cayenne/testdo/lazy/auto/_Lazyblob.java | 28 ---
.../legacy_datetime/auto/_CalendarEntity.java | 25 --
.../legacy_datetime/auto/_DateTestEntity.java | 29 ---
.../lifecycle_callbacks_order/Lifecycle.java | 1 -
.../lifecycle_callbacks_order/auto/_Lifecycle.java | 26 --
.../cayenne/testdo/lob/auto/_BlobTestEntity.java | 26 --
.../cayenne/testdo/lob/auto/_ClobTestEntity.java | 27 ---
.../cayenne/testdo/lob/auto/_ClobTestRelation.java | 30 ---
.../cayenne/testdo/lob/auto/_NClobTestEntity.java | 26 --
.../cayenne/testdo/locking/auto/_Locking.java | 2 -
.../testdo/locking/auto/_LockingHelper.java | 28 ---
.../testdo/locking/auto/_RelLockingTestEntity.java | 29 ---
.../locking/auto/_SimpleLockingTestEntity.java | 32 ---
.../testdo/map_to_many/auto/_IdMapToMany.java | 25 --
.../map_to_many/auto/_IdMapToManyTarget.java | 26 --
.../testdo/map_to_many/auto/_MapToMany.java | 25 --
.../testdo/map_to_many/auto/_MapToManyTarget.java | 28 ---
.../testdo/meaningful_pk/MeaningfulPkBigint.java | 2 -
.../meaningful_pk/MeaningfulPkBigintGenerated.java | 2 -
.../testdo/meaningful_pk/MeaningfulPkDep2.java | 2 -
.../testdo/meaningful_pk/MeaningfulPkTest2.java | 2 -
.../meaningful_pk/auto/_MeaningfulPKDep.java | 30 ---
.../meaningful_pk/auto/_MeaningfulPKTest1.java | 33 ---
.../testdo/meaningful_pk/auto/_MeaningfulPk.java | 28 ---
.../meaningful_pk/auto/_MeaningfulPkBigint.java | 25 --
.../auto/_MeaningfulPkBigintGenerated.java | 27 ---
.../meaningful_pk/auto/_MeaningfulPkDep2.java | 30 ---
.../meaningful_pk/auto/_MeaningfulPkTest2.java | 30 ---
.../cayenne/testdo/misc_types/ArraysEntity.java | 2 -
.../testdo/misc_types/auto/_ArraysEntity.java | 32 ---
.../testdo/misc_types/auto/_CharacterEntity.java | 26 --
.../misc_types/auto/_SerializableEntity.java | 26 --
.../auto/_MixedPersistenceStrategy.java | 29 ---
.../auto/_MixedPersistenceStrategy2.java | 28 ---
.../apache/cayenne/testdo/mt/auto/_MtTable1.java | 29 ---
.../cayenne/testdo/mt/auto/_MtTable1Subclass1.java | 26 --
.../cayenne/testdo/mt/auto/_MtTable1Subclass2.java | 26 --
.../apache/cayenne/testdo/mt/auto/_MtTable2.java | 30 ---
.../apache/cayenne/testdo/mt/auto/_MtTable3.java | 31 ---
.../apache/cayenne/testdo/mt/auto/_MtTable4.java | 25 --
.../apache/cayenne/testdo/mt/auto/_MtTable5.java | 25 --
.../cayenne/testdo/no_pk/auto/_NoPkTestEntity.java | 26 --
.../testdo/numeric_types/BigDecimalEntity.java | 2 -
.../testdo/numeric_types/BigIntegerEntity.java | 2 -
.../numeric_types/auto/_BigDecimalEntity.java | 27 ---
.../numeric_types/auto/_BigIntegerEntity.java | 25 --
.../numeric_types/auto/_BitNumberTestEntity.java | 26 --
.../testdo/numeric_types/auto/_BitTestEntity.java | 26 --
.../numeric_types/auto/_BooleanTestEntity.java | 26 --
.../testdo/numeric_types/auto/_DecimalPKTest1.java | 28 ---
.../numeric_types/auto/_DecimalPKTestEntity.java | 27 ---
.../testdo/numeric_types/auto/_LongEntity.java | 26 --
.../numeric_types/auto/_SmallintTestEntity.java | 26 --
.../numeric_types/auto/_TinyintTestEntity.java | 26 --
.../cayenne/testdo/oneway/auto/_OnewayRels.java | 2 -
.../cayenne/testdo/oneway/auto/_OnewayTable1.java | 24 --
.../cayenne/testdo/oneway/auto/_OnewayTable2.java | 28 ---
.../cayenne/testdo/oneway/auto/_OnewayTable3.java | 25 --
.../cayenne/testdo/oneway/auto/_OnewayTable4.java | 24 --
.../primitive/auto/_PrimitivesTestEntity.java | 30 ---
.../cayenne/testdo/qualified/Qualified3.java | 2 -
.../cayenne/testdo/qualified/Qualified4.java | 2 -
.../cayenne/testdo/qualified/auto/_Qualified1.java | 29 ---
.../cayenne/testdo/qualified/auto/_Qualified2.java | 30 ---
.../cayenne/testdo/qualified/auto/_Qualified3.java | 27 ---
.../cayenne/testdo/qualified/auto/_Qualified4.java | 28 ---
.../cayenne/testdo/quotemap/auto/_QuoteAdress.java | 30 ---
.../testdo/quotemap/auto/_Quote_Person.java | 35 ---
.../cayenne/testdo/quotemap/auto/_Quotemap.java | 2 -
.../cayenne/testdo/reflexive/auto/_Other.java | 27 ---
.../cayenne/testdo/reflexive/auto/_Reflexive.java | 31 ---
.../apache/cayenne/testdo/relationships/E1.java | 2 -
.../apache/cayenne/testdo/relationships/E2.java | 2 -
.../cayenne/testdo/relationships/auto/_E1.java | 29 ---
.../cayenne/testdo/relationships/auto/_E2.java | 29 ---
.../relationships/auto/_FkOfDifferentType.java | 26 --
.../testdo/relationships/auto/_MeaningfulFK.java | 28 ---
.../relationships/auto/_ReflexiveAndToOne.java | 31 ---
.../relationships/auto/_RelationshipHelper.java | 31 ---
.../testdo/relationships/auto/_Relationships.java | 2 -
.../relationships_activity/auto/_Activity.java | 29 ---
.../auto/_ActivityResult.java | 29 ---
.../auto/_Relationships1.java | 2 -
.../relationships_child_master/auto/_Child.java | 26 --
.../relationships_child_master/auto/_Master.java | 27 ---
.../relationships_clob/auto/_ClobDetail.java | 28 ---
.../relationships_clob/auto/_ClobMaster.java | 29 ---
.../auto/_CollectionToMany.java | 25 --
.../auto/_CollectionToManyTarget.java | 26 --
.../auto/_DeleteRuleFlatA.java | 25 --
.../auto/_DeleteRuleFlatB.java | 25 --
.../auto/_DeleteRuleTest1.java | 26 --
.../auto/_DeleteRuleTest2.java | 27 ---
.../auto/_DeleteRuleTest3.java | 26 --
.../testdo/relationships_flattened/Entity1.java | 2 -
.../testdo/relationships_flattened/Entity2.java | 2 -
.../testdo/relationships_flattened/Entity3.java | 2 -
.../relationships_flattened/auto/_Entity1.java | 26 --
.../relationships_flattened/auto/_Entity2.java | 24 --
.../relationships_flattened/auto/_Entity3.java | 24 --
.../auto/_FlattenedCircular.java | 27 ---
.../auto/_FlattenedTest1.java | 35 ---
.../auto/_FlattenedTest2.java | 29 ---
.../auto/_FlattenedTest3.java | 31 ---
.../auto/_FlattenedTest4.java | 28 ---
.../auto/_FlattenedTest5.java | 28 ---
.../relationships_many_to_many_join/Author.java | 2 -
.../SelfRelationship.java | 2 -
.../SelfRelationshipSub.java | 2 -
.../relationships_many_to_many_join/Song.java | 2 -
.../auto/_Author.java | 26 --
.../auto/_SelfRelationship.java | 29 ---
.../auto/_SelfRelationshipSub.java | 25 --
.../auto/_Song.java | 27 ---
.../relationships_set_to_many/auto/_SetToMany.java | 25 --
.../auto/_SetToManyTarget.java | 26 --
.../auto/_ToManyFkDep.java | 32 ---
.../auto/_ToManyFkRoot.java | 29 ---
.../auto/_ToManyRoot2.java | 27 ---
.../relationships_to_one_fk/auto/_ToOneFK1.java | 26 --
.../relationships_to_one_fk/auto/_ToOneFK2.java | 26 --
.../testdo/return_types/auto/_ReturnTypesMap1.java | 63 -----
.../testdo/return_types/auto/_ReturnTypesMap2.java | 32 ---
.../return_types/auto/_ReturnTypesMapLobs1.java | 28 ---
.../testdo/soft_delete/auto/_HardDelete.java | 26 --
.../testdo/soft_delete/auto/_SoftDelete.java | 28 ---
.../table_primitives/auto/_TablePrimitives.java | 28 ---
.../apache/cayenne/testdo/testmap/ArtGroup.java | 2 -
.../testdo/testmap/ArtPersistentObject.java | 2 -
.../org/apache/cayenne/testdo/testmap/Artist.java | 2 -
.../cayenne/testdo/testmap/ArtistCallback.java | 2 -
.../cayenne/testdo/testmap/ArtistExhibit.java | 2 -
.../org/apache/cayenne/testdo/testmap/Award.java | 2 -
.../cayenne/testdo/testmap/auto/_ArtGroup.java | 31 ---
.../cayenne/testdo/testmap/auto/_Artist.java | 35 ---
.../testdo/testmap/auto/_ArtistCallback.java | 27 ---
.../testdo/testmap/auto/_ArtistExhibit.java | 28 ---
.../apache/cayenne/testdo/testmap/auto/_Award.java | 28 ---
.../testdo/testmap/auto/_CompoundPainting.java | 39 ---
.../testmap/auto/_CompoundPaintingLongNames.java | 43 ----
.../cayenne/testdo/testmap/auto/_Exhibit.java | 31 ---
.../cayenne/testdo/testmap/auto/_Gallery.java | 29 ---
.../auto/_MeaningfulGeneratedColumnTestEntity.java | 28 ---
.../testdo/testmap/auto/_NullTestEntity.java | 26 --
.../cayenne/testdo/testmap/auto/_Painting.java | 35 ---
.../cayenne/testdo/testmap/auto/_Painting1.java | 29 ---
.../cayenne/testdo/testmap/auto/_PaintingInfo.java | 30 ---
.../cayenne/testdo/testmap/auto/_ROArtist.java | 29 ---
.../cayenne/testdo/testmap/auto/_ROPainting.java | 29 ---
.../testdo/testmap/auto/_RWCompoundPainting.java | 29 ---
.../cayenne/testdo/testmap/auto/_SubPainting.java | 26 --
.../java/org/apache/cayenne/testdo/things/Bag.java | 2 -
.../org/apache/cayenne/testdo/things/Ball.java | 2 -
.../apache/cayenne/testdo/things/auto/_Bag.java | 31 ---
.../apache/cayenne/testdo/things/auto/_Ball.java | 32 ---
.../apache/cayenne/testdo/things/auto/_Box.java | 33 ---
.../cayenne/testdo/things/auto/_BoxInfo.java | 28 ---
.../apache/cayenne/testdo/things/auto/_Thing.java | 31 ---
.../unsupported_distinct_types/Customer.java | 2 -
.../testdo/unsupported_distinct_types/Product.java | 2 -
.../unsupported_distinct_types/auto/_Customer.java | 27 ---
.../unsupported_distinct_types/auto/_Product.java | 31 ---
.../auto/_UnsupportedDistinctTypes.java | 2 -
.../testdo/uuid/auto/_UuidBinTestEntity.java | 25 --
.../cayenne/testdo/uuid/auto/_UuidPkEntity.java | 25 --
.../cayenne/testdo/uuid/auto/_UuidTestEntity.java | 25 --
.../cayenne/testdo/weighted_sort/SortDep.java | 2 -
.../cayenne/testdo/weighted_sort/SortRoot.java | 2 -
.../testdo/weighted_sort/auto/_SortDep.java | 26 --
.../testdo/weighted_sort/auto/_SortRoot.java | 25 --
.../apache/cayenne/util/GenericResponseTest.java | 29 ---
.../org/apache/cayenne/util/ListResponseTest.java | 13 -
.../org/apache/cayenne/util/MockSerializable.java | 33 ---
.../java/org/apache/cayenne/util/UtilTest.java | 9 -
.../org/apache/cayenne/util/WeakValueMapTest.java | 27 ---
.../_cayenne-guide/part2/objectContext.adoc | 2 +-
.../cayenne/tutorial/persistent/auto/_Artist.java | 29 ---
.../cayenne/tutorial/persistent/auto/_Datamap.java | 2 -
.../cayenne/tutorial/persistent/auto/_Gallery.java | 27 ---
.../tutorial/persistent/auto/_Painting.java | 30 ---
543 files changed, 143 insertions(+), 9075 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index a6dbc5381..9114e8bd8 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -26,6 +26,7 @@ CAY-3015 Get rid of RefreshQuery
CAY-3016 Get rid of RelationshipQuery
CAY-3017 ObjectContext should not be a DataChannel
CAY-3019 Skip noop conditions in generated SQL
+CAY-3020 Remove serialization contracts
Bug Fixes:
diff --git a/UPGRADE.md b/UPGRADE.md
index 3980f428d..8b94f3dea 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -141,6 +141,13 @@ Expression caseWhenExp = caseWhen(
methods are no longer accessible on the context itself. Application code wasn't ever not supposed to use them, as
everything you need to do, you can do via the ObjectContext API.
+* Per [CAY-3020](https://issues.apache.org/jira/browse/CAY-3020) Cayenne no longer supports Java serialization of
+ contexts, queries and mapping objects. `Persistent`, `ObjectContext`, `ObjectId`, `Query`, `Expression`, `Ordering`,
+ `EntityResolver`, `DataMap`, etc. do not implement `java.io.Serializable` anymore, and the custom
+ `readObject` / `writeObject` logic that re-attached deserialized contexts and objects to the runtime is gone. The
+ class generation templates no longer emit `serialVersionUID`, `writeObject` / `readObject` and
+ `writeState` / `readState`.
+
* The `org.apache.cayenne.query.ParameterizedQuery` interface was removed, together with the `createQuery(Map)`
methods of `SQLTemplate`, `ProcedureQuery` and `ObjectSelect` that implemented it. Applying parameters to a mapped
query is now the job of the query descriptor - override `QueryDescriptor.buildQuery(Map)` if you have a custom
@@ -175,7 +182,6 @@ Expression caseWhenExp = caseWhen(
instead; to iterate over `DataRow`s, pass a `DataRow` query, e.g. `ObjectSelect.dataRowQuery(Artist.class)` or
`SQLSelect.dataRowQuery(sql)`.
-
## Upgrading to 5.0-M3
diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/E1.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/E1.java
index 7ff7d6d73..d9bebce89 100644
--- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/E1.java
+++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/E1.java
@@ -24,6 +24,4 @@ import org.apache.cayenne.cache.invalidation.db.auto._E1;
@CacheGroups({"g1", "g2"})
public class E1 extends _E1 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/E2.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/E2.java
index a857a6af9..4e8fa7137 100644
--- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/E2.java
+++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/E2.java
@@ -34,6 +34,4 @@ import org.apache.cayenne.cache.invalidation.db.auto._E2;
@CacheGroup("g6")
public class E2 extends _E2 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/auto/_E1.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/auto/_E1.java
index 44e98aad0..e1bccafd8 100644
--- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/auto/_E1.java
+++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/auto/_E1.java
@@ -10,8 +10,6 @@ import org.apache.cayenne.GenericPersistentObject;
*/
public abstract class _E1 extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final String ID_PK_COLUMN = "ID";
diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/auto/_E2.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/auto/_E2.java
index 0e71554af..7ce229cf3 100644
--- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/auto/_E2.java
+++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/db/auto/_E2.java
@@ -10,8 +10,6 @@ import org.apache.cayenne.GenericPersistentObject;
*/
public abstract class _E2 extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final String ID_PK_COLUMN = "ID";
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
index ac4576276..7798a9eb1 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
@@ -29,7 +29,6 @@ import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
import org.apache.cayenne.validation.ValidationException;
-import java.io.Serializable;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
@@ -46,7 +45,7 @@ import java.util.stream.Collectors;
*
* @since 4.1
*/
-public class CgenConfiguration implements Serializable, XMLSerializable {
+public class CgenConfiguration implements XMLSerializable {
/**
* Absolute directory this configuration is anchored to, normally the one holding the Cayenne
diff --git a/cayenne-cgen/src/main/resources/templates/v4_1/embeddable-singleclass.vm b/cayenne-cgen/src/main/resources/templates/v4_1/embeddable-singleclass.vm
index 6ffb57827..51c9e2aaa 100644
--- a/cayenne-cgen/src/main/resources/templates/v4_1/embeddable-singleclass.vm
+++ b/cayenne-cgen/src/main/resources/templates/v4_1/embeddable-singleclass.vm
@@ -35,7 +35,6 @@
##
##
${importUtils.setPackage($subPackageName)}##
-${importUtils.addType("java.io.Serializable")}##
${importUtils.addReservedType("${subPackageName}.${subClassName}")}##
${importUtils.addType("org.apache.cayenne.EmbeddableObject")}##
${importUtils.addType("org.apache.cayenne.Persistent")}##
@@ -45,7 +44,7 @@ $propertyUtils.addImport($attr)##
${importUtils.generate()}
## extends ${baseClassName} - always Object, so skip it
-public class ${subClassName} implements EmbeddableObject, Serializable {
+public class ${subClassName} implements EmbeddableObject {
## Create property names
#if( $createPropertyNames )
diff --git a/cayenne-cgen/src/main/resources/templates/v4_1/embeddable-superclass.vm b/cayenne-cgen/src/main/resources/templates/v4_1/embeddable-superclass.vm
index c040c3e67..ecb0d7433 100644
--- a/cayenne-cgen/src/main/resources/templates/v4_1/embeddable-superclass.vm
+++ b/cayenne-cgen/src/main/resources/templates/v4_1/embeddable-superclass.vm
@@ -35,7 +35,6 @@
##
##
${importUtils.setPackage($superPackageName)}##
-${importUtils.addType("java.io.Serializable")}##
${importUtils.addReservedType("${superPackageName}.${superClassName}")}##
${importUtils.addType("org.apache.cayenne.EmbeddableObject")}##
${importUtils.addType("org.apache.cayenne.Persistent")}##
@@ -51,7 +50,7 @@ ${importUtils.generate()}
* If you need to make any customizations, please use subclass.
*/
## extends ${baseClassName} - always Object, so skip it
-public abstract class ${superClassName} implements EmbeddableObject, Serializable {
+public abstract class ${superClassName} implements EmbeddableObject {
## Create property names
#if( $createPropertyNames )
diff --git a/cayenne-cgen/src/main/resources/templates/v4_1/singleclass.vm b/cayenne-cgen/src/main/resources/templates/v4_1/singleclass.vm
index 7c6d03573..2ba5d5ca2 100644
--- a/cayenne-cgen/src/main/resources/templates/v4_1/singleclass.vm
+++ b/cayenne-cgen/src/main/resources/templates/v4_1/singleclass.vm
@@ -36,9 +36,6 @@
${importUtils.setPackage($subPackageName)}##
${importUtils.addReservedType("${subPackageName}.${subClassName}")}##
${importUtils.addType("${basePackageName}.${baseClassName}")}##
-${importUtils.addType("java.io.IOException")}##
-${importUtils.addType("java.io.ObjectInputStream")}##
-${importUtils.addType("java.io.ObjectOutputStream")}##
#if( $createPKProperties )
$propertyUtils.addImportForPK($entityUtils)##
#end
@@ -59,8 +56,6 @@ ${importUtils.generate()}
#end
public#if("true" == "${object.isAbstract()}") abstract#end class ${subClassName} extends ${baseClassName} {
- private static final long serialVersionUID = 1L;
-
###########################
## Create self property ##
###########################
@@ -271,54 +266,4 @@ public#if("true" == "${object.isAbstract()}") abstract#end class ${subClassName}
}
}
-##################################
-## Create serialization support ##
-##################################
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
-#foreach( $attr in ${object.DeclaredAttributes} )
-#set ( $name = "$stringUtils.formatVariableName(${attr.Name})")
-#set ( $flag = $importUtils.canUsePrimitive($attr) )
-#set ( $type = "$importUtils.formatJavaType(${attr.Type}, $flag)")
-#if($importUtils.isPrimitive($type))
- out.write${stringUtils.capitalized($type)}(this.$name);
-#else
- out.writeObject(this.${name});
-#end
-#end
-#foreach( $rel in ${object.DeclaredRelationships} )
- out.writeObject(this.${stringUtils.formatVariableName($rel.Name)});
-#end
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
-#foreach( $attr in ${object.DeclaredAttributes} )
-#set ( $name = "$stringUtils.formatVariableName(${attr.Name})")
-#set ( $flag = $importUtils.canUsePrimitive($attr) )
-#set ( $type = "$importUtils.formatJavaType(${attr.Type}, $flag)")
-#if($attr.Lazy)
- this.$name = in.readObject();
-#elseif($importUtils.isPrimitive($type))
- this.$name = in.read${stringUtils.capitalized($type)}();
-#else
- this.$name = ($type)in.readObject();
-#end
-#end
-#foreach( $rel in ${object.DeclaredRelationships} )
-#set ( $name = "${stringUtils.formatVariableName($rel.Name)}")
- this.$name = in.readObject();
-#end
- }
-
}
diff --git a/cayenne-cgen/src/main/resources/templates/v4_1/subclass.vm b/cayenne-cgen/src/main/resources/templates/v4_1/subclass.vm
index a2078d1bb..026f00ea9 100644
--- a/cayenne-cgen/src/main/resources/templates/v4_1/subclass.vm
+++ b/cayenne-cgen/src/main/resources/templates/v4_1/subclass.vm
@@ -34,8 +34,6 @@ ${importUtils.generate()}
public#if("true" == "${object.isAbstract()}") abstract#end class ${subClassName} extends ${superClassName} {
- private static final long serialVersionUID = 1L;
-
##callbacks
#foreach($cbname in ${entityUtils.callbackNames})
@Override
diff --git a/cayenne-cgen/src/main/resources/templates/v4_1/superclass.vm b/cayenne-cgen/src/main/resources/templates/v4_1/superclass.vm
index b20d2def1..291ab986b 100644
--- a/cayenne-cgen/src/main/resources/templates/v4_1/superclass.vm
+++ b/cayenne-cgen/src/main/resources/templates/v4_1/superclass.vm
@@ -38,9 +38,6 @@
${importUtils.setPackage($superPackageName)}##
${importUtils.addReservedType("${superPackageName}.${superClassName}")}##
${importUtils.addType("${basePackageName}.${baseClassName}")}##
-${importUtils.addType("java.io.IOException")}##
-${importUtils.addType("java.io.ObjectInputStream")}##
-${importUtils.addType("java.io.ObjectOutputStream")}##
#if( $createPKProperties )
$propertyUtils.addImportForPK($entityUtils)##
#end
@@ -67,8 +64,6 @@ ${importUtils.generate()}
*/
public abstract class ${superClassName} extends ${baseClassName} {
- private static final long serialVersionUID = 1L;
-
###########################
## Create self property ##
###########################
@@ -277,54 +272,4 @@ public abstract class ${superClassName} extends ${baseClassName} {
}
}
-##################################
-## Create serialization support ##
-##################################
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
-#foreach( $attr in ${object.DeclaredAttributes} )
-#set ( $name = "$stringUtils.formatVariableName(${attr.Name})")
-#set ( $flag = $importUtils.canUsePrimitive($attr) )
-#set ( $type = "$importUtils.formatJavaType(${attr.Type}, $flag)")
-#if($importUtils.isPrimitive($type))
- out.write${stringUtils.capitalized($type)}(this.$name);
-#else
- out.writeObject(this.${name});
-#end
-#end
-#foreach( $rel in ${object.DeclaredRelationships} )
- out.writeObject(this.${stringUtils.formatVariableName($rel.Name)});
-#end
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
-#foreach( $attr in ${object.DeclaredAttributes} )
-#set ( $name = "$stringUtils.formatVariableName(${attr.Name})")
-#set ( $flag = $importUtils.canUsePrimitive($attr) )
-#set ( $type = "$importUtils.formatJavaType(${attr.Type}, $flag)")
-#if($attr.Lazy)
- this.$name = in.readObject();
-#elseif($importUtils.isPrimitive($type))
- this.$name = in.read${stringUtils.capitalized($type)}();
-#else
- this.$name = ($type)in.readObject();
-#end
-#end
-#foreach( $rel in ${object.DeclaredRelationships} )
-#set ( $name = "${stringUtils.formatVariableName($rel.Name)}")
- this.$name = in.readObject();
-#end
- }
-
}
diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
index dfcb01263..a891b07c5 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
@@ -110,8 +110,6 @@ public class ClassGenerationActionTest extends CgenCase {
ObjRelationship relationship = new ObjRelationship("xMap") {
- private static final long serialVersionUID = 8042147877503405974L;
-
@Override
public boolean isToMany() {
return true;
diff --git a/cayenne-cgen/src/test/resources/templateTest/_ObjEntity.java b/cayenne-cgen/src/test/resources/templateTest/_ObjEntity.java
index 1a036c044..5ede3e7df 100644
--- a/cayenne-cgen/src/test/resources/templateTest/_ObjEntity.java
+++ b/cayenne-cgen/src/test/resources/templateTest/_ObjEntity.java
@@ -4,7 +4,5 @@ import test.auto._ObjEntity;
public class ObjEntity extends _ObjEntity {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-cgen/src/test/resources/templateTest/_auto/_ObjEntity.java b/cayenne-cgen/src/test/resources/templateTest/_auto/_ObjEntity.java
index 664fe1a09..fd344bcda 100644
--- a/cayenne-cgen/src/test/resources/templateTest/_auto/_ObjEntity.java
+++ b/cayenne-cgen/src/test/resources/templateTest/_auto/_ObjEntity.java
@@ -1,9 +1,5 @@
package test.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
@@ -18,8 +14,6 @@ import test.ObjEntity;
*/
public abstract class _ObjEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<ObjEntity> SELF = PropertyFactory.createSelf(ObjEntity.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("id", "null", Integer.class);
@@ -50,22 +44,4 @@ public abstract class _ObjEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- }
-
}
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java
index 11f746eb9..3c13fc9f7 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java
@@ -47,8 +47,6 @@ public class JceksKeySource implements KeySource {
private static final String JCEKS_KEYSTORE_TYPE = "jceks";
private static final Key NULL_KEY = new Key() {
- private static final long serialVersionUID = 4755682444381893880L;
-
@Override
public String getFormat() {
throw new UnsupportedOperationException();
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table1.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table1.java
index 6718e99ca..311f6d0fc 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table1.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table1.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.crypto.db.auto._Table1;
public class Table1 extends _Table1 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table2.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table2.java
index 24040b1d6..8e913a1c3 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table2.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table2.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.crypto.db.auto._Table2;
public class Table2 extends _Table2 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table3.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table3.java
index 712808a46..a90879a0b 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table3.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table3.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.crypto.db.auto._Table3;
public class Table3 extends _Table3 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table4.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table4.java
index 163aa1398..ea619d05b 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table4.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table4.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.crypto.db.auto._Table4;
public class Table4 extends _Table4 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table5.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table5.java
index 7f3e31d93..d7559fef7 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table5.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table5.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.crypto.db.auto._Table5;
public class Table5 extends _Table5 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table6.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table6.java
index 9faa527b3..2ee430822 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table6.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table6.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.crypto.db.auto._Table6;
public class Table6 extends _Table6 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table7.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table7.java
index 74bbced42..0a54dab5c 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table7.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table7.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.crypto.db.auto._Table7;
public class Table7 extends _Table7 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table8.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table8.java
index c4286ccc7..72f08a0d9 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table8.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/Table8.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.crypto.db.auto._Table8;
public class Table8 extends _Table8 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table1.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table1.java
index 20db56ba3..3be126fc4 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table1.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table1.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.crypto.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -23,8 +20,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _Table1 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Table1> SELF = PropertyFactory.createSelf(Table1.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table1", Integer.class);
@@ -151,32 +146,4 @@ public abstract class _Table1 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.cryptoInt);
- out.writeObject(this.cryptoString);
- out.writeObject(this.plainInt);
- out.writeObject(this.plainString);
- out.writeObject(this.table7s);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.cryptoInt = (Integer)in.readObject();
- this.cryptoString = (String)in.readObject();
- this.plainInt = (Integer)in.readObject();
- this.plainString = (String)in.readObject();
- this.table7s = in.readObject();
- }
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table2.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table2.java
index c8f24437f..def2cab88 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table2.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table2.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.crypto.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.crypto.db.Table2;
import org.apache.cayenne.exp.property.BaseProperty;
@@ -19,8 +15,6 @@ import org.apache.cayenne.exp.property.SelfProperty;
*/
public abstract class _Table2 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Table2> SELF = PropertyFactory.createSelf(Table2.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table2", Integer.class);
@@ -87,26 +81,4 @@ public abstract class _Table2 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.cryptoBytes);
- out.writeObject(this.plainBytes);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.cryptoBytes = (byte[])in.readObject();
- this.plainBytes = (byte[])in.readObject();
- }
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table3.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table3.java
index a7c17132b..f558ae6ec 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table3.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table3.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.crypto.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.crypto.db.Table3;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -19,8 +15,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _Table3 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Table3> SELF = PropertyFactory.createSelf(Table3.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table3", Integer.class);
@@ -70,24 +64,4 @@ public abstract class _Table3 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.cryptoString);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.cryptoString = (String)in.readObject();
- }
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table4.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table4.java
index 2ed5ac3fa..31275f94b 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table4.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table4.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.crypto.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.crypto.db.Table4;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -20,8 +16,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _Table4 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Table4> SELF = PropertyFactory.createSelf(Table4.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table4", Integer.class);
@@ -91,26 +85,4 @@ public abstract class _Table4 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.plainInt);
- out.writeObject(this.plainString);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.plainInt = (Integer)in.readObject();
- this.plainString = (String)in.readObject();
- }
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table5.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table5.java
index 896a63141..461fa0a8a 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table5.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table5.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.crypto.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.crypto.db.Table5;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -19,8 +15,6 @@ import org.apache.cayenne.exp.property.SelfProperty;
*/
public abstract class _Table5 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Table5> SELF = PropertyFactory.createSelf(Table5.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table5", Integer.class);
@@ -113,28 +107,4 @@ public abstract class _Table5 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.cryptoInt1);
- out.writeObject(this.cryptoInt3);
- out.writeObject(this.cryptoInt4);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.cryptoInt1 = (Integer)in.readObject();
- this.cryptoInt3 = (Integer)in.readObject();
- this.cryptoInt4 = (Integer)in.readObject();
- }
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table6.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table6.java
index 29da1e7d1..e863eeb76 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table6.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table6.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.crypto.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.crypto.db.Table6;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -19,8 +15,6 @@ import org.apache.cayenne.exp.property.SelfProperty;
*/
public abstract class _Table6 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Table6> SELF = PropertyFactory.createSelf(Table6.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table6", Integer.class);
@@ -93,26 +87,4 @@ public abstract class _Table6 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.cryptoInt1);
- out.writeObject(this.cryptoInt4);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.cryptoInt1 = (Long)in.readObject();
- this.cryptoInt4 = (Integer)in.readObject();
- }
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table7.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table7.java
index 0b08229ba..6f21148c3 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table7.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table7.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.crypto.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.crypto.db.Table1;
import org.apache.cayenne.crypto.db.Table7;
@@ -22,8 +18,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _Table7 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Table7> SELF = PropertyFactory.createSelf(Table7.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table7", Integer.class);
@@ -108,28 +102,4 @@ public abstract class _Table7 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.cryptoInt);
- out.writeObject(this.cryptoString);
- out.writeObject(this.toTable1);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.cryptoInt = (Integer)in.readObject();
- this.cryptoString = (String)in.readObject();
- this.toTable1 = in.readObject();
- }
-
}
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table8.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table8.java
index 05d8f97a8..98200a4be 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table8.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table8.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.crypto.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.crypto.db.Table8;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -19,8 +15,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _Table8 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Table8> SELF = PropertyFactory.createSelf(Table8.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table8", Integer.class);
@@ -70,24 +64,4 @@ public abstract class _Table8 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.cryptoString);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.cryptoString = (String)in.readObject();
- }
-
}
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java
index d1baba64c..164fbee56 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.dbsync.reverse.dbimport;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -33,7 +32,7 @@ import org.apache.cayenne.util.XMLSerializable;
/**
* @since 4.0
*/
-public class ReverseEngineering extends SchemaContainer implements Serializable, XMLSerializable {
+public class ReverseEngineering extends SchemaContainer implements XMLSerializable {
private boolean skipRelationshipsLoading;
diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java
index 38afea153..1c7196634 100644
--- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java
+++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java
@@ -69,7 +69,7 @@ public class StringIdQuery implements Query {
protected Collection<String> stringIds;
- protected transient Map<String, ObjectSelect> idQueriesByEntity;
+ protected Map<String, ObjectSelect> idQueriesByEntity;
public StringIdQuery(String... stringIds) {
this(toCollection(stringIds));
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E1.java
index f64333487..5eb7835bb 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E1.java
@@ -21,5 +21,4 @@ package org.apache.cayenne.lifecycle.db;
import org.apache.cayenne.lifecycle.db.auto._E1;
public class E1 extends _E1 {
- private static final long serialVersionUID = 1L;
}
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E2.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E2.java
index 57d47ed70..2c236fa3b 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E2.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E2.java
@@ -21,5 +21,4 @@ package org.apache.cayenne.lifecycle.db;
import org.apache.cayenne.lifecycle.db.auto._E2;
public class E2 extends _E2 {
- private static final long serialVersionUID = 1L;
}
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E3.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E3.java
index 2ca857ed9..2de5b82d5 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E3.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E3.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.lifecycle.db.auto._E3;
public class E3 extends _E3 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E4.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E4.java
index cacfd7112..9d2600ee3 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E4.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E4.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.lifecycle.db.auto._E4;
public class E4 extends _E4 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortDep.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortDep.java
index 2e7c39b71..212153dcb 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortDep.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortDep.java
@@ -21,5 +21,4 @@ package org.apache.cayenne.lifecycle.db;
import org.apache.cayenne.lifecycle.db.auto._SortDep;
public class SortDep extends _SortDep {
- private static final long serialVersionUID = 1L;
}
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortRoot.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortRoot.java
index 9c4ae2b7e..a6fc23b35 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortRoot.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortRoot.java
@@ -21,5 +21,4 @@ package org.apache.cayenne.lifecycle.db;
import org.apache.cayenne.lifecycle.db.auto._SortRoot;
public class SortRoot extends _SortRoot {
- private static final long serialVersionUID = 1L;
}
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/UuidRoot1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/UuidRoot1.java
index 0739758e2..fc291f8a2 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/UuidRoot1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/UuidRoot1.java
@@ -23,5 +23,4 @@ import org.apache.cayenne.lifecycle.relationship.ObjectIdRelationship;
@ObjectIdRelationship("uuid")
public class UuidRoot1 extends _UuidRoot1 {
- private static final long serialVersionUID = 1L;
}
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E1.java
index 840eac69e..abb281840 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E1.java
@@ -10,8 +10,6 @@ import org.apache.cayenne.GenericPersistentObject;
*/
public abstract class _E1 extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final String ID_PK_COLUMN = "ID";
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E2.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E2.java
index e02d8c3f7..633850911 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E2.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E2.java
@@ -10,8 +10,6 @@ import org.apache.cayenne.GenericPersistentObject;
*/
public abstract class _E2 extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final String ID_PK_COLUMN = "ID";
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E3.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E3.java
index 25b25f365..f4279ad4c 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E3.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E3.java
@@ -15,8 +15,6 @@ import org.apache.cayenne.lifecycle.db.E4;
*/
public abstract class _E3 extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final String ID_PK_COLUMN = "ID";
public static final ListProperty<E4> E4S = PropertyFactory.createList("e4s", E4.class);
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E4.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E4.java
index 4d117aa8a..f579ef216 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E4.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E4.java
@@ -15,8 +15,6 @@ import org.apache.cayenne.lifecycle.db.E3;
*/
public abstract class _E4 extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final String ID_PK_COLUMN = "ID";
public static final ListProperty<E3> E3S = PropertyFactory.createList("e3s", E3.class);
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortDep.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortDep.java
index 100485997..074c337c6 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortDep.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortDep.java
@@ -13,8 +13,6 @@ import org.apache.cayenne.lifecycle.db.SortRoot;
*/
public abstract class _SortDep extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final String ID_PK_COLUMN = "ID";
public static final EntityProperty<SortRoot> ROOT = PropertyFactory.createEntity("root", SortRoot.class);
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortRoot.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortRoot.java
index 9f0f1bdff..246531bee 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortRoot.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortRoot.java
@@ -15,8 +15,6 @@ import org.apache.cayenne.lifecycle.db.SortDep;
*/
public abstract class _SortRoot extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final String ID_PK_COLUMN = "ID";
public static final ListProperty<SortDep> DEPS = PropertyFactory.createList("deps", SortDep.class);
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_UuidRoot1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_UuidRoot1.java
index ed41abd77..6ed69bd35 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_UuidRoot1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_UuidRoot1.java
@@ -12,8 +12,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _UuidRoot1 extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final String ID_PK_COLUMN = "ID";
public static final StringProperty<String> UUID = PropertyFactory.createString("uuid", String.class);
diff --git a/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/columnview/ColumnViewPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/columnview/ColumnViewPanel.java
index d118d3409..13b1fa3d7 100644
--- a/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/columnview/ColumnViewPanel.java
+++ b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/columnview/ColumnViewPanel.java
@@ -31,7 +31,6 @@ import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
import java.awt.*;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -486,7 +485,7 @@ public class ColumnViewPanel extends JPanel {
// DefaultListCellRenerer since it extends JLabel that
// does not allow the layout that we need.
// ====================================================
- final class MultiColumnBrowserRenderer implements ListCellRenderer, Serializable {
+ final class MultiColumnBrowserRenderer implements ListCellRenderer {
ListCellRenderer leafRenderer;
JPanel nonLeafPanel;
diff --git a/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxCellEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxCellEditor.java
index 6b8bde884..d981ae463 100644
--- a/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxCellEditor.java
+++ b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxCellEditor.java
@@ -23,7 +23,6 @@ import javax.swing.*;
import javax.swing.table.TableCellEditor;
import java.awt.*;
import java.awt.event.MouseEvent;
-import java.io.Serializable;
import java.util.EventObject;
/**
@@ -31,7 +30,7 @@ import java.util.EventObject;
* ctrl/shift-clicks so the user can extend a multi-row selection without
* opening the editor.
*/
-public class CMComboBoxCellEditor extends AbstractCellEditor implements TableCellEditor, Serializable {
+public class CMComboBoxCellEditor extends AbstractCellEditor implements TableCellEditor {
protected final JComboBox<?> comboBox;
diff --git a/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/copypaste/CMTransferable.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/copypaste/CMTransferable.java
index 6a03ed020..91daa644d 100644
--- a/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/copypaste/CMTransferable.java
+++ b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/copypaste/CMTransferable.java
@@ -26,7 +26,6 @@ import org.apache.cayenne.util.XMLSerializable;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
import java.io.PrintWriter;
-import java.io.Serializable;
import java.io.StringWriter;
import java.util.List;
@@ -35,7 +34,8 @@ import java.util.List;
*/
public class CMTransferable implements Transferable {
- public static final DataFlavor CAYENNE_FLAVOR = new DataFlavor(Serializable.class, "Cayenne Object");
+ public static final DataFlavor CAYENNE_FLAVOR = new DataFlavor(
+ DataFlavor.javaJVMLocalObjectMimeType + ";class=java.lang.Object", "Cayenne Object");
private static final DataFlavor[] FLAVORS = new DataFlavor[]{CAYENNE_FLAVOR, DataFlavor.stringFlavor};
private final Object data;
diff --git a/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackType.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackType.java
index 7f3c5b55f..862773172 100644
--- a/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackType.java
+++ b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackType.java
@@ -21,9 +21,7 @@ package org.apache.cayenne.modeler.ui.project.editor.objentity.callbacks;
import org.apache.cayenne.map.LifecycleEvent;
import org.apache.cayenne.util.Util;
-import java.io.Serializable;
-
-public class CallbackType implements Serializable {
+public class CallbackType {
private final LifecycleEvent type;
private final String name;
diff --git a/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjCallbackMethod.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjCallbackMethod.java
index b66483072..1a2d58242 100644
--- a/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjCallbackMethod.java
+++ b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjCallbackMethod.java
@@ -22,10 +22,7 @@ import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
-import java.io.Serializable;
-
-public class ObjCallbackMethod implements XMLSerializable,
- Serializable {
+public class ObjCallbackMethod implements XMLSerializable {
private String name;
private final CallbackType callbackType;
diff --git a/cayenne/src/main/java/org/apache/cayenne/Fault.java b/cayenne/src/main/java/org/apache/cayenne/Fault.java
index 2fa080db7..138af7f81 100644
--- a/cayenne/src/main/java/org/apache/cayenne/Fault.java
+++ b/cayenne/src/main/java/org/apache/cayenne/Fault.java
@@ -19,8 +19,6 @@
package org.apache.cayenne;
-import java.io.Serializable;
-
/**
* Represents a placeholder for an unresolved relationship from a source object. Fault is
* resolved via {@link #resolveFault(Persistent, String)}. Depending on the type of fault
@@ -29,7 +27,7 @@ import java.io.Serializable;
*
* @since 1.1
*/
-public abstract class Fault implements Serializable {
+public abstract class Fault {
protected Fault() {
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/GenericPersistentObject.java b/cayenne/src/main/java/org/apache/cayenne/GenericPersistentObject.java
index abc330db1..0ff46e9a8 100644
--- a/cayenne/src/main/java/org/apache/cayenne/GenericPersistentObject.java
+++ b/cayenne/src/main/java/org/apache/cayenne/GenericPersistentObject.java
@@ -21,9 +21,6 @@ package org.apache.cayenne;
import org.apache.cayenne.reflect.PropertyUtils;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -47,8 +44,6 @@ import java.util.Map;
*/
public class GenericPersistentObject extends PersistentObject {
- private static final long serialVersionUID = -313743913882350400L;
-
protected Map<String, Object> values = new HashMap<>();
@Override
@@ -112,34 +107,4 @@ public class GenericPersistentObject extends PersistentObject {
buffer.append("]");
}
-
- /**
- * Serialization support.
- */
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- /**
- * Serialization support.
- */
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- if(values == null) {
- values = new HashMap<>();
- }
- }
-
- @SuppressWarnings("unchecked")
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- values = (Map<String, Object>) in.readObject();
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(values);
- }
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/HybridPersistentObject.java b/cayenne/src/main/java/org/apache/cayenne/HybridPersistentObject.java
index 0f7a99a02..fe50e56ea 100644
--- a/cayenne/src/main/java/org/apache/cayenne/HybridPersistentObject.java
+++ b/cayenne/src/main/java/org/apache/cayenne/HybridPersistentObject.java
@@ -19,9 +19,6 @@
package org.apache.cayenne;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -48,8 +45,6 @@ import org.apache.cayenne.reflect.PropertyUtils;
*/
public class HybridPersistentObject extends PersistentObject {
- private static final long serialVersionUID = 1945209973678806566L;
-
protected Map<String, Object> values;
@Override
@@ -116,16 +111,4 @@ public class HybridPersistentObject extends PersistentObject {
buffer.append(']');
}
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- values = (Map<String, Object>) in.readObject();
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(values);
- }
-
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/ObjectContext.java b/cayenne/src/main/java/org/apache/cayenne/ObjectContext.java
index f15fffb27..81d3fb307 100644
--- a/cayenne/src/main/java/org/apache/cayenne/ObjectContext.java
+++ b/cayenne/src/main/java/org/apache/cayenne/ObjectContext.java
@@ -24,7 +24,6 @@ import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.Select;
-import java.io.Serializable;
import java.util.Collection;
import java.util.List;
@@ -34,7 +33,7 @@ import java.util.List;
*
* @since 1.2
*/
-public interface ObjectContext extends Serializable {
+public interface ObjectContext {
/**
* Returns a DataChannel that this context uses to access the persistent store.
diff --git a/cayenne/src/main/java/org/apache/cayenne/ObjectContextChangeLog.java b/cayenne/src/main/java/org/apache/cayenne/ObjectContextChangeLog.java
index 87926d8f4..c0fb10efa 100644
--- a/cayenne/src/main/java/org/apache/cayenne/ObjectContextChangeLog.java
+++ b/cayenne/src/main/java/org/apache/cayenne/ObjectContextChangeLog.java
@@ -25,8 +25,6 @@ import org.apache.cayenne.graph.CompoundDiff;
import org.apache.cayenne.graph.GraphDiff;
import org.apache.cayenne.graph.NodeDiff;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Collections;
@@ -155,7 +153,7 @@ class ObjectContextChangeLog {
// moded Sublist from JDK that doesn't check for co-modification, as the underlying
// list is guaranteed to only grow and never shrink or be replaced.
- static class SubList extends AbstractList<GraphDiff> implements Serializable {
+ static class SubList extends AbstractList<GraphDiff> {
private List<GraphDiff> list;
private int offset;
@@ -196,10 +194,5 @@ class ObjectContextChangeLog {
throw new IndexOutOfBoundsException("Index: " + index + ",Size: " + size);
}
}
-
- // serialization method...
- private Object writeReplace() throws ObjectStreamException {
- return new ArrayList<>(list.subList(offset, offset + size));
- }
}
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/ObjectId.java b/cayenne/src/main/java/org/apache/cayenne/ObjectId.java
index 7dc03f0fe..46ae21039 100644
--- a/cayenne/src/main/java/org/apache/cayenne/ObjectId.java
+++ b/cayenne/src/main/java/org/apache/cayenne/ObjectId.java
@@ -19,7 +19,6 @@
package org.apache.cayenne;
-import java.io.Serializable;
import java.util.Map;
/**
@@ -30,7 +29,7 @@ import java.util.Map;
* A temporary ObjectId stores object entity name and a pseudo-unique binary key; permanent id stores a map of values
* from an external persistent store (aka "primary key").
*/
-public interface ObjectId extends Serializable {
+public interface ObjectId {
/**
* Creates a temporary ObjectId for a given entity.
diff --git a/cayenne/src/main/java/org/apache/cayenne/ObjectIdCompound.java b/cayenne/src/main/java/org/apache/cayenne/ObjectIdCompound.java
index d124a0c0c..5ed942698 100644
--- a/cayenne/src/main/java/org/apache/cayenne/ObjectIdCompound.java
+++ b/cayenne/src/main/java/org/apache/cayenne/ObjectIdCompound.java
@@ -33,22 +33,13 @@ import java.util.Map;
*/
class ObjectIdCompound implements ObjectId {
- private static final long serialVersionUID = -2265029098344119323L;
-
protected final String entityName;
protected final Map<String, Object> objectIdKeys;
protected Map<String, Object> replacementIdMap;
// hash code is transient to make sure id is portable across VM
- private transient int hashCode;
-
- // exists for deserialization with Hessian and similar
- @SuppressWarnings("unused")
- private ObjectIdCompound() {
- entityName = null;
- objectIdKeys = Collections.emptyMap();
- }
+ private int hashCode;
/**
* Creates a portable permanent ObjectId as a compound primary key.
@@ -73,7 +64,7 @@ class ObjectIdCompound implements ObjectId {
if (m.getClass() == HashMap.class) {
return (Map<String, Object>) m;
} else {
- // we have to create a copy of the map, otherwise we may run into serialization problems with hessian
+ // defensive copy: the caller's map may be unmodifiable or of an unknown implementation
return new HashMap<>(m);
}
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/ObjectIdNumber.java b/cayenne/src/main/java/org/apache/cayenne/ObjectIdNumber.java
index 34b47d9f6..64bd531a7 100644
--- a/cayenne/src/main/java/org/apache/cayenne/ObjectIdNumber.java
+++ b/cayenne/src/main/java/org/apache/cayenne/ObjectIdNumber.java
@@ -30,8 +30,6 @@ import org.apache.cayenne.util.SingleEntryMap;
*/
class ObjectIdNumber implements ObjectId {
- private static final long serialVersionUID = 3968183354758914938L;
-
// this two fields can be kept somewhere else as ID index shared by all IDs
private final String entityName;
private final String keyName;
@@ -40,14 +38,6 @@ class ObjectIdNumber implements ObjectId {
private SingleEntryMap<String, Object> replacementId;
- // exists for deserialization with Hessian and similar
- @SuppressWarnings("unused")
- private ObjectIdNumber() {
- this.entityName = "";
- this.keyName = "";
- this.value = 0L;
- }
-
ObjectIdNumber(String entityName, String keyName, Number value) {
this.entityName = entityName;
this.keyName = keyName;
diff --git a/cayenne/src/main/java/org/apache/cayenne/ObjectIdSingle.java b/cayenne/src/main/java/org/apache/cayenne/ObjectIdSingle.java
index c868db55a..e47ce4db8 100644
--- a/cayenne/src/main/java/org/apache/cayenne/ObjectIdSingle.java
+++ b/cayenne/src/main/java/org/apache/cayenne/ObjectIdSingle.java
@@ -33,23 +33,13 @@ import java.util.Objects;
*/
class ObjectIdSingle implements ObjectId {
- private static final long serialVersionUID = 3968183354758914938L;
-
private final String entityName;
private final String keyName;
private final Object value;
- private transient int hashCode;
+ private int hashCode;
private SingleEntryMap<String, Object> replacementId;
- // exists for deserialization with Hessian and similar
- @SuppressWarnings("unused")
- private ObjectIdSingle() {
- this.entityName = "";
- this.keyName = "";
- this.value = null;
- }
-
ObjectIdSingle(String entityName, String keyName, Object value) {
this.entityName = entityName;
this.keyName = keyName;
diff --git a/cayenne/src/main/java/org/apache/cayenne/ObjectIdTmp.java b/cayenne/src/main/java/org/apache/cayenne/ObjectIdTmp.java
index 221ed1066..880a73ed7 100644
--- a/cayenne/src/main/java/org/apache/cayenne/ObjectIdTmp.java
+++ b/cayenne/src/main/java/org/apache/cayenne/ObjectIdTmp.java
@@ -32,20 +32,11 @@ import org.apache.cayenne.util.IDUtil;
*/
class ObjectIdTmp implements ObjectId {
- private static final long serialVersionUID = 6566399722364067372L;
-
private final String entityName;
private final byte[] id;
private Map<String, Object> replacementId;
- // exists for deserialization with Hessian and similar
- @SuppressWarnings("unused")
- private ObjectIdTmp() {
- entityName = null;
- id = null;
- }
-
ObjectIdTmp(String entityName, byte[] id) {
this.id = id;
this.entityName = entityName;
diff --git a/cayenne/src/main/java/org/apache/cayenne/Persistent.java b/cayenne/src/main/java/org/apache/cayenne/Persistent.java
index de24da335..f964a32e3 100644
--- a/cayenne/src/main/java/org/apache/cayenne/Persistent.java
+++ b/cayenne/src/main/java/org/apache/cayenne/Persistent.java
@@ -21,14 +21,12 @@ package org.apache.cayenne;
import org.apache.cayenne.exp.path.CayennePath;
-import java.io.Serializable;
-
/**
* Defines minimal API of an object that can be persisted via Cayenne.
*
* @since 1.2
*/
-public interface Persistent extends Serializable {
+public interface Persistent {
long DEFAULT_VERSION = Long.MIN_VALUE;
diff --git a/cayenne/src/main/java/org/apache/cayenne/PersistentObject.java b/cayenne/src/main/java/org/apache/cayenne/PersistentObject.java
index 8370c687b..4eca88040 100644
--- a/cayenne/src/main/java/org/apache/cayenne/PersistentObject.java
+++ b/cayenne/src/main/java/org/apache/cayenne/PersistentObject.java
@@ -36,9 +36,6 @@ import org.apache.cayenne.validation.BeanValidationFailure;
import org.apache.cayenne.validation.ValidationFailure;
import org.apache.cayenne.validation.ValidationResult;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Collection;
@@ -60,9 +57,7 @@ import java.util.Map;
* This class can be used directly as superclass for field-based data objects.
* <p>
* To create own implementation of {@link Persistent} with custom field storage logic it is enough
- * to implement {@link #readPropertyDirectly(String)} and {@link #writePropertyDirectly(String, Object)} methods
- * and serialization support if needed (helper methods {@link #writeState(ObjectOutputStream)}
- * and {@link #readState(ObjectInputStream)} are provided).
+ * to implement {@link #readPropertyDirectly(String)} and {@link #writePropertyDirectly(String, Object)} methods.
* <h1>POJO Note</h1>
* <p>
* If having PersistentObject as a superclass presents a problem in an application, source
@@ -76,7 +71,7 @@ public abstract class PersistentObject implements Persistent, Validating {
protected ObjectId objectId;
protected int persistenceState;
- protected transient ObjectContext objectContext;
+ protected ObjectContext objectContext;
protected long snapshotVersion = DEFAULT_VERSION;
/**
@@ -698,55 +693,6 @@ public abstract class PersistentObject implements Persistent, Validating {
// does nothing
}
- /**
- * Serialization support.
- * Will write down persistenceState and objectId, delegating data serialization down to sub-classes.
- */
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- /**
- * Serialization support.
- * Will read persistenceState and objectId, delegating data serialization down to sub-classes.
- */
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- protected void writeSerialized(ObjectOutputStream out) throws IOException {
- out.writeInt(persistenceState);
- out.writeObject(objectId);
-
- if (persistenceState == PersistenceState.COMMITTED
- || persistenceState == PersistenceState.HOLLOW) {
- return;
- }
-
- writeState(out);
- }
-
- protected void readSerialized(ObjectInputStream in) throws IOException, ClassNotFoundException {
- this.persistenceState = in.readInt();
- this.objectId = (ObjectId) in.readObject();
-
- if (persistenceState == PersistenceState.COMMITTED
- || persistenceState == PersistenceState.HOLLOW) {
- persistenceState = PersistenceState.HOLLOW;
- return;
- }
-
- readState(in);
- }
-
- protected void writeState(ObjectOutputStream out) throws IOException {
- // no additional info for base class
- }
-
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- // no additional info for base class
- }
-
/**
* A variation of "toString" method, that may be more efficient in some
* cases. For example when printing a list of objects into the same String.
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java b/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java
index 678cbbea0..17438d9d5 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java
@@ -65,9 +65,6 @@ import org.apache.cayenne.util.GenericResponse;
import org.apache.cayenne.util.ShallowMergeOperation;
import org.apache.cayenne.util.Util;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -144,12 +141,12 @@ public class DataContext implements ObjectContext {
*/
protected volatile Map<String, Object> userProperties;
- // transient variables that should be reinitialized on deserialization from the registry
- protected transient DataChannel channel;
- protected transient QueryCache queryCache;
- protected transient EntityResolver entityResolver;
+ // runtime dependencies; a context created without a channel resolves them lazily via attachToRuntimeIfNeeded()
+ protected DataChannel channel;
+ protected QueryCache queryCache;
+ protected EntityResolver entityResolver;
- protected transient DataContextMergeHandler mergeHandler;
+ protected DataContextMergeHandler mergeHandler;
protected boolean validatingObjectsOnCommit = true;
@@ -194,8 +191,8 @@ public class DataContext implements ObjectContext {
* CayenneRuntimeException.
* <p>
* This method is called internally by the context before access to
- * transient variables to allow the context to attach to the stack lazily
- * following deserialization.
+ * runtime dependencies to allow a context created without a channel to
+ * attach to the stack lazily.
*
* @return true if the context successfully attached to the thread runtime,
* false - if it was already attached.
@@ -1292,50 +1289,6 @@ public class DataContext implements ObjectContext {
this.usingSharedSnapshotCache = flag;
}
- // ---------------------------------------------
- // Serialization Support
- // ---------------------------------------------
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- // See CAY-2382
- synchronized (getObjectStore()) {
- out.defaultWriteObject();
- }
- // Serialize local snapshots cache
- if (!isUsingSharedSnapshotCache()) {
- out.writeObject(objectStore.getDataRowCache());
- }
- }
-
- // serialization support
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- // read non-transient properties
- in.defaultReadObject();
-
- // deserialize local snapshots cache
- if (!isUsingSharedSnapshotCache()) {
- DataRowStore cache = (DataRowStore) in.readObject();
- objectStore.setDataRowCache(cache);
- }
-
- // PersistentObjects have a transient DataContext because at deserialize time
- // the DataContext may need to be different from the one at serialize time (for programmer defined reasons).
- // So, when a Persistent is resurrected because it's DataContext was serialized,
- // it will then set the objects DataContext to the correct one.
- // If deserialized "otherwise", it will not have a DataContext.
-
- synchronized (getObjectStore()) {
- Iterator<?> it = objectStore.getObjectIterator();
- while (it.hasNext()) {
- Persistent object = (Persistent) it.next();
- object.setObjectContext(this);
- }
- }
-
- // ... deferring initialization of transient properties of this context till first access,
- // so that it can attach to Cayenne runtime using appropriate thread injector.
- }
-
/**
* Returns this context's ObjectStore.
*
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataContextGraphAction.java b/cayenne/src/main/java/org/apache/cayenne/access/DataContextGraphAction.java
index 1f0943202..feac92b33 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataContextGraphAction.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataContextGraphAction.java
@@ -26,10 +26,9 @@ import org.apache.cayenne.reflect.ArcProperty;
import org.apache.cayenne.reflect.ClassDescriptor;
import org.apache.cayenne.reflect.PropertyDescriptor;
-import java.io.Serializable;
-class DataContextGraphAction implements Serializable {
+class DataContextGraphAction {
private final ObjectContext context;
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java b/cayenne/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java
index 878cbe7b3..ec78326d3 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java
@@ -47,7 +47,7 @@ class DataContextQueryAction {
private final QueryMetadata metadata;
private final boolean iteratedResult;
private final boolean ignoreLocalCache;
- private transient QueryResponse response;
+ private QueryResponse response;
public DataContextQueryAction(DataContext context, Query query, boolean iteratedResult, boolean ignoreLocalCache) {
this.context = context;
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataRowStore.java b/cayenne/src/main/java/org/apache/cayenne/access/DataRowStore.java
index c51d54c7c..ad5cbe1e6 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataRowStore.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataRowStore.java
@@ -32,9 +32,6 @@ import org.apache.cayenne.util.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -47,7 +44,7 @@ import java.util.concurrent.ConcurrentMap;
*
* @since 1.1
*/
-public class DataRowStore implements Serializable {
+public class DataRowStore {
private static final Logger LOGGER = LoggerFactory.getLogger(DataRowStore.class);
@@ -67,12 +64,12 @@ public class DataRowStore implements Serializable {
private final int maxSize;
protected final ConcurrentMap<ObjectId, DataRow> snapshots;
- protected transient EventManager eventManager;
- protected transient EventBridge remoteNotificationsHandler;
+ protected EventManager eventManager;
+ protected EventBridge remoteNotificationsHandler;
// IMPORTANT: EventSubject must be an ivar to avoid its deallocation
// too early, and thus disabling events.
- protected transient EventSubject eventSubject;
+ protected EventSubject eventSubject;
/**
* @param name DataRowStore name. Used to identify this DataRowStore in events, etc. Can't be null.
@@ -458,16 +455,6 @@ public class DataRowStore implements Serializable {
}
}
- // deserialization support
- private void readObject(ObjectInputStream in) throws IOException,
- ClassNotFoundException {
-
- in.defaultReadObject();
-
- // restore subjects
- this.eventSubject = createSubject();
- }
-
void stopListeners() {
if (eventManager != null) {
eventManager.removeListener(this);
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java b/cayenne/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
index 096b9bfbb..b3c185f3b 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
@@ -29,7 +29,6 @@ import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.QueryMetadata;
import java.util.Objects;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -55,7 +54,7 @@ import java.util.NoSuchElementException;
* full list fetch.
* </p>
*/
-public class IncrementalFaultList<E> implements List<E>, Serializable {
+public class IncrementalFaultList<E> implements List<E> {
protected final int pageSize;
protected final List elements;
@@ -667,7 +666,7 @@ public class IncrementalFaultList<E> implements List<E>, Serializable {
return unfetchedObjects;
}
- abstract class IncrementalListHelper implements Serializable {
+ abstract class IncrementalListHelper {
int indexOfObject(Object object) {
if (unresolvedSuspect(object)) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/ListWithPrefetches.java b/cayenne/src/main/java/org/apache/cayenne/access/ListWithPrefetches.java
index c97c7a4eb..ee2c8c4cf 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/ListWithPrefetches.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/ListWithPrefetches.java
@@ -21,7 +21,6 @@ package org.apache.cayenne.access;
import org.apache.cayenne.exp.path.CayennePath;
-import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -40,7 +39,7 @@ import java.util.Map;
//
// Future alternatives may include caching the entire QueryResponse... or maybe leaving
// everything the way it is.
-class ListWithPrefetches implements List<Object>, Serializable {
+class ListWithPrefetches implements List<Object> {
private final List<Object> list;
private final Map<CayennePath, List<?>> prefetchResultsByPath;
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/NoSyncObjectStore.java b/cayenne/src/main/java/org/apache/cayenne/access/NoSyncObjectStore.java
index 9358c08d2..1e051abbc 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/NoSyncObjectStore.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/NoSyncObjectStore.java
@@ -38,7 +38,6 @@ public class NoSyncObjectStore extends ObjectStore {
public void setDataRowCache(DataRowStore dataRowCache) {
this.dataRowCache = dataRowCache;
- dataRowCacheSet = dataRowCache != null;
}
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/ObjectDiff.java b/cayenne/src/main/java/org/apache/cayenne/access/ObjectDiff.java
index 1303b4e54..6d4b296a9 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/ObjectDiff.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/ObjectDiff.java
@@ -55,7 +55,7 @@ public class ObjectDiff extends NodeDiff {
private final String entityName;
- private transient ClassDescriptor classDescriptor;
+ private final ClassDescriptor classDescriptor;
private Collection<NodeDiff> otherDiffs;
@@ -134,13 +134,6 @@ public class ObjectDiff extends NodeDiff {
}
ClassDescriptor getClassDescriptor() {
- // class descriptor is initiated in constructor, but is nullified on
- // serialization
- if (classDescriptor == null) {
- EntityResolver entityResolver = object.getObjectContext().getEntityResolver();
- this.classDescriptor = entityResolver.getClassDescriptor(entityName);
- }
-
return classDescriptor;
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/ObjectStore.java b/cayenne/src/main/java/org/apache/cayenne/access/ObjectStore.java
index cfad0c8fa..2fee84903 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/ObjectStore.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/ObjectStore.java
@@ -47,7 +47,6 @@ import org.apache.cayenne.reflect.ToOneProperty;
import org.apache.cayenne.util.SoftValueMap;
import org.apache.cayenne.util.WeakValueMap;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -65,7 +64,7 @@ import java.util.concurrent.ConcurrentHashMap;
*
* @since 1.0
*/
-public class ObjectStore implements Serializable, SnapshotEventListener, GraphManager {
+public class ObjectStore implements SnapshotEventListener, GraphManager {
protected Map<Object, Persistent> objectMap;
protected Map<Object, ObjectDiff> changes;
@@ -83,16 +82,8 @@ public class ObjectStore implements Serializable, SnapshotEventListener, GraphMa
/**
* Stores a reference to the DataRowStore.
- * <p>
- * <i>Serialization note: </i> It is up to the owner of this ObjectStore to initialize
- * DataRowStore after deserialization of this object. ObjectStore will not know how to
- * restore the DataRowStore by itself.
- * </p>
*/
- protected transient DataRowStore dataRowCache;
-
- // used to avoid incorrect on-demand DataRowStore initialization after deserialization
- protected boolean dataRowCacheSet;
+ protected DataRowStore dataRowCache;
private Collection<GraphDiff> lifecycleEventInducedChanges;
@@ -233,23 +224,6 @@ public class ObjectStore implements Serializable, SnapshotEventListener, GraphMa
* Returns a DataRowStore associated with this ObjectStore.
*/
public DataRowStore getDataRowCache() {
-
- // perform deferred initialization...
-
- // Andrus, 11/7/2005 - potential problem with on-demand deferred initialization is
- // that deserialized context won't receive any events... which maybe ok, since it
- // didn't while it was stored in serialized form.
- if (dataRowCache == null && context != null && dataRowCacheSet) {
- synchronized (this) {
- if (dataRowCache == null) {
- DataDomain domain = context.getParentDataDomain();
- if (domain != null) {
- setDataRowCache(domain.getSharedSnapshotCache());
- }
- }
- }
- }
-
return dataRowCache;
}
@@ -284,8 +258,6 @@ public class ObjectStore implements Serializable, SnapshotEventListener, GraphMa
dataRowCache.getSnapshotEventSubject(),
dataRowCache);
}
-
- dataRowCacheSet = dataRowCache != null;
}
/**
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/ToManyHolder.java b/cayenne/src/main/java/org/apache/cayenne/access/ToManyHolder.java
index b5d3bab4e..ab22bcc72 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/ToManyHolder.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/ToManyHolder.java
@@ -22,7 +22,6 @@ package org.apache.cayenne.access;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.Persistent;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashSet;
@@ -35,7 +34,7 @@ import java.util.Set;
*
* @since 5.0
*/
-public abstract class ToManyHolder<E> implements Serializable {
+public abstract class ToManyHolder<E> {
protected Persistent relationshipOwner;
protected String relationshipName;
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/flush/IdGenerationMarker.java b/cayenne/src/main/java/org/apache/cayenne/access/flush/IdGenerationMarker.java
index 5aead021b..c28539dd5 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/flush/IdGenerationMarker.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/flush/IdGenerationMarker.java
@@ -19,8 +19,6 @@
package org.apache.cayenne.access.flush;
-import java.io.Serializable;
-
import org.apache.cayenne.access.types.InternalUnsupportedTypeFactory;
/**
@@ -28,9 +26,7 @@ import org.apache.cayenne.access.types.InternalUnsupportedTypeFactory;
*
* @since 4.2
*/
-class IdGenerationMarker implements Serializable, InternalUnsupportedTypeFactory.Marker {
- private static final long serialVersionUID = -5339942931435878094L;
-
+class IdGenerationMarker implements InternalUnsupportedTypeFactory.Marker {
static IdGenerationMarker marker() {
return new IdGenerationMarker();
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/cache/MapQueryCache.java b/cayenne/src/main/java/org/apache/cayenne/cache/MapQueryCache.java
index a189e6817..25c2d6403 100644
--- a/cayenne/src/main/java/org/apache/cayenne/cache/MapQueryCache.java
+++ b/cayenne/src/main/java/org/apache/cayenne/cache/MapQueryCache.java
@@ -22,7 +22,6 @@ import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.util.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
-import java.io.Serializable;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -33,7 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
*
* @since 3.0
*/
-public class MapQueryCache implements QueryCache, Serializable {
+public class MapQueryCache implements QueryCache {
public static final int DEFAULT_CACHE_SIZE = 1000;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java b/cayenne/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java
index a1359d4a4..0198a0607 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java
@@ -23,7 +23,6 @@ import org.apache.cayenne.resource.Resource;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -36,9 +35,7 @@ import java.util.Map;
*
* @since 3.1
*/
-public class DataChannelDescriptor implements ConfigurationNode, Serializable, XMLSerializable {
-
- private static final long serialVersionUID = 6567527544207035602L;
+public class DataChannelDescriptor implements ConfigurationNode, XMLSerializable {
/**
* The namespace in which the data map XML file will be created.
@@ -49,7 +46,7 @@ public class DataChannelDescriptor implements ConfigurationNode, Serializable, X
protected String name;
protected Map<String, String> properties;
protected Collection<DataMap> dataMaps;
- protected transient Resource configurationSource;
+ protected Resource configurationSource;
public DataChannelDescriptor() {
properties = new HashMap<>();
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java b/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java
index 9d4cad8fe..fb390d16c 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java
@@ -22,7 +22,6 @@ package org.apache.cayenne.configuration;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
-import java.io.Serializable;
import java.util.Objects;
/**
@@ -30,7 +29,7 @@ import java.util.Objects;
*
* @since 5.0
*/
-public class DataSourceDescriptor implements Serializable, XMLSerializable {
+public class DataSourceDescriptor implements XMLSerializable {
protected String jdbcDriver;
protected String dataSourceUrl;
diff --git a/cayenne/src/main/java/org/apache/cayenne/datasource/UnmanagedPoolingDataSource.java b/cayenne/src/main/java/org/apache/cayenne/datasource/UnmanagedPoolingDataSource.java
index 2f139dba0..c9f604569 100644
--- a/cayenne/src/main/java/org/apache/cayenne/datasource/UnmanagedPoolingDataSource.java
+++ b/cayenne/src/main/java/org/apache/cayenne/datasource/UnmanagedPoolingDataSource.java
@@ -72,8 +72,6 @@ public class UnmanagedPoolingDataSource implements DataSource, AutoCloseable {
* timed out and was unable to obtain a connection.
*/
public static class ConnectionUnavailableException extends SQLException {
- private static final long serialVersionUID = 1063973806941023165L;
-
public ConnectionUnavailableException(String message) {
super(message);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLSum.java b/cayenne/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLSum.java
index 541010b80..b581fe9b0 100644
--- a/cayenne/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLSum.java
+++ b/cayenne/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLSum.java
@@ -31,7 +31,6 @@ public class EJBQLSum extends EJBQLAggregateColumn {
// per JPA spec, 4.8.4, SUM type mapping rules are a bit convoluted. Mapping
// them here...
- private static final long serialVersionUID = 2256495371122671530L;
static final Map<String, String> typeMap;
static {
diff --git a/cayenne/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java b/cayenne/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java
index b8822cd8d..74d2263cd 100644
--- a/cayenne/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java
+++ b/cayenne/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.ejbql.parser;
import java.io.PrintWriter;
-import java.io.Serializable;
import java.io.StringWriter;
import org.apache.cayenne.ejbql.EJBQLExpression;
@@ -30,7 +29,7 @@ import org.apache.cayenne.ejbql.EJBQLExpressionVisitor;
*
* @since 3.0
*/
-public abstract class SimpleNode implements Node, Serializable, EJBQLExpression {
+public abstract class SimpleNode implements Node, EJBQLExpression {
final int id;
SimpleNode parent;
diff --git a/cayenne/src/main/java/org/apache/cayenne/event/CayenneEvent.java b/cayenne/src/main/java/org/apache/cayenne/event/CayenneEvent.java
index e22793ad8..8e4148d73 100644
--- a/cayenne/src/main/java/org/apache/cayenne/event/CayenneEvent.java
+++ b/cayenne/src/main/java/org/apache/cayenne/event/CayenneEvent.java
@@ -74,7 +74,7 @@ public class CayenneEvent extends EventObject {
}
/**
- * Used when deserializing remote events.
+ * Used when reposting remote events.
*/
void setSource(Object source) {
super.source = source;
diff --git a/cayenne/src/main/java/org/apache/cayenne/event/EventBridge.java b/cayenne/src/main/java/org/apache/cayenne/event/EventBridge.java
index 71802046c..5ba030fe1 100644
--- a/cayenne/src/main/java/org/apache/cayenne/event/EventBridge.java
+++ b/cayenne/src/main/java/org/apache/cayenne/event/EventBridge.java
@@ -19,8 +19,6 @@
package org.apache.cayenne.event;
-import org.apache.cayenne.util.Util;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -324,15 +322,9 @@ public abstract class EventBridge implements EventListener {
if (event.getSource() != getExternalEventSource()
&& event.getPostedBy() != EventBridge.this) {
- // make sure external event has the right subject, if not make a clone
- // with the right one...
+ // make sure external event has the right subject
if (!subject.equals(event.getSubject())) {
- CayenneEvent clone = Util.cloneViaSerialization(event);
- clone.setSubject(subject);
- clone.setPostedBy(event.getPostedBy());
- clone.setSource(event.getSource());
-
- event = clone;
+ event.setSubject(subject);
}
sendExternalEvent(event);
diff --git a/cayenne/src/main/java/org/apache/cayenne/event/EventSubject.java b/cayenne/src/main/java/org/apache/cayenne/event/EventSubject.java
index 27ea695cd..145bf5ec6 100644
--- a/cayenne/src/main/java/org/apache/cayenne/event/EventSubject.java
+++ b/cayenne/src/main/java/org/apache/cayenne/event/EventSubject.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.event;
-import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
@@ -37,7 +36,7 @@ import org.apache.cayenne.util.WeakValueMap;
* </ul>
*
*/
-public class EventSubject implements Serializable {
+public class EventSubject {
// a Map that will allow the values to be GC'ed
private static final Map<String, EventSubject> _registeredSubjects = new WeakValueMap<>();
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/Expression.java b/cayenne/src/main/java/org/apache/cayenne/exp/Expression.java
index 46f0f1e38..08fbbb5ca 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/Expression.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/Expression.java
@@ -20,7 +20,6 @@
package org.apache.cayenne.exp;
import java.io.IOException;
-import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
@@ -40,9 +39,7 @@ import org.apache.cayenne.util.XMLSerializable;
/**
* Superclass of Cayenne expressions that defines basic API for expressions use.
*/
-public abstract class Expression implements Serializable, XMLSerializable {
-
- private static final long serialVersionUID = 5268695167038124596L;
+public abstract class Expression implements XMLSerializable {
/**
* A value that a Transformer might return to indicate that a node has to be
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/ExpressionParameter.java b/cayenne/src/main/java/org/apache/cayenne/exp/ExpressionParameter.java
index 0c887a0e7..c1a2831b0 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/ExpressionParameter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/ExpressionParameter.java
@@ -19,16 +19,13 @@
package org.apache.cayenne.exp;
-import java.io.Serializable;
import java.util.Objects;
/**
* Named parameter for parameterized expressions.
*/
-public class ExpressionParameter implements Serializable {
+public class ExpressionParameter {
- private static final long serialVersionUID = -8324061115570177022L;
-
protected String name;
/**
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTAdd.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTAdd.java
index 0f43a1f93..2a64cddc1 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTAdd.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTAdd.java
@@ -31,8 +31,6 @@ import org.apache.cayenne.exp.Expression;
*/
public class ASTAdd extends EvaluatedMathNode {
- private static final long serialVersionUID = -8622963819149351988L;
-
ASTAdd(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTAnd.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTAnd.java
index 26ec2cfd5..5de424101 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTAnd.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTAnd.java
@@ -33,8 +33,6 @@ import org.apache.cayenne.util.ConversionUtil;
*/
public class ASTAnd extends AggregateConditionNode implements ValueInjector {
- private static final long serialVersionUID = -5936206826390819160L;
-
/**
* Constructor used by expression parser. Do not invoke directly.
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBetween.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBetween.java
index b02125b08..c77133528 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBetween.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBetween.java
@@ -28,8 +28,6 @@ import org.apache.cayenne.exp.Expression;
*/
public class ASTBetween extends ConditionNode {
- private static final long serialVersionUID = -8739783546459651759L;
-
ASTBetween(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseAnd.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseAnd.java
index e97af98ec..ff3bd0df7 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseAnd.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseAnd.java
@@ -31,8 +31,6 @@ import org.apache.cayenne.exp.Expression;
*/
public class ASTBitwiseAnd extends EvaluatedBitwiseNode {
- private static final long serialVersionUID = -1482206814209874743L;
-
ASTBitwiseAnd(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java
index 518e27767..8e011fc3f 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java
@@ -31,8 +31,6 @@ import org.apache.cayenne.exp.Expression;
*/
public class ASTBitwiseLeftShift extends EvaluatedBitwiseNode {
- private static final long serialVersionUID = -954784931828996446L;
-
ASTBitwiseLeftShift(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseNot.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseNot.java
index 422d8d859..d215af202 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseNot.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseNot.java
@@ -27,8 +27,6 @@ import org.apache.cayenne.util.ConversionUtil;
* @since 3.1
*/
public class ASTBitwiseNot extends EvaluatedNode {
- private static final long serialVersionUID = 1L;
-
ASTBitwiseNot(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseOr.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseOr.java
index e6679f060..231bb770f 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseOr.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseOr.java
@@ -31,8 +31,6 @@ import org.apache.cayenne.exp.Expression;
* @since 3.1
*/
public class ASTBitwiseOr extends EvaluatedBitwiseNode {
- private static final long serialVersionUID = 1L;
-
ASTBitwiseOr(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java
index a16c63b25..02f10be4d 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java
@@ -30,8 +30,6 @@ import org.apache.cayenne.exp.Expression;
* @since 4.0
*/
public class ASTBitwiseRightShift extends EvaluatedBitwiseNode {
- private static final long serialVersionUID = 1L;
-
ASTBitwiseRightShift(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseXor.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseXor.java
index 8204540aa..94250cc78 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseXor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseXor.java
@@ -30,8 +30,6 @@ import org.apache.cayenne.exp.Expression;
* @since 3.1
*/
public class ASTBitwiseXor extends EvaluatedBitwiseNode {
- private static final long serialVersionUID = 1L;
-
ASTBitwiseXor(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java
index c397648e5..312aa9333 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java
@@ -48,8 +48,6 @@ import org.apache.cayenne.util.CayenneMapEntry;
*/
public class ASTDbPath extends ASTPath {
- private static final long serialVersionUID = 6623715674339310782L;
-
public static final String DB_PREFIX = "db:";
ASTDbPath(int id) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTDivide.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTDivide.java
index 9985d1b6c..7b5f710e6 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTDivide.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTDivide.java
@@ -34,8 +34,6 @@ import org.apache.cayenne.exp.Expression;
*/
public class ASTDivide extends EvaluatedMathNode {
- private static final long serialVersionUID = -5086569683844539310L;
-
ASTDivide(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTEqual.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTEqual.java
index e5b64d9c2..84e0457ad 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTEqual.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTEqual.java
@@ -33,8 +33,6 @@ import org.slf4j.LoggerFactory;
*/
public class ASTEqual extends ConditionNode implements ValueInjector {
- private static final long serialVersionUID = 1211234198602067833L;
-
private static final Logger LOGGER = LoggerFactory.getLogger(ASTEqual.class);
/**
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTFalse.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTFalse.java
index 8eb2a3390..30129371b 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTFalse.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTFalse.java
@@ -37,8 +37,6 @@ import org.apache.cayenne.exp.Expression;
*/
public class ASTFalse extends ConditionNode {
- private static final long serialVersionUID = -8441997825701749863L;
-
/**
* Constructor used by expression parser. Do not invoke directly.
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTGreater.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTGreater.java
index 2197b192b..c7bcc5464 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTGreater.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTGreater.java
@@ -26,8 +26,6 @@ import org.apache.cayenne.exp.Expression;
*/
public class ASTGreater extends ConditionNode {
- private static final long serialVersionUID = 2796092142001150018L;
-
/**
* Constructor used by expression parser. Do not invoke directly.
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTGreaterOrEqual.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTGreaterOrEqual.java
index 20fc15d66..b07abefd1 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTGreaterOrEqual.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTGreaterOrEqual.java
@@ -28,8 +28,6 @@ import org.apache.cayenne.exp.Expression;
*/
public class ASTGreaterOrEqual extends ConditionNode {
- private static final long serialVersionUID = -2926530926896058935L;
-
/**
* Constructor used by expression parser. Do not invoke directly.
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTIn.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTIn.java
index c6d05dcf8..6b5d68a08 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTIn.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTIn.java
@@ -29,8 +29,6 @@ import org.apache.cayenne.exp.Expression;
*/
public class ASTIn extends ConditionNode {
- private static final long serialVersionUID = -211084571117172965L;
-
/**
* Constructor used by expression parser. Do not invoke directly.
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLess.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLess.java
index 3e255a88c..23c295935 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLess.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLess.java
@@ -28,8 +28,6 @@ import org.apache.cayenne.exp.Expression;
*/
public class ASTLess extends ConditionNode {
- private static final long serialVersionUID = -3846841914847489596L;
-
/**
* Constructor used by expression parser. Do not invoke directly.
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLessOrEqual.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLessOrEqual.java
index bc3f276df..b130f5cf5 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLessOrEqual.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLessOrEqual.java
@@ -28,8 +28,6 @@ import org.apache.cayenne.exp.Expression;
*/
public class ASTLessOrEqual extends ConditionNode {
- private static final long serialVersionUID = -710886570064202360L;
-
/**
* Constructor used by expression parser. Do not invoke directly.
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLike.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLike.java
index 5d5d8e70d..fa3862612 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLike.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLike.java
@@ -27,8 +27,6 @@ import org.apache.cayenne.util.ConversionUtil;
*/
public class ASTLike extends PatternMatchNode {
- private static final long serialVersionUID = -238967837469085757L;
-
ASTLike(int id) {
super(id, false);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLikeIgnoreCase.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLikeIgnoreCase.java
index 5d70a7509..035250d61 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLikeIgnoreCase.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTLikeIgnoreCase.java
@@ -28,8 +28,6 @@ import org.apache.cayenne.util.ConversionUtil;
*/
public class ASTLikeIgnoreCase extends IgnoreCaseNode {
- private static final long serialVersionUID = 1624594678553400695L;
-
ASTLikeIgnoreCase(int id) {
super(id, true);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTList.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTList.java
index 1a0af76e3..b32fdedc9 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTList.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTList.java
@@ -36,8 +36,6 @@ import java.util.List;
*/
public class ASTList extends SimpleNode {
- private static final long serialVersionUID = 6045178972189002055L;
-
protected Object[] values;
ASTList(int id) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTMultiply.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTMultiply.java
index 6ee06b09f..1816ea01b 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTMultiply.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTMultiply.java
@@ -34,8 +34,6 @@ import org.apache.cayenne.util.ConversionUtil;
*/
public class ASTMultiply extends EvaluatedMathNode {
- private static final long serialVersionUID = -8146316633842448974L;
-
ASTMultiply(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNamedParameter.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNamedParameter.java
index 1dec4c910..f4151a00c 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNamedParameter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNamedParameter.java
@@ -33,8 +33,6 @@ import org.apache.cayenne.exp.ExpressionParameter;
*/
public class ASTNamedParameter extends ASTScalar {
- private static final long serialVersionUID = -3965588358977704022L;
-
ASTNamedParameter(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNegate.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNegate.java
index e7a1bcbd0..cead23e13 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNegate.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNegate.java
@@ -33,8 +33,6 @@ import org.apache.cayenne.util.ConversionUtil;
*/
public class ASTNegate extends SimpleNode {
- private static final long serialVersionUID = -9161722951926428414L;
-
ASTNegate(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNot.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNot.java
index b5c3975c1..a0ef7c133 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNot.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNot.java
@@ -32,8 +32,6 @@ import org.apache.cayenne.util.ConversionUtil;
*/
public class ASTNot extends AggregateConditionNode {
- private static final long serialVersionUID = 7418894098531106347L;
-
ASTNot(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNotLikeIgnoreCase.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNotLikeIgnoreCase.java
index be40cacf6..6e88547c0 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNotLikeIgnoreCase.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTNotLikeIgnoreCase.java
@@ -28,8 +28,6 @@ import org.apache.cayenne.util.ConversionUtil;
*/
public class ASTNotLikeIgnoreCase extends IgnoreCaseNode {
- private static final long serialVersionUID = -1837593236671099985L;
-
ASTNotLikeIgnoreCase(int id) {
super(id, true);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
index f86d5d5d2..c3997c227 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
@@ -38,8 +38,6 @@ import org.slf4j.LoggerFactory;
public class ASTObjPath extends ASTPath {
- private static final long serialVersionUID = -3574281576491705706L;
-
private static final Logger LOGGER = LoggerFactory.getLogger(ASTObjPath.class);
public static final String OBJ_PREFIX = "obj:";
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTOr.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTOr.java
index c9cc8f713..4ed566742 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTOr.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTOr.java
@@ -32,8 +32,6 @@ import org.apache.cayenne.util.ConversionUtil;
*/
public class ASTOr extends AggregateConditionNode {
- private static final long serialVersionUID = 780157841581581297L;
-
ASTOr(int id) {
super(id);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTPath.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTPath.java
index 3475f24eb..1521632e1 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTPath.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTPath.java
@@ -36,8 +36,6 @@ import org.apache.cayenne.util.CayenneMapEntry;
*/
public abstract class ASTPath extends SimpleNode {
- private static final long serialVersionUID = -8099822503585617295L;
-
protected CayennePath path;
protected Map<String, String> pathAliases;
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/AggregateConditionNode.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/AggregateConditionNode.java
index 88805a851..7394cb3a6 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/AggregateConditionNode.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/AggregateConditionNode.java
@@ -34,8 +34,6 @@ import org.apache.cayenne.exp.ExpressionFactory;
*/
public abstract class AggregateConditionNode extends SimpleNode {
- private static final long serialVersionUID = -636699350691988809L;
-
AggregateConditionNode(int i) {
super(i);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java
index 33c38dcd6..3a9a4ea74 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java
@@ -33,8 +33,8 @@ import java.util.regex.Pattern;
*/
public abstract class PatternMatchNode extends ConditionNode {
- protected transient Pattern pattern;
- protected transient boolean patternCompiled;
+ protected Pattern pattern;
+ protected boolean patternCompiled;
protected boolean ignoringCase;
protected char escapeChar;
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java
index 705d061b0..09138e768 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java
@@ -39,8 +39,6 @@ import org.apache.cayenne.util.Util;
*/
public abstract class SimpleNode extends Expression implements Node {
- private static final long serialVersionUID = 4471832357335707557L;
-
protected Node parent;
protected Node[] children;
protected int id;
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/path/CayennePath.java b/cayenne/src/main/java/org/apache/cayenne/exp/path/CayennePath.java
index 3d402d6a2..47972d5b7 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/path/CayennePath.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/path/CayennePath.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.exp.path;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -45,7 +44,7 @@ import java.util.List;
*
* @since 5.0
*/
-public interface CayennePath extends Iterable<CayennePathSegment>, Serializable {
+public interface CayennePath extends Iterable<CayennePathSegment> {
/**
* No special markers
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/path/CayennePathSegment.java b/cayenne/src/main/java/org/apache/cayenne/exp/path/CayennePathSegment.java
index 9f12bf4ff..f025f2d81 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/path/CayennePathSegment.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/path/CayennePathSegment.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.exp.path;
-import java.io.Serializable;
import java.util.Objects;
/**
@@ -32,7 +31,7 @@ import java.util.Objects;
*
* @since 5.0
*/
-public class CayennePathSegment implements CharSequence, Serializable {
+public class CayennePathSegment implements CharSequence {
private final String segment;
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/path/EmptyCayennePath.java b/cayenne/src/main/java/org/apache/cayenne/exp/path/EmptyCayennePath.java
index f80022b96..527a40daf 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/path/EmptyCayennePath.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/path/EmptyCayennePath.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.exp.path;
-import java.io.Serializable;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -29,7 +28,7 @@ import java.util.List;
*
* @since 5.0
*/
-class EmptyCayennePath implements CayennePath, Serializable {
+class EmptyCayennePath implements CayennePath {
final int marker;
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/path/MultiSegmentCayennePath.java b/cayenne/src/main/java/org/apache/cayenne/exp/path/MultiSegmentCayennePath.java
index a2ab66998..fd5d30625 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/path/MultiSegmentCayennePath.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/path/MultiSegmentCayennePath.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.exp.path;
-import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
@@ -29,13 +28,13 @@ import java.util.NoSuchElementException;
*
* @since 5.0
*/
-class MultiSegmentCayennePath implements CayennePath, Serializable {
+class MultiSegmentCayennePath implements CayennePath {
private final List<CayennePathSegment> segments;
private final int marker;
- private transient String fullPath;
+ private String fullPath;
MultiSegmentCayennePath(List<CayennePathSegment> segments, int marker) {
this.segments = segments;
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/path/SegmentList.java b/cayenne/src/main/java/org/apache/cayenne/exp/path/SegmentList.java
index 9163031bd..a2e96b15e 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/path/SegmentList.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/path/SegmentList.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.exp.path;
-import java.io.Serializable;
import java.util.AbstractList;
import java.util.List;
import java.util.Objects;
@@ -30,7 +29,7 @@ import java.util.RandomAccess;
*
* @since 5.0
*/
-class SegmentList extends AbstractList<CayennePathSegment> implements RandomAccess, Serializable {
+class SegmentList extends AbstractList<CayennePathSegment> implements RandomAccess {
/**
* This array is shared with several lists, so it's a caller responsibility to protect its content
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/path/SingleSegmentCayennePath.java b/cayenne/src/main/java/org/apache/cayenne/exp/path/SingleSegmentCayennePath.java
index d94b29db2..f6b53b7ae 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/path/SingleSegmentCayennePath.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/path/SingleSegmentCayennePath.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.exp.path;
-import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
@@ -31,7 +30,7 @@ import java.util.function.Consumer;
*
* @since 5.0
*/
-class SingleSegmentCayennePath implements CayennePath, Serializable {
+class SingleSegmentCayennePath implements CayennePath {
private final CayennePathSegment segment;
diff --git a/cayenne/src/main/java/org/apache/cayenne/graph/ArcCreateOperation.java b/cayenne/src/main/java/org/apache/cayenne/graph/ArcCreateOperation.java
index 686770fa0..15428441a 100644
--- a/cayenne/src/main/java/org/apache/cayenne/graph/ArcCreateOperation.java
+++ b/cayenne/src/main/java/org/apache/cayenne/graph/ArcCreateOperation.java
@@ -24,8 +24,6 @@ package org.apache.cayenne.graph;
*/
public class ArcCreateOperation extends NodeDiff {
- private static final long serialVersionUID = 2497511574121718987L;
-
protected Object targetNodeId;
protected ArcId arcId;
diff --git a/cayenne/src/main/java/org/apache/cayenne/graph/ArcDeleteOperation.java b/cayenne/src/main/java/org/apache/cayenne/graph/ArcDeleteOperation.java
index 3c2eccb6f..148b5ab53 100644
--- a/cayenne/src/main/java/org/apache/cayenne/graph/ArcDeleteOperation.java
+++ b/cayenne/src/main/java/org/apache/cayenne/graph/ArcDeleteOperation.java
@@ -24,8 +24,6 @@ package org.apache.cayenne.graph;
*/
public class ArcDeleteOperation extends NodeDiff {
- private static final long serialVersionUID = 3614253207710845385L;
-
protected Object targetNodeId;
protected ArcId arcId;
diff --git a/cayenne/src/main/java/org/apache/cayenne/graph/ArcId.java b/cayenne/src/main/java/org/apache/cayenne/graph/ArcId.java
index 51d402006..a05803685 100644
--- a/cayenne/src/main/java/org/apache/cayenne/graph/ArcId.java
+++ b/cayenne/src/main/java/org/apache/cayenne/graph/ArcId.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.graph;
-import java.io.Serializable;
import java.util.Objects;
import org.apache.cayenne.exp.parser.ASTDbPath;
@@ -31,9 +30,7 @@ import org.apache.cayenne.reflect.ArcProperty;
*
* @since 4.2
*/
-public class ArcId implements Serializable {
-
- private static final long serialVersionUID = -3712846298213425259L;
+public class ArcId {
private final String forwardArc;
private final String reverseArc;
diff --git a/cayenne/src/main/java/org/apache/cayenne/graph/CompoundDiff.java b/cayenne/src/main/java/org/apache/cayenne/graph/CompoundDiff.java
index e4c96276a..bae943d37 100644
--- a/cayenne/src/main/java/org/apache/cayenne/graph/CompoundDiff.java
+++ b/cayenne/src/main/java/org/apache/cayenne/graph/CompoundDiff.java
@@ -32,8 +32,6 @@ import java.util.ListIterator;
*/
public class CompoundDiff implements GraphDiff {
- private static final long serialVersionUID = 5930690302335603082L;
-
protected List<GraphDiff> diffs;
/**
diff --git a/cayenne/src/main/java/org/apache/cayenne/graph/GraphDiff.java b/cayenne/src/main/java/org/apache/cayenne/graph/GraphDiff.java
index a8ad492f9..f3b3c9231 100644
--- a/cayenne/src/main/java/org/apache/cayenne/graph/GraphDiff.java
+++ b/cayenne/src/main/java/org/apache/cayenne/graph/GraphDiff.java
@@ -19,15 +19,13 @@
package org.apache.cayenne.graph;
-import java.io.Serializable;
-
/**
* Represents a change in an object graph. This can be a simple change (like a node
* property update) or a composite change that consists of a number of smaller changes.
*
* @since 1.2
*/
-public interface GraphDiff extends Serializable {
+public interface GraphDiff {
/**
* Returns true if this diff is simply a placeholder and does not perform any actual
diff --git a/cayenne/src/main/java/org/apache/cayenne/graph/GraphEvent.java b/cayenne/src/main/java/org/apache/cayenne/graph/GraphEvent.java
index 710b976a2..3ca469ce1 100644
--- a/cayenne/src/main/java/org/apache/cayenne/graph/GraphEvent.java
+++ b/cayenne/src/main/java/org/apache/cayenne/graph/GraphEvent.java
@@ -34,8 +34,6 @@ import org.apache.cayenne.event.CayenneEvent;
*/
public class GraphEvent extends CayenneEvent {
- private static final long serialVersionUID = -8954343713674462675L;
-
protected GraphDiff diff;
public GraphEvent(Object source, GraphDiff diff) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/graph/NodeCreateOperation.java b/cayenne/src/main/java/org/apache/cayenne/graph/NodeCreateOperation.java
index 48bb8e7dc..f02d9e22c 100644
--- a/cayenne/src/main/java/org/apache/cayenne/graph/NodeCreateOperation.java
+++ b/cayenne/src/main/java/org/apache/cayenne/graph/NodeCreateOperation.java
@@ -24,8 +24,6 @@ package org.apache.cayenne.graph;
*/
public class NodeCreateOperation extends NodeDiff {
- private static final long serialVersionUID = -7383872939009489304L;
-
public NodeCreateOperation(Object nodeId) {
super(nodeId);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/graph/NodeDeleteOperation.java b/cayenne/src/main/java/org/apache/cayenne/graph/NodeDeleteOperation.java
index 3e5487dca..1f3c66fcd 100644
--- a/cayenne/src/main/java/org/apache/cayenne/graph/NodeDeleteOperation.java
+++ b/cayenne/src/main/java/org/apache/cayenne/graph/NodeDeleteOperation.java
@@ -24,8 +24,6 @@ package org.apache.cayenne.graph;
*/
public class NodeDeleteOperation extends NodeDiff {
- private static final long serialVersionUID = -6826320740710028334L;
-
public NodeDeleteOperation(Object nodeId) {
super(nodeId);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/graph/NodeDiff.java b/cayenne/src/main/java/org/apache/cayenne/graph/NodeDiff.java
index 43ad0cbca..61befbab1 100644
--- a/cayenne/src/main/java/org/apache/cayenne/graph/NodeDiff.java
+++ b/cayenne/src/main/java/org/apache/cayenne/graph/NodeDiff.java
@@ -27,8 +27,6 @@ package org.apache.cayenne.graph;
*/
public abstract class NodeDiff implements GraphDiff, Comparable<NodeDiff> {
- private static final long serialVersionUID = -6108147375331011556L;
-
protected int diffId;
protected Object nodeId;
diff --git a/cayenne/src/main/java/org/apache/cayenne/graph/NodeIdChangeOperation.java b/cayenne/src/main/java/org/apache/cayenne/graph/NodeIdChangeOperation.java
index 4503321e6..caf232d99 100644
--- a/cayenne/src/main/java/org/apache/cayenne/graph/NodeIdChangeOperation.java
+++ b/cayenne/src/main/java/org/apache/cayenne/graph/NodeIdChangeOperation.java
@@ -26,8 +26,6 @@ package org.apache.cayenne.graph;
*/
public class NodeIdChangeOperation extends NodeDiff {
- private static final long serialVersionUID = -7763730686130451729L;
-
protected Object newNodeId;
public NodeIdChangeOperation(Object nodeId, Object newNodeId) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/graph/NodePropertyChangeOperation.java b/cayenne/src/main/java/org/apache/cayenne/graph/NodePropertyChangeOperation.java
index 9d968495c..55f567908 100644
--- a/cayenne/src/main/java/org/apache/cayenne/graph/NodePropertyChangeOperation.java
+++ b/cayenne/src/main/java/org/apache/cayenne/graph/NodePropertyChangeOperation.java
@@ -26,8 +26,6 @@ import java.util.Objects;
*/
public class NodePropertyChangeOperation extends NodeDiff {
- private static final long serialVersionUID = 3282063727025159961L;
-
protected String property;
protected Object oldValue;
protected Object newValue;
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/Attribute.java b/cayenne/src/main/java/org/apache/cayenne/map/Attribute.java
index 4d4f9324a..b710d2e77 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/Attribute.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/Attribute.java
@@ -19,8 +19,6 @@
package org.apache.cayenne.map;
-import java.io.Serializable;
-
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.util.CayenneMapEntry;
import org.apache.cayenne.util.ToStringBuilder;
@@ -33,7 +31,7 @@ import org.apache.cayenne.util.XMLSerializable;
*
*/
public abstract class Attribute<E extends Entity<E, A, R>, A extends Attribute<E, A, R>, R extends Relationship<E, A, R>>
- implements CayenneMapEntry, XMLSerializable, Serializable {
+ implements CayenneMapEntry, XMLSerializable {
protected String name;
protected Entity<E, A, R> entity;
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/CallbackDescriptor.java b/cayenne/src/main/java/org/apache/cayenne/map/CallbackDescriptor.java
index 465931922..2e3461e7d 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/CallbackDescriptor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/CallbackDescriptor.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.cayenne.map;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -31,7 +30,7 @@ import java.util.Set;
*
* @since 3.0
*/
-public class CallbackDescriptor implements Serializable {
+public class CallbackDescriptor {
protected LifecycleEvent callbackType;
protected Set<String> callbackMethods;
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/CallbackMap.java b/cayenne/src/main/java/org/apache/cayenne/map/CallbackMap.java
index 7ae7a92b2..e2568d0cb 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/CallbackMap.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/CallbackMap.java
@@ -20,14 +20,12 @@ package org.apache.cayenne.map;
import org.apache.cayenne.util.XMLEncoder;
-import java.io.Serializable;
-
/**
* A generic descriptor of a set of standard lifecycle callbacks.
*
* @since 3.0
*/
-public class CallbackMap implements Serializable {
+public class CallbackMap {
private final CallbackDescriptor[] callbacks;
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/DataMap.java b/cayenne/src/main/java/org/apache/cayenne/map/DataMap.java
index 495101a03..425c9fc33 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/DataMap.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/DataMap.java
@@ -30,7 +30,6 @@ import org.apache.cayenne.util.Util;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -48,9 +47,7 @@ import static java.util.Collections.emptyList;
* tables, ObjEntities - mapping persistent Java classes, Procedures - mapping
* database stored procedures.
*/
-public class DataMap implements Serializable, ConfigurationNode, XMLSerializable, MappingNamespace, Comparable<DataMap> {
-
- private static final long serialVersionUID = 4851901426473991657L;
+public class DataMap implements ConfigurationNode, XMLSerializable, MappingNamespace, Comparable<DataMap> {
/**
* Defines the name of the property for default DB catalog.
@@ -119,7 +116,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
/**
* @since 3.1
*/
- protected transient Resource configurationSource;
+ protected Resource configurationSource;
/**
* @since 3.1
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/DbJoin.java b/cayenne/src/main/java/org/apache/cayenne/map/DbJoin.java
index f3a638214..f5a6eb1cf 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/DbJoin.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/DbJoin.java
@@ -19,8 +19,6 @@
package org.apache.cayenne.map;
-import java.io.Serializable;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.util.ToStringBuilder;
@@ -32,7 +30,7 @@ import org.apache.cayenne.util.XMLSerializable;
*
* @since 1.1
*/
-public class DbJoin implements XMLSerializable, Serializable {
+public class DbJoin implements XMLSerializable {
protected DbRelationship relationship;
protected String sourceName;
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/DbKeyGenerator.java b/cayenne/src/main/java/org/apache/cayenne/map/DbKeyGenerator.java
index 439001414..31ee7c900 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/DbKeyGenerator.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/DbKeyGenerator.java
@@ -20,8 +20,6 @@
package org.apache.cayenne.map;
-import java.io.Serializable;
-
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.util.CayenneMapEntry;
import org.apache.cayenne.util.XMLEncoder;
@@ -34,7 +32,7 @@ import org.apache.cayenne.util.XMLSerializable;
*
*/
-public class DbKeyGenerator implements CayenneMapEntry, XMLSerializable, Serializable {
+public class DbKeyGenerator implements CayenneMapEntry, XMLSerializable {
public static final String ORACLE_TYPE = "ORACLE";
public static final String NAMED_SEQUENCE_TABLE_TYPE = "NAMED_SEQUENCE_TABLE";
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/Embeddable.java b/cayenne/src/main/java/org/apache/cayenne/map/Embeddable.java
index 1bd076e30..4c36e2919 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/Embeddable.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/Embeddable.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.cayenne.map;
-import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -38,10 +37,8 @@ import org.apache.cayenne.util.XMLSerializable;
*
* @since 3.0
*/
-public class Embeddable implements ConfigurationNode, XMLSerializable, Serializable {
+public class Embeddable implements ConfigurationNode, XMLSerializable {
- private static final long serialVersionUID = -7163768090567642099L;
-
protected String className;
protected Map<String, EmbeddableAttribute> attributes;
protected DataMap dataMap;
@@ -89,8 +86,6 @@ public class Embeddable implements ConfigurationNode, XMLSerializable, Serializa
* Returns an unmodifiable sorted map of embeddable attributes.
*/
public Map<String, EmbeddableAttribute> getAttributeMap() {
- // create a new instance ... Caching unmodifiable map causes
- // serialization issues (esp. with Hessian).
return Collections.unmodifiableMap(attributes);
}
@@ -98,8 +93,6 @@ public class Embeddable implements ConfigurationNode, XMLSerializable, Serializa
* Returns an unmodifiable collection of embeddable attributes.
*/
public Collection<EmbeddableAttribute> getAttributes() {
- // create a new instance. Caching unmodifiable collection causes
- // serialization issues (esp. with Hessian).
return Collections.unmodifiableCollection(attributes.values());
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/EmbeddableAttribute.java b/cayenne/src/main/java/org/apache/cayenne/map/EmbeddableAttribute.java
index 3c8e066d5..082245787 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/EmbeddableAttribute.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/EmbeddableAttribute.java
@@ -18,8 +18,6 @@
****************************************************************/
package org.apache.cayenne.map;
-import java.io.Serializable;
-
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.util.XMLEncoder;
@@ -30,8 +28,7 @@ import org.apache.cayenne.util.XMLSerializable;
*
* @since 3.0
*/
-public class EmbeddableAttribute implements ConfigurationNode, XMLSerializable,
- Serializable {
+public class EmbeddableAttribute implements ConfigurationNode, XMLSerializable {
protected String name;
protected String type;
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/Entity.java b/cayenne/src/main/java/org/apache/cayenne/map/Entity.java
index 66eafe7a4..0ce2e71e2 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/Entity.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/Entity.java
@@ -28,7 +28,6 @@ import org.apache.cayenne.util.CayenneMapEntry;
import org.apache.cayenne.util.ToStringBuilder;
import org.apache.cayenne.util.XMLSerializable;
-import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -42,7 +41,7 @@ import java.util.StringTokenizer;
*
*/
public abstract class Entity<E extends Entity<E, A, R>, A extends Attribute<E, A, R>, R extends Relationship<E, A, R>>
- implements CayenneMapEntry, XMLSerializable, Serializable {
+ implements CayenneMapEntry, XMLSerializable {
public static final String PATH_SEPARATOR = ".";
@@ -236,8 +235,6 @@ public abstract class Entity<E extends Entity<E, A, R>, A extends Attribute<E, A
* Returns an unmodifiable map of relationships sorted by name.
*/
public Map<String, R> getRelationshipMap() {
- // create a new instance ... earlier attempts to cache it in the entity caused
- // serialization issues (esp. with Hessian).
return Collections.unmodifiableMap(relationships);
}
@@ -265,8 +262,6 @@ public abstract class Entity<E extends Entity<E, A, R>, A extends Attribute<E, A
* Returns an unmodifiable collection of Relationships that exist in this entity.
*/
public Collection<R> getRelationships() {
- // create a new instance ... earlier attempts to cache it in the entity caused
- // serialization issues (esp. with Hessian).
return Collections.unmodifiableCollection(relationships.values());
}
@@ -274,8 +269,6 @@ public abstract class Entity<E extends Entity<E, A, R>, A extends Attribute<E, A
* Returns an unmodifiable sorted map of entity attributes.
*/
public Map<String, A> getAttributeMap() {
- // create a new instance ... earlier attempts to cache it in the entity caused
- // serialization issues (esp. with Hessian).
return Collections.unmodifiableMap(attributes);
}
@@ -283,8 +276,6 @@ public abstract class Entity<E extends Entity<E, A, R>, A extends Attribute<E, A
* Returns an unmodifiable collection of entity attributes.
*/
public Collection<A> getAttributes() {
- // create a new instance ... earlier attempts to cache it in the entity caused
- // serialization issues (esp. with Hessian).
return Collections.unmodifiableCollection(attributes.values());
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/EntityResolver.java b/cayenne/src/main/java/org/apache/cayenne/map/EntityResolver.java
index 8322e4113..c339c1687 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/EntityResolver.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/EntityResolver.java
@@ -40,9 +40,6 @@ import org.apache.cayenne.reflect.generic.ValueComparisonStrategyFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -62,7 +59,7 @@ import java.util.concurrent.atomic.AtomicLong;
*
* @since 1.1
*/
-public class EntityResolver implements MappingNamespace, Serializable {
+public class EntityResolver implements MappingNamespace {
private static final Logger LOGGER = LoggerFactory.getLogger(EntityResolver.class);
protected static AtomicLong incrementer = new AtomicLong();
@@ -82,22 +79,19 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
protected Collection<DataMap> maps;
- protected transient MappingNamespace mappingCache;
+ protected MappingNamespace mappingCache;
- // must be transient, as resolver may get deserialized in another VM, and
- // descriptor recompilation will be desired.
- protected transient volatile ClassDescriptorMap classDescriptorMap;
+ protected volatile ClassDescriptorMap classDescriptorMap;
- // callbacks are not serializable
- protected transient LifecycleCallbackRegistry callbackRegistry;
+ protected LifecycleCallbackRegistry callbackRegistry;
- protected transient ValueObjectTypeRegistry valueObjectTypeRegistry;
- protected transient ValueComparisonStrategyFactory valueComparisonStrategyFactory;
+ protected ValueObjectTypeRegistry valueObjectTypeRegistry;
+ protected ValueComparisonStrategyFactory valueComparisonStrategyFactory;
/**
* @since 5.0
*/
- protected transient AdhocObjectFactory objectFactory;
+ protected AdhocObjectFactory objectFactory;
/**
@@ -511,15 +505,6 @@ public class EntityResolver implements MappingNamespace, Serializable {
return classDescriptorMap;
}
- /**
- * Java default deserialization seems not to invoke constructor by default -
- * invoking it manually
- */
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- in.defaultReadObject();
- refreshMappingCache();
- }
-
public ValueObjectTypeRegistry getValueObjectTypeRegistry() {
return valueObjectTypeRegistry;
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/Procedure.java b/cayenne/src/main/java/org/apache/cayenne/map/Procedure.java
index 4d77524e9..b8dcfbe96 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/Procedure.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/Procedure.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.map;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -33,8 +32,7 @@ import org.apache.cayenne.util.XMLSerializable;
/**
* A mapping descriptor for a database stored procedure.
*/
-public class Procedure implements ConfigurationNode, CayenneMapEntry, XMLSerializable,
- Serializable {
+public class Procedure implements ConfigurationNode, CayenneMapEntry, XMLSerializable {
protected String name;
protected DataMap dataMap;
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/ProcedureParameter.java b/cayenne/src/main/java/org/apache/cayenne/map/ProcedureParameter.java
index 2cc804adb..0887ce3ed 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/ProcedureParameter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/ProcedureParameter.java
@@ -19,8 +19,6 @@
package org.apache.cayenne.map;
-import java.io.Serializable;
-
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.dba.TypesMapping;
@@ -32,7 +30,7 @@ import org.apache.cayenne.util.XMLSerializable;
* A descriptor for the Procedure parameter.
*/
public class ProcedureParameter implements ConfigurationNode, CayenneMapEntry,
- XMLSerializable, Serializable {
+ XMLSerializable {
public static final int IN_OUT_PARAMETER = 3;
public static final int IN_PARAMETER = 1;
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/QueryDescriptor.java b/cayenne/src/main/java/org/apache/cayenne/map/QueryDescriptor.java
index 771245d6e..63343d272 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/QueryDescriptor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/QueryDescriptor.java
@@ -25,7 +25,6 @@ import org.apache.cayenne.query.Query;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
-import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@@ -34,7 +33,7 @@ import java.util.Map;
*
* @since 4.0
*/
-public class QueryDescriptor implements Serializable, ConfigurationNode, XMLSerializable {
+public class QueryDescriptor implements ConfigurationNode, XMLSerializable {
public static final String SELECT_QUERY = "SelectQuery";
public static final String SQL_TEMPLATE = "SQLTemplate";
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/Relationship.java b/cayenne/src/main/java/org/apache/cayenne/map/Relationship.java
index ba961bfb6..2a7be2a00 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/Relationship.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/Relationship.java
@@ -19,8 +19,6 @@
package org.apache.cayenne.map;
-import java.io.Serializable;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.util.CayenneMapEntry;
import org.apache.cayenne.util.ToStringBuilder;
@@ -32,7 +30,7 @@ import org.apache.cayenne.util.XMLSerializable;
* notion of source and target entity. This makes DataMap a "digraph".
*/
public abstract class Relationship<E extends Entity<E, A, R>, A extends Attribute<E, A, R>, R extends Relationship<E, A, R>>
- implements CayenneMapEntry, XMLSerializable, Serializable {
+ implements CayenneMapEntry, XMLSerializable {
protected String name;
protected E sourceEntity;
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java b/cayenne/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
index f80ee3855..5bc2ffb02 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
@@ -36,8 +36,6 @@ import java.util.Map;
*/
public class SelectQueryDescriptor extends QueryDescriptor {
- private static final long serialVersionUID = -8798258795351950215L;
-
public static final String DISTINCT_PROPERTY = "cayenne.SelectQuery.distinct";
public static final boolean DISTINCT_DEFAULT = false;
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/BaseQueryMetadata.java b/cayenne/src/main/java/org/apache/cayenne/query/BaseQueryMetadata.java
index 4c594a923..34006521b 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/BaseQueryMetadata.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/BaseQueryMetadata.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.query;
-import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -39,9 +38,7 @@ import org.apache.cayenne.reflect.ClassDescriptor;
*
* @since 1.1
*/
-class BaseQueryMetadata implements QueryMetadata, Serializable {
-
- private static final long serialVersionUID = 5129792493303459115L;
+class BaseQueryMetadata implements QueryMetadata {
int fetchLimit = QueryMetadata.FETCH_LIMIT_DEFAULT;
int fetchOffset = QueryMetadata.FETCH_OFFSET_DEFAULT;
@@ -61,12 +58,12 @@ class BaseQueryMetadata implements QueryMetadata, Serializable {
*/
String cacheGroup;
- transient List<Object> resultSetMapping;
- transient DbEntity dbEntity;
- transient DataMap dataMap;
- transient Object lastRoot;
- transient ClassDescriptor classDescriptor;
- transient EntityResolver lastEntityResolver;
+ List<Object> resultSetMapping;
+ DbEntity dbEntity;
+ DataMap dataMap;
+ Object lastRoot;
+ ClassDescriptor classDescriptor;
+ EntityResolver lastEntityResolver;
/**
* Copies values of another QueryMetadata object to this object.
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/ColumnSelectMetadata.java b/cayenne/src/main/java/org/apache/cayenne/query/ColumnSelectMetadata.java
index 76b780cdb..4d0ce06be 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/ColumnSelectMetadata.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/ColumnSelectMetadata.java
@@ -36,8 +36,6 @@ import org.apache.cayenne.map.ObjRelationship;
*/
class ColumnSelectMetadata extends ObjectSelectMetadata {
- private static final long serialVersionUID = -3622675304651257963L;
-
private static final ScalarResultSegment SCALAR_RESULT_SEGMENT
= new DefaultScalarResultSegment(null, -1);
private static final EntityResultSegment ENTITY_RESULT_SEGMENT
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/EJBQLQuery.java b/cayenne/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
index f49436d7b..d37c067e3 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
@@ -39,7 +39,7 @@ public class EJBQLQuery extends CacheableQuery {
protected Map<String, Object> namedParameters;
protected Map<Integer, Object> positionalParameters;
- protected transient EJBQLCompiledExpression expression;
+ protected EJBQLCompiledExpression expression;
EJBQLQueryMetadata metadata = new EJBQLQueryMetadata();
public EJBQLQuery(String ejbqlStatement) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/IndirectQuery.java b/cayenne/src/main/java/org/apache/cayenne/query/IndirectQuery.java
index aaa3a9727..ca3b6f888 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/IndirectQuery.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/IndirectQuery.java
@@ -31,8 +31,6 @@ import org.apache.cayenne.map.EntityResolver;
*/
public abstract class IndirectQuery implements Query {
- private static final long serialVersionUID = 974666786498898209L;
-
protected String name;
/**
@@ -40,8 +38,8 @@ public abstract class IndirectQuery implements Query {
*/
protected DataMap dataMap;
- protected transient Query replacementQuery;
- protected transient EntityResolver lastResolver;
+ protected Query replacementQuery;
+ protected EntityResolver lastResolver;
/**
* Returns the metadata obtained from the replacement query.
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java b/cayenne/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java
index ef7bf1134..98a1ccfd5 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java
@@ -51,14 +51,8 @@ public class ObjectIdQuery extends IndirectQuery {
protected int cachePolicy;
protected boolean fetchingDataRows;
- protected transient EntityResolver metadataResolver;
- protected transient QueryMetadata metadata;
-
- // needed for hessian serialization
- @SuppressWarnings("unused")
- private ObjectIdQuery() {
- this.cachePolicy = CACHE_REFRESH;
- }
+ protected EntityResolver metadataResolver;
+ protected QueryMetadata metadata;
/**
* Creates a refreshing ObjectIdQuery.
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/ObjectSelect.java b/cayenne/src/main/java/org/apache/cayenne/query/ObjectSelect.java
index ae8862626..70817a47a 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/ObjectSelect.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/ObjectSelect.java
@@ -51,8 +51,6 @@ import java.util.List;
*/
public class ObjectSelect<T> extends FluentSelect<T, ObjectSelect<T>> {
- private static final long serialVersionUID = -156124021150949227L;
-
/**
* Creates a ObjectSelect that selects objects of a given persistent class.
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/ObjectSelectMetadata.java b/cayenne/src/main/java/org/apache/cayenne/query/ObjectSelectMetadata.java
index 4d6c6dd87..41742d333 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/ObjectSelectMetadata.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/ObjectSelectMetadata.java
@@ -35,8 +35,6 @@ import java.util.Map;
*/
class ObjectSelectMetadata extends BaseQueryMetadata {
- private static final long serialVersionUID = -4936484509363047672L;
-
protected Map<String, String> pathSplitAliases;
/**
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/Ordering.java b/cayenne/src/main/java/org/apache/cayenne/query/Ordering.java
index 04ed7c14d..e165ad7df 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/Ordering.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/Ordering.java
@@ -20,7 +20,6 @@
package org.apache.cayenne.query;
import java.io.PrintWriter;
-import java.io.Serializable;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collection;
@@ -46,12 +45,10 @@ import org.apache.cayenne.util.XMLSerializable;
* SelectQuery query. Note that in case of in-memory sorting, Ordering can be
* used with any JavaBeans, not just Persistent objects.
*/
-public class Ordering implements Comparator<Object>, Serializable, XMLSerializable {
-
- private static final long serialVersionUID = -9167074787055881422L;
+public class Ordering implements Comparator<Object>, XMLSerializable {
protected String sortSpecString;
- protected transient Expression sortSpec;
+ protected Expression sortSpec;
protected SortOrder sortOrder;
protected boolean pathExceptionSuppressed = false;
protected boolean nullSortedFirst = true;
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/PrefetchTreeNode.java b/cayenne/src/main/java/org/apache/cayenne/query/PrefetchTreeNode.java
index 7919f3c41..199eb02e5 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/PrefetchTreeNode.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/PrefetchTreeNode.java
@@ -26,8 +26,6 @@ import org.apache.cayenne.util.Util;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -37,9 +35,7 @@ import java.util.Collections;
*
* @since 1.2
*/
-public class PrefetchTreeNode implements Serializable, XMLSerializable {
-
- private static final long serialVersionUID = 1112629504025820837L;
+public class PrefetchTreeNode implements XMLSerializable {
public static final int UNDEFINED_SEMANTICS = 0;
public static final int JOINT_PREFETCH_SEMANTICS = 1;
@@ -52,8 +48,7 @@ public class PrefetchTreeNode implements Serializable, XMLSerializable {
protected String ejbqlPathEntityId;
protected String entityName;
- // transient parent allows cloning parts of the tree via serialization
- protected transient PrefetchTreeNode parent;
+ protected PrefetchTreeNode parent;
// Using Collection instead of Map for children storage (even though there cases of
// lookup by segment) is a reasonable tradeoff considering that
@@ -511,22 +506,6 @@ public class PrefetchTreeNode implements Serializable, XMLSerializable {
this.entityName = entityName;
}
- // **** custom serialization that supports serializing subtrees...
-
- // implementing 'readResolve' instead of 'readObject' so that this would
- // work with
- // hessian
- protected Object readResolve() throws ObjectStreamException {
-
- if (hasChildren()) {
- for (PrefetchTreeNode child : children) {
- child.parent = this;
- }
- }
-
- return this;
- }
-
// **** common tree operations
// An operation that encodes prefetch tree as XML.
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/ProcedureQueryMetadata.java b/cayenne/src/main/java/org/apache/cayenne/query/ProcedureQueryMetadata.java
index 8a08ba265..8d1e4dd5f 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/ProcedureQueryMetadata.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/ProcedureQueryMetadata.java
@@ -29,7 +29,7 @@ import java.util.Map;
class ProcedureQueryMetadata extends BaseQueryMetadata {
- transient Procedure procedure;
+ Procedure procedure;
@Override
public Procedure getProcedure() {
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/Query.java b/cayenne/src/main/java/org/apache/cayenne/query/Query.java
index aae9a33e4..4eeba5182 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/Query.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/Query.java
@@ -24,12 +24,10 @@ import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
-import java.io.Serializable;
-
/**
* Defines minimal API of a query descriptor that is executable via Cayenne.
*/
-public interface Query extends Serializable {
+public interface Query {
/**
* Returns query runtime parameters. The method is called at various stages of the
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/SQLExec.java b/cayenne/src/main/java/org/apache/cayenne/query/SQLExec.java
index 00c55b212..b8bb22230 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/SQLExec.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/SQLExec.java
@@ -41,8 +41,6 @@ import org.apache.cayenne.util.QueryResultBuilder;
*/
public class SQLExec extends IndirectQuery {
- private static final long serialVersionUID = -6533566707148045615L;
-
/**
* Creates a query executing provided SQL run against default database.
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/SQLSelect.java b/cayenne/src/main/java/org/apache/cayenne/query/SQLSelect.java
index 8b122a5e4..f88ae4e01 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/SQLSelect.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/SQLSelect.java
@@ -39,8 +39,6 @@ import org.apache.cayenne.map.EntityResolver;
*/
public class SQLSelect<T> extends IndirectQuery implements Select<T> {
- private static final long serialVersionUID = -7074293371883740872L;
-
private List<Class<?>> resultColumnsTypes;
private boolean useScalar;
private boolean isFetchingDataRows;
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/SQLTemplate.java b/cayenne/src/main/java/org/apache/cayenne/query/SQLTemplate.java
index 980bcd34f..10c226463 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/SQLTemplate.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/SQLTemplate.java
@@ -69,8 +69,6 @@ import java.util.stream.Stream;
*/
public class SQLTemplate extends CacheableQuery {
- private static final long serialVersionUID = -3073521388289663641L;
-
public static final String COLUMN_NAME_CAPITALIZATION_PROPERTY = "cayenne.SQLTemplate.columnNameCapitalization";
private static final Function<Map<String, ?>, Map<String, ?>> nullMapTransformer = input ->
@@ -490,8 +488,7 @@ public class SQLTemplate extends CacheableQuery {
if (parameters == null) {
this.parameters = null;
} else {
- // clone parameters to ensure that we don't have immutable maps that
- // are not serializable with Hessian...
+ // copy parameters so that later changes to the caller's maps do not affect the query
this.parameters = new Map[parameters.length];
for (int i = 0; i < parameters.length; i++) {
this.parameters[i] = parameters[i] != null ? new HashMap<>(parameters[i]) : new HashMap<>();
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/SelectById.java b/cayenne/src/main/java/org/apache/cayenne/query/SelectById.java
index c09f27be5..608841781 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/SelectById.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/SelectById.java
@@ -26,7 +26,6 @@ import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.ObjEntity;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -70,8 +69,6 @@ import static org.apache.cayenne.exp.ExpressionFactory.*;
@Deprecated(since = "5.0", forRemoval = true)
public class SelectById<T> extends IndirectQuery implements Select<T> {
- private static final long serialVersionUID = -6589464349051607583L;
-
final QueryRoot root;
final IdSpec idSpec;
final boolean fetchingDataRows;
@@ -676,11 +673,11 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
return result;
}
- protected interface QueryRoot extends Serializable {
+ protected interface QueryRoot {
ObjEntity resolve(EntityResolver resolver);
}
- protected interface IdSpec extends Serializable {
+ protected interface IdSpec {
Expression getQualifier(ObjEntity entity);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/reflect/Accessor.java b/cayenne/src/main/java/org/apache/cayenne/reflect/Accessor.java
index ce25a1bb1..491a5e095 100644
--- a/cayenne/src/main/java/org/apache/cayenne/reflect/Accessor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/reflect/Accessor.java
@@ -19,15 +19,13 @@
package org.apache.cayenne.reflect;
-import java.io.Serializable;
-
/**
* An accessor of a property value. Abstracts the actual property implementation. E.g. it
* can be a Field, a pair of get/set methods or a map/Persistent.
*
* @since 3.0
*/
-public interface Accessor extends Serializable {
+public interface Accessor {
/**
* Returns property name.
diff --git a/cayenne/src/main/java/org/apache/cayenne/reflect/BeanAccessor.java b/cayenne/src/main/java/org/apache/cayenne/reflect/BeanAccessor.java
index 105316550..bd1c125d3 100644
--- a/cayenne/src/main/java/org/apache/cayenne/reflect/BeanAccessor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/reflect/BeanAccessor.java
@@ -29,8 +29,6 @@ import java.lang.reflect.Method;
*/
public class BeanAccessor implements Accessor {
- private static final long serialVersionUID = 606253801447018099L;
-
protected String propertyName;
protected Method readMethod;
protected Method writeMethod;
diff --git a/cayenne/src/main/java/org/apache/cayenne/reflect/MapAccessor.java b/cayenne/src/main/java/org/apache/cayenne/reflect/MapAccessor.java
index 2e18789ab..05f66f701 100644
--- a/cayenne/src/main/java/org/apache/cayenne/reflect/MapAccessor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/reflect/MapAccessor.java
@@ -25,8 +25,6 @@ import java.util.Map;
*/
public class MapAccessor implements Accessor {
- private static final long serialVersionUID = 6032801387641617011L;
-
private String propertyName;
public MapAccessor(String propertyName) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java b/cayenne/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java
index 4ea138c93..a2fb6f871 100644
--- a/cayenne/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java
+++ b/cayenne/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java
@@ -231,8 +231,6 @@ public class PropertyUtils {
static final class PathAccessor implements Accessor {
- private static final long serialVersionUID = 2056090443413498626L;
-
private final CayennePathSegment segment;
private final Accessor nextAccessor;
diff --git a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DefaultValueComparisonStrategyFactory.java b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DefaultValueComparisonStrategyFactory.java
index 0aadffc9f..ae5775a1c 100644
--- a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DefaultValueComparisonStrategyFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DefaultValueComparisonStrategyFactory.java
@@ -24,7 +24,6 @@ import org.apache.cayenne.access.types.ValueObjectTypeRegistry;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.ObjAttribute;
-import java.io.Serializable;
import java.util.Objects;
/**
@@ -50,10 +49,8 @@ public class DefaultValueComparisonStrategyFactory implements ValueComparisonStr
}
}
- // Using classes instead of lambdas to allow serialization
-
@SuppressWarnings({"rawtypes"})
- static class ValueObjectTypeComparisonStrategy implements ValueComparisonStrategy<Object>, Serializable {
+ static class ValueObjectTypeComparisonStrategy implements ValueComparisonStrategy<Object> {
private final ValueObjectType valueObjectType;
public ValueObjectTypeComparisonStrategy(ValueObjectType<?, ?> valueObjectType) {
@@ -67,7 +64,7 @@ public class DefaultValueComparisonStrategyFactory implements ValueComparisonStr
}
}
- static class DefaultValueComparisonStrategy implements ValueComparisonStrategy<Object>, Serializable {
+ static class DefaultValueComparisonStrategy implements ValueComparisonStrategy<Object> {
@Override
public boolean equals(Object a, Object b) {
return Objects.equals(a, b);
diff --git a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectBaseProperty.java b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectBaseProperty.java
index 775bba277..63f8d2073 100644
--- a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectBaseProperty.java
+++ b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectBaseProperty.java
@@ -18,8 +18,6 @@
****************************************************************/
package org.apache.cayenne.reflect.generic;
-import java.io.Serializable;
-
import org.apache.cayenne.Persistent;
import org.apache.cayenne.reflect.PropertyDescriptor;
import org.apache.cayenne.reflect.PropertyException;
@@ -30,7 +28,7 @@ import org.apache.cayenne.reflect.PropertyVisitor;
*
* @since 3.0
*/
-abstract class PersistentObjectBaseProperty implements PropertyDescriptor, Serializable {
+abstract class PersistentObjectBaseProperty implements PropertyDescriptor {
public abstract String getName();
diff --git a/cayenne/src/main/java/org/apache/cayenne/resource/Resource.java b/cayenne/src/main/java/org/apache/cayenne/resource/Resource.java
index 880a33089..bc2f65a1e 100644
--- a/cayenne/src/main/java/org/apache/cayenne/resource/Resource.java
+++ b/cayenne/src/main/java/org/apache/cayenne/resource/Resource.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.cayenne.resource;
-import java.io.Serializable;
import java.net.URL;
/**
@@ -26,7 +25,7 @@ import java.net.URL;
*
* @since 3.1
*/
-public interface Resource extends Serializable {
+public interface Resource {
/**
* Returns a resource URL to read (and possibly write) the resource data.
diff --git a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
index 13836c49c..2d1b6efe1 100644
--- a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
+++ b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
@@ -60,9 +60,9 @@ import java.util.Objects;
public class CayenneRuntime {
/**
- * A holder of an Injector bound to the current thread. Used mainly to allow
- * serializable contexts to attach to correct Cayenne stack on
- * deserialization.
+ * A holder of an Injector bound to the current thread. Used to allow
+ * contexts created outside of the Cayenne stack to attach to the correct
+ * runtime lazily.
*
* @since 3.1
*/
@@ -70,7 +70,8 @@ public class CayenneRuntime {
/**
* Binds a DI {@link Injector} bound to the current thread. It is primarily
- * intended for deserialization of ObjectContexts.
+ * intended for ObjectContexts created outside of the Cayenne stack that
+ * need to attach to a runtime lazily.
*
* @since 3.1
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/util/GenericResponse.java b/cayenne/src/main/java/org/apache/cayenne/util/GenericResponse.java
index d1b42c18b..e45ba5646 100644
--- a/cayenne/src/main/java/org/apache/cayenne/util/GenericResponse.java
+++ b/cayenne/src/main/java/org/apache/cayenne/util/GenericResponse.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.util;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -27,15 +26,15 @@ import org.apache.cayenne.QueryResponse;
import org.apache.cayenne.ResultIterator;
/**
- * A simple serializable implementation of QueryResponse.
+ * A simple implementation of QueryResponse.
*
* @since 1.2
*/
-public class GenericResponse implements QueryResponse, Serializable {
+public class GenericResponse implements QueryResponse {
protected List<Object> results;
- protected transient int currentIndex;
+ protected int currentIndex;
/**
* Creates an empty BaseResponse.
@@ -136,7 +135,6 @@ public class GenericResponse implements QueryResponse, Serializable {
@Override
public void reset() {
- // use a zero-based index, not -1, as this will simplify serialization handling
currentIndex = 0;
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/util/ListResponse.java b/cayenne/src/main/java/org/apache/cayenne/util/ListResponse.java
index 13f2f7ad9..cd6e0a23b 100644
--- a/cayenne/src/main/java/org/apache/cayenne/util/ListResponse.java
+++ b/cayenne/src/main/java/org/apache/cayenne/util/ListResponse.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.util;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -31,11 +30,11 @@ import org.apache.cayenne.QueryResponse;
*
* @since 1.2
*/
-public class ListResponse implements QueryResponse, Serializable {
+public class ListResponse implements QueryResponse {
protected List<?> objectList;
- protected transient int currentIndex;
+ protected int currentIndex;
/**
* Creates an empty response.
@@ -81,7 +80,6 @@ public class ListResponse implements QueryResponse, Serializable {
}
public void reset() {
- // use a zero-based index, not -1, as this will simplify serialization handling
currentIndex = 0;
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/util/ReferenceMap.java b/cayenne/src/main/java/org/apache/cayenne/util/ReferenceMap.java
index 15daf5352..d101031f2 100644
--- a/cayenne/src/main/java/org/apache/cayenne/util/ReferenceMap.java
+++ b/cayenne/src/main/java/org/apache/cayenne/util/ReferenceMap.java
@@ -19,10 +19,6 @@
package org.apache.cayenne.util;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
import java.util.AbstractMap;
@@ -58,7 +54,7 @@ import java.util.function.Consumer;
*
* @since 4.1
*/
-abstract class ReferenceMap<K, V, R extends Reference<V>> extends AbstractMap<K, V> implements Serializable {
+abstract class ReferenceMap<K, V, R extends Reference<V>> extends AbstractMap<K, V> {
/*
* Implementation notes:
@@ -69,24 +65,22 @@ abstract class ReferenceMap<K, V, R extends Reference<V>> extends AbstractMap<K,
* - all accessors/modifiers should call checkReferenceQueue() to clear all stale data
*/
- private static final long serialVersionUID = -3365744592038165092L;
-
/**
* This is a main data storage used for most operations
*/
- protected transient HashMap<K, R> map;
+ protected HashMap<K, R> map;
- protected transient ReferenceQueue<V> referenceQueue;
+ protected ReferenceQueue<V> referenceQueue;
/**
* This is a lazily created set of entries that is essentially a view to actual data
*/
- protected transient Set<Entry<K, V>> entrySet;
+ protected Set<Entry<K, V>> entrySet;
/**
* @since 4.2.2
*/
- protected transient Consumer<K> keyCleanupCallback;
+ protected Consumer<K> keyCleanupCallback;
public ReferenceMap() {
map = new HashMap<>();
@@ -285,28 +279,6 @@ abstract class ReferenceMap<K, V, R extends Reference<V>> extends AbstractMap<K,
*/
abstract R newReference(V value);
- private void writeObject(ObjectOutputStream out) throws IOException {
- checkReferenceQueue();
- Map<K, V> replacementMap = new HashMap<>(map.size());
- for(Entry<K, R> entry : map.entrySet()) {
- if(entry.getValue() != null) {
- V value = entry.getValue().get();
- if(value != null) {
- replacementMap.put(entry.getKey(), value);
- }
- }
- }
- out.writeObject(replacementMap);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- @SuppressWarnings("unchecked")
- Map<K, V> replacement = (Map<K, V>) in.readObject();
- map = new HashMap<>(replacement.size());
- referenceQueue = new ReferenceQueue<>();
- putAll(replacement);
- }
-
/**
* View over {@link #map} entry set
*/
@@ -379,8 +351,6 @@ abstract class ReferenceMap<K, V, R extends Reference<V>> extends AbstractMap<K,
*/
class ReferenceEntry extends SimpleEntry<K, V> {
- private static final long serialVersionUID = -1795136249842496011L;
-
Entry<K, R> refEntry;
public ReferenceEntry(Entry<K, R> refEntry, V value) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/util/SingleEntryMap.java b/cayenne/src/main/java/org/apache/cayenne/util/SingleEntryMap.java
index 86d56f934..a0a7a88fd 100644
--- a/cayenne/src/main/java/org/apache/cayenne/util/SingleEntryMap.java
+++ b/cayenne/src/main/java/org/apache/cayenne/util/SingleEntryMap.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.util;
-import java.io.Serializable;
import java.util.Collection;
import java.util.Map;
import java.util.Objects;
@@ -44,9 +43,7 @@ import static java.util.Collections.*;
*
* @since 4.2
*/
-public class SingleEntryMap<K, V> implements Map<K, V>, Map.Entry<K, V>, Serializable {
-
- private static final long serialVersionUID = -3848347748971431847L;
+public class SingleEntryMap<K, V> implements Map<K, V>, Map.Entry<K, V> {
private final K key;
private V value;
diff --git a/cayenne/src/main/java/org/apache/cayenne/util/SoftValueMap.java b/cayenne/src/main/java/org/apache/cayenne/util/SoftValueMap.java
index 6b4810663..a44780e31 100644
--- a/cayenne/src/main/java/org/apache/cayenne/util/SoftValueMap.java
+++ b/cayenne/src/main/java/org/apache/cayenne/util/SoftValueMap.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.util;
-import java.io.Serializable;
import java.lang.ref.SoftReference;
import java.util.Map;
@@ -30,9 +29,7 @@ import java.util.Map;
*
* @since 4.1
*/
-public class SoftValueMap<K, V> extends ReferenceMap<K, V, SoftReference<V>> implements Serializable {
-
- private static final long serialVersionUID = 8146103761927411986L;
+public class SoftValueMap<K, V> extends ReferenceMap<K, V, SoftReference<V>> {
public SoftValueMap() {
super();
diff --git a/cayenne/src/main/java/org/apache/cayenne/util/Util.java b/cayenne/src/main/java/org/apache/cayenne/util/Util.java
index b97aa2717..e706fd968 100644
--- a/cayenne/src/main/java/org/apache/cayenne/util/Util.java
+++ b/cayenne/src/main/java/org/apache/cayenne/util/Util.java
@@ -33,15 +33,10 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
import java.lang.reflect.Member;
import java.lang.reflect.Modifier;
import java.net.URI;
@@ -337,28 +332,6 @@ public class Util {
return (aString.length() == 1) ? Character.toString(c) : c + aString.substring(1);
}
- /**
- * Creates Serializable object copy using serialization/deserialization.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Serializable> T cloneViaSerialization(T object) throws Exception {
- ByteArrayOutputStream bytes = new ByteArrayOutputStream() {
-
- @Override
- public byte[] toByteArray() {
- return buf;
- }
- };
-
- try (ObjectOutputStream out = new ObjectOutputStream(bytes)) {
- out.writeObject(object);
- }
-
- try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()))) {
- return (T) in.readObject();
- }
- }
-
/**
* Creates an XMLReader with default feature set. Note that all Cayenne
* internal XML parsers should probably use XMLReader obtained via this
diff --git a/cayenne/src/main/java/org/apache/cayenne/util/WeakValueMap.java b/cayenne/src/main/java/org/apache/cayenne/util/WeakValueMap.java
index 7c711dbc7..2505a023e 100644
--- a/cayenne/src/main/java/org/apache/cayenne/util/WeakValueMap.java
+++ b/cayenne/src/main/java/org/apache/cayenne/util/WeakValueMap.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.util;
-import java.io.Serializable;
import java.lang.ref.WeakReference;
import java.util.Map;
@@ -30,9 +29,7 @@ import java.util.Map;
*
* @since 4.1
*/
-public class WeakValueMap<K, V> extends ReferenceMap<K, V, WeakReference<V>> implements Serializable {
-
- private static final long serialVersionUID = -6911881597843322446L;
+public class WeakValueMap<K, V> extends ReferenceMap<K, V, WeakReference<V>> {
public WeakValueMap() {
super();
diff --git a/cayenne/src/main/java/org/apache/cayenne/validation/ValidationFailure.java b/cayenne/src/main/java/org/apache/cayenne/validation/ValidationFailure.java
index 1b0cce620..2387d7dad 100644
--- a/cayenne/src/main/java/org/apache/cayenne/validation/ValidationFailure.java
+++ b/cayenne/src/main/java/org/apache/cayenne/validation/ValidationFailure.java
@@ -19,8 +19,6 @@
package org.apache.cayenne.validation;
-import java.io.Serializable;
-
/**
* Defines a single failure during the validation process. Implementing classes may
* store any extra information to help callers to identify the source and reasons
@@ -29,7 +27,7 @@ import java.io.Serializable;
* @see BeanValidationFailure
* @since 1.1
*/
-public interface ValidationFailure extends Serializable {
+public interface ValidationFailure {
/**
* Returns the object that has generated the failure. For example, if a <code>Person</code>
diff --git a/cayenne/src/main/java/org/apache/cayenne/validation/ValidationResult.java b/cayenne/src/main/java/org/apache/cayenne/validation/ValidationResult.java
index b5f723c5d..c57113ee6 100644
--- a/cayenne/src/main/java/org/apache/cayenne/validation/ValidationResult.java
+++ b/cayenne/src/main/java/org/apache/cayenne/validation/ValidationResult.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.validation;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Objects;
import java.util.Collections;
@@ -32,7 +31,7 @@ import java.util.List;
*
* @since 1.1
*/
-public class ValidationResult implements Serializable {
+public class ValidationResult {
private final List<ValidationFailure> failures;
diff --git a/cayenne/src/test/java/org/apache/cayenne/DataContextConcurrencyIT.java b/cayenne/src/test/java/org/apache/cayenne/DataContextConcurrencyIT.java
deleted file mode 100644
index 878c3d1d9..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/DataContextConcurrencyIT.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-
-package org.apache.cayenne;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.unit.CayenneProjects;
-import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.apache.cayenne.util.Util;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class DataContextConcurrencyIT {
-
- @RegisterExtension
- static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
-
- private static final Logger LOGGER = LoggerFactory.getLogger(DataContextConcurrencyIT.class);
-
- /**
- * see https://issues.apache.org/jira/browse/CAY-2382
- *
- * This test is probabilistic as it tries to catch concurrency problem.
- * It can be false-negative (e.g. Travis build not always fails)
- */
- @Test
- public void cmeInContextSerialization() throws Exception {
-
- // add some content to context, so it will be serializing slowly
- for(int i=0; i<1000; i++) {
- Artist artist = env.context().newObject(Artist.class);
- artist.setArtistName("name " + i);
- }
-
- // add some barriers so threads will try to start synchronously
- CountDownLatch startSignal = new CountDownLatch(1);
- CountDownLatch serializationStartSignal = new CountDownLatch(1);
-
- ExecutorService service = Executors.newFixedThreadPool(2);
-
- // this task will modify context
- Future<Boolean> resultObjectCreation = service.submit(() -> {
- try {
- // this thread will start when context serialized at least once,
- // as it should be faster (but who knows...)
- serializationStartSignal.await();
- } catch (InterruptedException e) {
- return false;
- }
- for(int i=0; i<1000; i++) {
- Artist artist = env.context().newObject(Artist.class);
- env.context().deleteObject(artist);
- }
- return true;
- });
-
- // this task will serialize context
- Future<Boolean> resultSerialization = service.submit(() -> {
- try {
- // wait for outer thread start this one
- startSignal.await();
- } catch (InterruptedException e) {
- return false;
- }
- for(int i=0; i<100; i++) {
- try {
- // make one serialization, before starting modifying thread
- Util.cloneViaSerialization(env.context());
- if(i == 0) {
- serializationStartSignal.countDown();
- }
- } catch (Exception e) {
- LOGGER.error("Serialization failed", e);
- return false;
- }
- }
-
- return true;
- });
-
- // make sure that everyone are ready
- Thread.sleep(10);
- startSignal.countDown();
-
- assertTrue(resultObjectCreation.get(20, TimeUnit.SECONDS));
- assertTrue(resultSerialization.get(20, TimeUnit.SECONDS));
- }
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/HybridPersistentObjectIT.java b/cayenne/src/test/java/org/apache/cayenne/HybridPersistentObjectIT.java
index 82aa28b05..03b43d726 100644
--- a/cayenne/src/test/java/org/apache/cayenne/HybridPersistentObjectIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/HybridPersistentObjectIT.java
@@ -26,7 +26,6 @@ import org.apache.cayenne.testdo.hybrid.HybridEntity1;
import org.apache.cayenne.testdo.hybrid.HybridEntity2;
import org.apache.cayenne.unit.CayenneProjects;
import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.apache.cayenne.util.Util;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -147,21 +146,6 @@ public class HybridPersistentObjectIT {
assertEquals(null, selectCleanEntity1.readProperty("CUSTOM_NON_DB_ATTRIBUTE"));
}
- @Test
- public void testSerialization() throws Exception {
-
- HybridEntity1 entity1 = new HybridEntity1();
- entity1.setIntField(123);
- entity1.setStrField("abc");
- entity1.writeProperty("CUSTOM_PROPERTY", 3.14);
-
- HybridEntity1 clonedEntity1 = Util.cloneViaSerialization(entity1);
-
- assertEquals(123, clonedEntity1.getIntField());
- assertEquals("abc", clonedEntity1.getStrField());
- assertEquals(3.14, clonedEntity1.readProperty("CUSTOM_PROPERTY"));
- }
-
@Test
public void testDirectPropertyWrite() throws Exception {
HybridEntity1 entity1 = new HybridEntity1();
diff --git a/cayenne/src/test/java/org/apache/cayenne/ObjectContextChangeLogTest.java b/cayenne/src/test/java/org/apache/cayenne/ObjectContextChangeLogTest.java
index ff74d7ec7..8cfafe3ff 100644
--- a/cayenne/src/test/java/org/apache/cayenne/ObjectContextChangeLogTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/ObjectContextChangeLogTest.java
@@ -22,7 +22,6 @@ package org.apache.cayenne;
import org.apache.cayenne.graph.CompoundDiff;
import org.apache.cayenne.graph.GraphDiff;
import org.apache.cayenne.graph.NodeCreateOperation;
-import org.apache.cayenne.util.Util;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -72,18 +71,4 @@ public class ObjectContextChangeLogTest {
assertEquals(2, diff2.getDiffs().size());
}
- @Test
- public void testGetDiffsSerializable() throws Exception {
- ObjectContextChangeLog recorder = new ObjectContextChangeLog();
- recorder.addOperation(new NodeCreateOperation(ObjectId.of("test")));
- CompoundDiff diff = (CompoundDiff) recorder.getDiffs();
-
- Object clone = Util.cloneViaSerialization(diff);
- assertNotNull(clone);
- assertTrue(clone instanceof CompoundDiff);
-
- CompoundDiff d1 = (CompoundDiff) clone;
- assertEquals(1, d1.getDiffs().size());
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/ObjectIdTest.java b/cayenne/src/test/java/org/apache/cayenne/ObjectIdTest.java
index 8a3b67dd9..ba48aadcf 100644
--- a/cayenne/src/test/java/org/apache/cayenne/ObjectIdTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/ObjectIdTest.java
@@ -19,7 +19,6 @@
package org.apache.cayenne;
-import org.apache.cayenne.util.Util;
import org.junit.jupiter.api.Test;
import java.math.BigDecimal;
@@ -45,34 +44,6 @@ public class ObjectIdTest {
assertSame(key, temp2.getKey());
}
- @Test
- public void serializabilityTemp() throws Exception {
- ObjectId temp1 = ObjectId.of("e");
- ObjectId temp2 = Util.cloneViaSerialization(temp1);
-
- assertTrue(temp1.isTemporary());
- assertNotSame(temp1, temp2);
- assertEquals(temp1, temp2);
- }
-
- @Test
- public void serializabilityPerm() throws Exception {
- ObjectId perm1 = ObjectId.of("e", "a", "b");
-
- // make sure hashcode is resolved
- int h = perm1.hashCode();
- assertEquals(h, perm1.hashCode());
- assertTrue(perm1.hashCode() != 0);
-
- ObjectId perm2 = Util.cloneViaSerialization(perm1);
-
- assertEquals(h, perm1.hashCode());
-
- assertFalse(perm2.isTemporary());
- assertNotSame(perm1, perm2);
- assertEquals(perm1, perm2);
- }
-
@Test
public void equalsTmoKey() {
ObjectId oid1 = ObjectId.of("TE");
diff --git a/cayenne/src/test/java/org/apache/cayenne/PersistentObjectSerializationIT.java b/cayenne/src/test/java/org/apache/cayenne/PersistentObjectSerializationIT.java
deleted file mode 100644
index 8f496b4c4..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/PersistentObjectSerializationIT.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-
-package org.apache.cayenne;
-
-import org.apache.cayenne.access.ToManyList;
-import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.unit.CayenneProjects;
-import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.apache.cayenne.util.Util;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class PersistentObjectSerializationIT {
-
- @RegisterExtension
- static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
-
- @Test
- public void testSerializeTransient() throws Exception {
- Artist artist = new Artist();
- artist.setArtistName("artist1");
- assertEquals(PersistenceState.TRANSIENT, artist.getPersistenceState());
- assertNull(artist.getObjectId());
-
- Artist deserialized = Util.cloneViaSerialization(artist);
- assertEquals(PersistenceState.TRANSIENT, deserialized.getPersistenceState());
- assertNull(deserialized.getObjectId());
- assertEquals("artist1", deserialized.getArtistName());
- }
-
- @Test
- public void testSerializeNew() throws Exception {
- Artist artist = env.context().newObject(Artist.class);
- artist.setArtistName("artist1");
- // resolve relationship fault
- artist.getPaintingArray();
-
- Artist deserialized = Util.cloneViaSerialization(artist);
-
- // everything must be deserialized, but DataContext link should stay null
- assertEquals(PersistenceState.NEW, deserialized.getPersistenceState());
- assertTrue(deserialized.getObjectId().isTemporary());
- assertEquals("artist1", deserialized.getArtistName());
-
- assertNull(deserialized.getObjectContext(),
- "CDO serialized by itself shouldn't have a DataContext: "
- + deserialized.getObjectContext());
-
- // test that to-many relationships are initialized
- List<?> paintings = deserialized.getPaintingArray();
- assertNotNull(paintings);
- assertEquals(0, paintings.size());
- }
-
- @Test
- public void testSerializeNewWithFaults() throws Exception {
- Artist artist = env.context().newObject(Artist.class);
- artist.setArtistName("artist1");
-
- Artist deserialized = Util.cloneViaSerialization(artist);
-
- // everything must be deserialized, but DataContext link should stay null
- assertEquals(PersistenceState.NEW, deserialized.getPersistenceState());
- assertTrue(deserialized.getObjectId().isTemporary());
- assertEquals("artist1", deserialized.getArtistName());
-
- assertNull(deserialized.getObjectContext(),
- "CDO serialized by itself shouldn't have a DataContext: "
- + deserialized.getObjectContext());
-
- // test that to-many relationships are initialized
- assertTrue(deserialized.readPropertyDirectly("paintingArray") instanceof ToManyList);
- ToManyList list = (ToManyList) artist.readPropertyDirectly("paintingArray");
- assertFalse(list.isFault());
- }
-
- @Test
- public void testSerializeCommitted() throws Exception {
-
- Artist artist = env.context().newObject(Artist.class);
- artist.setArtistName("artist1");
- env.context().commitChanges();
-
- assertEquals(PersistenceState.COMMITTED, artist.getPersistenceState());
-
- ObjectId id = artist.getObjectId();
- assertNotNull(id);
-
- Artist deserialized = Util.cloneViaSerialization(artist);
-
- // everything must be deserialized, but DataContext link should stay null,
- // and properties shouldn't be populated
- // deserizalized committed object is HOLLOW
- assertEquals(PersistenceState.HOLLOW, deserialized.getPersistenceState(),
- "Unexpected persistence state: "
- + PersistenceState.persistenceStateName(deserialized.getPersistenceState()));
-
- assertEquals(id, deserialized.getObjectId());
-
- // properties of committed objects are not set...when DataContext is
- // attached to an object, object can populate itself from snapshot
- assertNull(deserialized.getObjectContext());
- assertEquals(null, deserialized.getArtistName());
- }
-
- @Test
- public void testSerializeModifiedMapBasedObject() throws Exception {
- ObjectId objectId = ObjectId.of("test", "id", 42);
-
- GenericPersistentObject persistentObject = new GenericPersistentObject();
- persistentObject.setObjectContext(env.context());
- persistentObject.setObjectId(objectId);
- persistentObject.writePropertyDirectly("test", 123);
- persistentObject.setPersistenceState(PersistenceState.MODIFIED);
-
- GenericPersistentObject cloned = Util.cloneViaSerialization(persistentObject);
- assertEquals(PersistenceState.MODIFIED, cloned.getPersistenceState());
- assertEquals(123, cloned.readProperty("test"));
- assertNull(cloned.getObjectContext());
- assertEquals(persistentObject.getObjectId(), cloned.getObjectId());
- }
-
- @Test
- public void testSerializeCommittedMapBasedObject() throws Exception {
- ObjectId objectId = ObjectId.of("test", "id", 42);
-
- GenericPersistentObject persistentObject = new GenericPersistentObject();
- persistentObject.setObjectContext(env.context());
- persistentObject.setObjectId(objectId);
- persistentObject.writePropertyDirectly("test", 123);
- persistentObject.setPersistenceState(PersistenceState.COMMITTED);
-
- GenericPersistentObject cloned = Util.cloneViaSerialization(persistentObject);
- assertEquals(PersistenceState.HOLLOW, cloned.getPersistenceState());
- assertNull(cloned.readProperty("test"));
- assertNull(cloned.getObjectContext());
- assertEquals(persistentObject.getObjectId(), cloned.getObjectId());
- }
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
deleted file mode 100644
index 435537e27..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-
-package org.apache.cayenne.access;
-
-import org.apache.cayenne.Cayenne;
-import org.apache.cayenne.ObjectContext;
-import org.apache.cayenne.PersistenceState;
-import org.apache.cayenne.Persistent;
-import org.apache.cayenne.runtime.CayenneRuntime;
-import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.unit.CayenneProjects;
-import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.apache.cayenne.util.Util;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class DataContextSerializationIT {
-
- @RegisterExtension
- static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
-
- protected DataContext context;
- protected CayenneRuntime runtime;
-
- protected TableHelper tArtist;
-
-
- @BeforeEach
- public void setUp() throws Exception {
- context = env.context();
- runtime = env.runtime();
- CayenneRuntime.bindThreadInjector(runtime.getInjector());
-
- tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME");
- }
-
- protected void createSingleArtistDataSet() throws Exception {
- tArtist.insert(33001, "aaa");
- }
-
-
- @AfterEach
- public void tearDown() throws Exception {
- CayenneRuntime.bindThreadInjector(null);
- }
-
- @Test
- public void serializeResolver() throws Exception {
-
- DataContext deserializedContext = Util.cloneViaSerialization(context);
-
- assertNotNull(deserializedContext.getEntityResolver());
- assertSame(context.getEntityResolver(), deserializedContext.getEntityResolver());
- }
-
- @Test
- public void serializeParent() throws Exception {
-
- DataContext deserializedContext = Util.cloneViaSerialization(context);
-
- assertNotNull(deserializedContext.getChannel());
- assertSame(context.getChannel(), deserializedContext.getChannel());
- }
-
- @Test
- public void serializeNestedParent() throws Exception {
-
- ObjectContext child = runtime.newContext(context);
-
- ObjectContext deserializedContext = Util.cloneViaSerialization(child);
-
- assertNotNull(deserializedContext.getChannel());
- assertNotNull(deserializedContext.getEntityResolver());
- }
-
- @Test
- public void serializeWithSharedCache() throws Exception {
-
- createSingleArtistDataSet();
-
- DataContext deserializedContext = Util.cloneViaSerialization(context);
-
- assertNotSame(context, deserializedContext);
- assertNotSame(context.getObjectStore(), deserializedContext.getObjectStore());
- assertSame(
- context.getParentDataDomain(),
- deserializedContext.getParentDataDomain());
- assertSame(context.getObjectStore().getDataRowCache(), deserializedContext
- .getObjectStore()
- .getDataRowCache());
- assertSame(
- deserializedContext.getParentDataDomain().getSharedSnapshotCache(),
- deserializedContext.getObjectStore().getDataRowCache());
-
- assertNotNull(deserializedContext.getEntityResolver());
- assertSame(context.getEntityResolver(), deserializedContext.getEntityResolver());
-
- Artist a = Cayenne.objectForPK(deserializedContext, Artist.class, 33001);
- assertNotNull(a);
- a.setArtistName(a.getArtistName() + "___");
- deserializedContext.commitChanges();
- }
-
- @Test
- public void serializeWithLocalCache() throws Exception {
-
- createSingleArtistDataSet();
-
- // manually assemble a DataContext with local cache....
- DataDomain domain = context.getParentDataDomain();
- DataRowStore snapshotCache = new DataRowStore(
- domain.getName(),
- DefaultDataRowStoreFactory.SNAPSHOT_CACHE_SIZE_DEFAULT,
- domain.getEventManager());
-
- Map<Object, Persistent> map = new HashMap<>();
-
- DataContext localCacheContext = new DataContext(domain, new ObjectStore(
- snapshotCache,
- map));
- localCacheContext.setValidatingObjectsOnCommit(domain
- .isValidatingObjectsOnCommit());
- localCacheContext.setUsingSharedSnapshotCache(false);
-
- assertNotSame(domain.getSharedSnapshotCache(), localCacheContext
- .getObjectStore()
- .getDataRowCache());
-
- DataContext deserializedContext = Util.cloneViaSerialization(localCacheContext);
-
- assertNotSame(localCacheContext, deserializedContext);
- assertNotSame(
- localCacheContext.getObjectStore(),
- deserializedContext.getObjectStore());
-
- assertSame(
- localCacheContext.getParentDataDomain(),
- deserializedContext.getParentDataDomain());
- assertNotSame(
- localCacheContext.getObjectStore().getDataRowCache(),
- deserializedContext.getObjectStore().getDataRowCache());
- assertNotSame(
- deserializedContext.getParentDataDomain().getSharedSnapshotCache(),
- deserializedContext.getObjectStore().getDataRowCache());
-
- Artist a = Cayenne.objectForPK(deserializedContext, Artist.class, 33001);
- assertNotNull(a);
- a.setArtistName(a.getArtistName() + "___");
-
- // this blows per CAY-796
- deserializedContext.commitChanges();
- }
-
- @Test
- public void serializeNew() throws Exception {
-
- Artist artist = (Artist) context.newObject("Artist");
- artist.setArtistName("artist1");
- assertNotNull(artist.getObjectId());
-
- DataContext deserializedContext = Util.cloneViaSerialization(context);
- assertSame(
- context.getParentDataDomain(),
- deserializedContext.getParentDataDomain());
-
- // there should be only one object registered
- Artist deserializedArtist = (Artist) deserializedContext
- .getObjectStore()
- .getObjectIterator()
- .next();
-
- assertNotNull(deserializedArtist);
- assertEquals(PersistenceState.NEW, deserializedArtist.getPersistenceState());
- assertTrue(deserializedArtist.getObjectId().isTemporary());
- assertEquals("artist1", deserializedArtist.getArtistName());
- assertSame(deserializedContext, deserializedArtist.getObjectContext());
- }
-
- @Test
- public void serializeCommitted() throws Exception {
-
- Artist artist = (Artist) context.newObject("Artist");
- artist.setArtistName("artist1");
- assertNotNull(artist.getObjectId());
- context.commitChanges();
-
- DataContext deserializedContext = Util.cloneViaSerialization(context);
-
- assertSame(
- context.getParentDataDomain(),
- deserializedContext.getParentDataDomain());
-
- // there should be only one object registered
- Artist deserializedArtist = (Artist) deserializedContext
- .getObjectStore()
- .getObjectIterator()
- .next();
-
- assertNotNull(deserializedArtist);
-
- // deserialized as hollow...
- assertEquals(PersistenceState.HOLLOW, deserializedArtist.getPersistenceState());
- assertFalse(deserializedArtist.getObjectId().isTemporary());
- assertEquals("artist1", deserializedArtist.getArtistName());
- assertSame(deserializedContext, deserializedArtist.getObjectContext());
-
- // test that to-many relationships are initialized
- List<?> paintings = deserializedArtist.getPaintingArray();
- assertNotNull(paintings);
- assertEquals(0, paintings.size());
- }
-
- @Test
- public void serializeModified() throws Exception {
-
- Artist artist = (Artist) context.newObject("Artist");
- artist.setArtistName("artist1");
- assertNotNull(artist.getObjectId());
- context.commitChanges();
- artist.setArtistName("artist2");
-
- DataContext deserializedContext = Util.cloneViaSerialization(context);
-
- assertSame(
- context.getParentDataDomain(),
- deserializedContext.getParentDataDomain());
-
- // there should be only one object registered
- Artist deserializedArtist = (Artist) deserializedContext
- .getObjectStore()
- .getObjectIterator()
- .next();
-
- assertNotNull(deserializedArtist);
-
- // deserialized as hollow...
- assertEquals(PersistenceState.MODIFIED, deserializedArtist.getPersistenceState());
- assertFalse(deserializedArtist.getObjectId().isTemporary());
- assertEquals("artist2", deserializedArtist.getArtistName());
- assertSame(deserializedContext, deserializedArtist.getObjectContext());
- }
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
index 530f46954..9cba94c23 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
@@ -30,28 +30,22 @@ import org.apache.cayenne.unit.CayenneTestsEnv;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import java.io.Serializable;
import java.util.List;
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class DataDomainQueryActionIT {
static QueryCache testQQ = new MockQueryCache() {
@Override
public List<?> get(QueryMetadata metadata, QueryCacheEntryFactory factory) {
- Object results = factory.createObject();
- assertInstanceOf(Serializable.class, results, "Query cache is not serializable.");
-
+ factory.createObject();
return null;
}
@SuppressWarnings("all")
@Override
public void put(QueryMetadata metadata, List results) {
- assertTrue(results instanceof Serializable, "Query cache is not serializable.");
+ // no-op
}
};
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/EmbeddingSerializeIT.java b/cayenne/src/test/java/org/apache/cayenne/access/EmbeddingSerializeIT.java
deleted file mode 100644
index 9babc15fa..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/access/EmbeddingSerializeIT.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-
-package org.apache.cayenne.access;
-
-import java.util.List;
-import org.apache.cayenne.PersistenceState;
-import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.testdo.embeddable.EmbedEntity1;
-import org.apache.cayenne.testdo.embeddable.Embeddable1;
-import org.apache.cayenne.unit.CayenneProjects;
-import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.apache.cayenne.util.Util;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-public class EmbeddingSerializeIT {
-
- @RegisterExtension
- static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.EMBEDDABLE_PROJECT);
-
- protected TableHelper tEmbedEntity1;
-
-
- @BeforeEach
- public void setUp() throws Exception {
- tEmbedEntity1 = env.table("EMBED_ENTITY1", "ID", "NAME", "EMBEDDED10", "EMBEDDED20", "EMBEDDED30", "EMBEDDED40");
- }
-
- protected void createSelectDataSet() throws Exception {
- tEmbedEntity1.delete().execute();
- tEmbedEntity1.insert(1, "n1", "e1", "e2", "e3", "e4");
- }
-
- @Test
- public void serializationEntityWithEmbeddableCommited() throws Exception {
- createSelectDataSet();
-
- ObjectSelect<EmbedEntity1> query = ObjectSelect.query(EmbedEntity1.class);
- List<EmbedEntity1> results = query.select(env.context());
- assertEquals(1, results.size());
-
- EmbedEntity1 o1 = results.get(0);
- assertNotNull(o1);
-
- EmbedEntity1 o2 = Util.cloneViaSerialization(o1);
- assertNotNull(o2);
-
- assertEquals(o1.getPersistenceState(), PersistenceState.COMMITTED);
- assertEquals(o2.getPersistenceState(), PersistenceState.HOLLOW);
-
- assertEquals("e1", o1.getEmbedded1().getEmbedded10());
- assertEquals("e3", o1.getEmbedded2().getEmbedded10());
-
- assertNull(o2.getEmbedded1());
- assertNull(o2.getEmbedded2());
- }
-
- @Test
- public void serializationEntityWithEmbeddableModified() throws Exception {
- createSelectDataSet();
-
- ObjectSelect<EmbedEntity1> query = ObjectSelect.query(EmbedEntity1.class);
- List<EmbedEntity1> results = query.select(env.context());
- assertEquals(1, results.size());
-
- EmbedEntity1 o1 = results.get(0);
- assertNotNull(o1);
- o1.setPersistenceState(PersistenceState.MODIFIED);
-
- EmbedEntity1 o2 = Util.cloneViaSerialization(o1);
- assertNotNull(o2);
-
- assertEquals(o1.getPersistenceState(), PersistenceState.MODIFIED);
- assertEquals(o2.getPersistenceState(), PersistenceState.MODIFIED);
-
- assertEquals("e1", o1.getEmbedded1().getEmbedded10());
- assertEquals("e1", o2.getEmbedded1().getEmbedded10());
-
- assertEquals("e3", o1.getEmbedded2().getEmbedded10());
- assertEquals("e3", o2.getEmbedded2().getEmbedded10());
- }
-
- @Test
- public void serializationEmbeddable() throws Exception {
- createSelectDataSet();
-
- ObjectSelect<EmbedEntity1> query = ObjectSelect.query(EmbedEntity1.class);
- List<EmbedEntity1> results = query.select(env.context());
- assertEquals(1, results.size());
-
- EmbedEntity1 o1 = results.get(0);
- assertNotNull(o1);
-
- Embeddable1 e1 = o1.getEmbedded1();
-
- Embeddable1 e2 = Util.cloneViaSerialization(e1);
-
- assertEquals(e1.getEmbedded10(), e2.getEmbedded10());
- }
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java b/cayenne/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java
deleted file mode 100644
index 30a41dba3..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.access;
-
-import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.unit.CayenneProjects;
-import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.apache.cayenne.util.Util;
-import org.junit.jupiter.api.Test;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-public class IncrementalFaultListIT {
-
- @RegisterExtension
- static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
-
- @Test
- public void serialization() throws Exception {
- ObjectSelect<Artist> query = ObjectSelect.query(Artist.class)
- .pageSize(10);
-
- IncrementalFaultList<Artist> i1 = new IncrementalFaultList<Artist>(env.context(), query, 10, List.of());
- IncrementalFaultList<Artist> i2 = Util.cloneViaSerialization(i1);
-
- assertNotNull(i2);
- assertEquals(i1.getMaxFetchSize(), i2.getMaxFetchSize());
- assertEquals(i1.getClass(), i2.getClass());
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/cache/MapQueryCacheTest.java b/cayenne/src/test/java/org/apache/cayenne/cache/MapQueryCacheTest.java
deleted file mode 100644
index b7d62c1ca..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/cache/MapQueryCacheTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.cache;
-
-import org.apache.cayenne.query.MockQueryMetadata;
-import org.apache.cayenne.util.Util;
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-public class MapQueryCacheTest {
-
- @Test
- public void serializability() throws Exception {
-
- MapQueryCache cache = new MapQueryCache(5);
- cache.put(new MockQueryMetadata() {
-
- @Override
- public String getCacheKey() {
- return "key";
- }
- }, new ArrayList<Object>());
-
- assertEquals(1, cache.size());
-
- MapQueryCache deserialized = (MapQueryCache) Util.cloneViaSerialization(cache);
- assertNotNull(deserialized);
- assertEquals(1, deserialized.size());
- }
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditLog.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditLog.java
index 477da260f..c2ccc76f5 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditLog.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditLog.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.commitlog.db.auto._AuditLog;
public class AuditLog extends _AuditLog {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable1.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable1.java
index 62637bda5..a8e282ee1 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable1.java
@@ -24,6 +24,4 @@ import org.apache.cayenne.commitlog.db.auto._Auditable1;
@CommitLog
public class Auditable1 extends _Auditable1 {
- private static final long serialVersionUID = 8458581370578140962L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable2.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable2.java
index 072e822af..a87662be1 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable2.java
@@ -24,6 +24,4 @@ import org.apache.cayenne.commitlog.db.auto._Auditable2;
@CommitLog(ignoredProperties = "charProperty1", confidential = "charProperty2")
public class Auditable2 extends _Auditable2 {
- private static final long serialVersionUID = 5203324250911707978L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable3.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable3.java
index eb2c691eb..df1eb3582 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable3.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable3.java
@@ -24,6 +24,4 @@ import org.apache.cayenne.commitlog.db.auto._Auditable3;
@CommitLog(ignoreAttributes = true, ignoreToManyRelationships = true)
public class Auditable3 extends _Auditable3 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable4.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable4.java
index 85abeaa72..964a69ce4 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable4.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable4.java
@@ -24,6 +24,4 @@ import org.apache.cayenne.commitlog.db.auto._Auditable4;
@CommitLog(ignoreToOneRelationships = true)
public class Auditable4 extends _Auditable4 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable5.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable5.java
index cd6967535..92c24203f 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable5.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/Auditable5.java
@@ -25,6 +25,4 @@ import org.apache.cayenne.commitlog.db.auto._Auditable5;
@CommitLog
public class Auditable5 extends _Auditable5 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1.java
index dcc2e4894..c8ca41f15 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.commitlog.db.auto._AuditableChild1;
public class AuditableChild1 extends _AuditableChild1 {
- private static final long serialVersionUID = 7967782239405764614L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1x.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1x.java
index baeae14ec..2f83d5beb 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1x.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1x.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.commitlog.db.auto._AuditableChild1x;
public class AuditableChild1x extends _AuditableChild1x {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild3.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild3.java
index 971f302b0..536260249 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild3.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild3.java
@@ -21,5 +21,4 @@ package org.apache.cayenne.commitlog.db;
import org.apache.cayenne.commitlog.db.auto._AuditableChild3;
public class AuditableChild3 extends _AuditableChild3 {
- private static final long serialVersionUID = 1L;
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild5.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild5.java
index b8995d259..40567fdad 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild5.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild5.java
@@ -25,6 +25,4 @@ import org.apache.cayenne.commitlog.db.auto._AuditableChild5;
@CommitLog
public class AuditableChild5 extends _AuditableChild5 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E1.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E1.java
index 56b53fa9e..25d80f4e3 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E1.java
@@ -21,5 +21,4 @@ package org.apache.cayenne.commitlog.db;
import org.apache.cayenne.commitlog.db.auto._E1;
public class E1 extends _E1 {
- private static final long serialVersionUID = 1L;
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E2.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E2.java
index 8da1dc26d..165f8cde8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E2.java
@@ -21,5 +21,4 @@ package org.apache.cayenne.commitlog.db;
import org.apache.cayenne.commitlog.db.auto._E2;
public class E2 extends _E2 {
- private static final long serialVersionUID = 1L;
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E3.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E3.java
index 4f37e825f..785c3cbb9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E3.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E3.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.commitlog.db.auto._E3;
public class E3 extends _E3 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E4.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E4.java
index 61e5a8f81..a900de202 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E4.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/E4.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.commitlog.db.auto._E4;
public class E4 extends _E4 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditLog.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditLog.java
index 9893d7157..297625d3d 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditLog.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditLog.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.commitlog.db.AuditLog;
import org.apache.cayenne.exp.property.PropertyFactory;
@@ -18,8 +14,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _AuditLog extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<AuditLog> SELF = PropertyFactory.createSelf(AuditLog.class);
public static final String ID_PK_COLUMN = "ID";
@@ -68,24 +62,4 @@ public abstract class _AuditLog extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.log);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.log = (String)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable1.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable1.java
index 714cdb14e..2c0bc6df7 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable1.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -21,8 +18,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _Auditable1 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Auditable1> SELF = PropertyFactory.createSelf(Auditable1.class);
public static final String ID_PK_COLUMN = "ID";
@@ -91,26 +86,4 @@ public abstract class _Auditable1 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.charProperty1);
- out.writeObject(this.children1);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.charProperty1 = (String)in.readObject();
- this.children1 = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable2.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable2.java
index 9e5a20ed5..9305f1574 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable2.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -21,8 +18,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _Auditable2 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Auditable2> SELF = PropertyFactory.createSelf(Auditable2.class);
public static final String ID_PK_COLUMN = "ID";
@@ -108,28 +103,4 @@ public abstract class _Auditable2 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.charProperty1);
- out.writeObject(this.charProperty2);
- out.writeObject(this.children);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.charProperty1 = (String)in.readObject();
- this.charProperty2 = (String)in.readObject();
- this.children = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable3.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable3.java
index edbede352..9356de3e8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable3.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable3.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -21,8 +18,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _Auditable3 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Auditable3> SELF = PropertyFactory.createSelf(Auditable3.class);
public static final String ID_PK_COLUMN = "ID";
@@ -108,28 +103,4 @@ public abstract class _Auditable3 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.charProperty1);
- out.writeObject(this.charProperty2);
- out.writeObject(this.auditable4s);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.charProperty1 = (String)in.readObject();
- this.charProperty2 = (String)in.readObject();
- this.auditable4s = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable4.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable4.java
index 83cf03db1..17f02b3ad 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable4.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable4.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.commitlog.db.Auditable3;
import org.apache.cayenne.commitlog.db.Auditable4;
@@ -20,8 +16,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _Auditable4 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Auditable4> SELF = PropertyFactory.createSelf(Auditable4.class);
public static final String ID_PK_COLUMN = "ID";
@@ -102,28 +96,4 @@ public abstract class _Auditable4 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.charProperty1);
- out.writeObject(this.charProperty2);
- out.writeObject(this.auditable3);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.charProperty1 = (String)in.readObject();
- this.charProperty2 = (String)in.readObject();
- this.auditable3 = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable5.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable5.java
index 242db2a21..072df10da 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable5.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_Auditable5.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -21,8 +18,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _Auditable5 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Auditable5> SELF = PropertyFactory.createSelf(Auditable5.class);
public static final String ID_PK_COLUMN = "ID";
@@ -91,26 +86,4 @@ public abstract class _Auditable5 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.charProperty1);
- out.writeObject(this.children);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.charProperty1 = (String)in.readObject();
- this.children = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild1.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild1.java
index 390cc8219..e66c76513 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild1.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.commitlog.db.Auditable1;
import org.apache.cayenne.commitlog.db.AuditableChild1;
@@ -20,8 +16,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _AuditableChild1 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<AuditableChild1> SELF = PropertyFactory.createSelf(AuditableChild1.class);
public static final String ID_PK_COLUMN = "ID";
@@ -85,26 +79,4 @@ public abstract class _AuditableChild1 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.charProperty1);
- out.writeObject(this.parent);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.charProperty1 = (String)in.readObject();
- this.parent = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild1x.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild1x.java
index b22b5dbc4..e126a4c59 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild1x.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild1x.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.commitlog.db.Auditable1;
import org.apache.cayenne.commitlog.db.AuditableChild1x;
@@ -20,8 +16,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _AuditableChild1x extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<AuditableChild1x> SELF = PropertyFactory.createSelf(AuditableChild1x.class);
public static final String ID_PK_COLUMN = "ID";
@@ -85,26 +79,4 @@ public abstract class _AuditableChild1x extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.charProperty1);
- out.writeObject(this.parent);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.charProperty1 = (String)in.readObject();
- this.parent = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild3.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild3.java
index b3c41b04a..a97a5f553 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild3.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild3.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.commitlog.db.Auditable2;
import org.apache.cayenne.commitlog.db.AuditableChild3;
@@ -20,8 +16,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _AuditableChild3 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<AuditableChild3> SELF = PropertyFactory.createSelf(AuditableChild3.class);
public static final String ID_PK_COLUMN = "ID";
@@ -102,28 +96,4 @@ public abstract class _AuditableChild3 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.charProperty1);
- out.writeObject(this.charProperty2);
- out.writeObject(this.parent);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.charProperty1 = (String)in.readObject();
- this.charProperty2 = (String)in.readObject();
- this.parent = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild5.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild5.java
index 26e66b211..190871dc0 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild5.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_AuditableChild5.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.commitlog.db.Auditable5;
import org.apache.cayenne.commitlog.db.AuditableChild5;
@@ -20,8 +16,6 @@ import org.apache.cayenne.exp.property.StringProperty;
*/
public abstract class _AuditableChild5 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<AuditableChild5> SELF = PropertyFactory.createSelf(AuditableChild5.class);
public static final String ID_PK_COLUMN = "ID";
@@ -85,26 +79,4 @@ public abstract class _AuditableChild5 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.charProperty1);
- out.writeObject(this.parent);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.charProperty1 = (String)in.readObject();
- this.parent = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E1.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E1.java
index 216bf3aad..a78c0917d 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E1.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.commitlog.db.E1;
import org.apache.cayenne.exp.property.PropertyFactory;
@@ -17,8 +13,6 @@ import org.apache.cayenne.exp.property.SelfProperty;
*/
public abstract class _E1 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<E1> SELF = PropertyFactory.createSelf(E1.class);
public static final String ID_PK_COLUMN = "ID";
@@ -50,22 +44,4 @@ public abstract class _E1 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E2.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E2.java
index c8a9ee396..42c58afaf 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E2.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.commitlog.db.E2;
import org.apache.cayenne.exp.property.PropertyFactory;
@@ -17,8 +13,6 @@ import org.apache.cayenne.exp.property.SelfProperty;
*/
public abstract class _E2 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<E2> SELF = PropertyFactory.createSelf(E2.class);
public static final String ID_PK_COLUMN = "ID";
@@ -50,22 +44,4 @@ public abstract class _E2 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E3.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E3.java
index 3c25124f2..dee9d4cde 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E3.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E3.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -20,8 +17,6 @@ import org.apache.cayenne.exp.property.SelfProperty;
*/
public abstract class _E3 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<E3> SELF = PropertyFactory.createSelf(E3.class);
public static final String ID_PK_COLUMN = "ID";
@@ -73,24 +68,4 @@ public abstract class _E3 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.e4s);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.e4s = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E4.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E4.java
index 67c669387..8d240c745 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E4.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_E4.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -20,8 +17,6 @@ import org.apache.cayenne.exp.property.SelfProperty;
*/
public abstract class _E4 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<E4> SELF = PropertyFactory.createSelf(E4.class);
public static final String ID_PK_COLUMN = "ID";
@@ -73,24 +68,4 @@ public abstract class _E4 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.e3s);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.e3s = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_LifecycleMap.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_LifecycleMap.java
index 13bed5f5c..0df8e9439 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_LifecycleMap.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/db/auto/_LifecycleMap.java
@@ -1,7 +1,5 @@
package org.apache.cayenne.commitlog.db.auto;
-
-
/**
* This class was generated by Cayenne.
* It is probably a good idea to avoid changing this class manually,
diff --git a/cayenne/src/test/java/org/apache/cayenne/event/EventSubjectTest.java b/cayenne/src/test/java/org/apache/cayenne/event/EventSubjectTest.java
index 0dc464bba..25f64baa5 100644
--- a/cayenne/src/test/java/org/apache/cayenne/event/EventSubjectTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/event/EventSubjectTest.java
@@ -19,12 +19,10 @@
package org.apache.cayenne.event;
-import org.apache.cayenne.util.Util;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -37,16 +35,6 @@ public class EventSubjectTest {
assertThrows(IllegalArgumentException.class, () -> EventSubject.getSubject(Object.class, ""));
}
- @Test
- public void equalityOfClonedSubjects() throws Exception {
- EventSubject s1 = EventSubject.getSubject(EventSubjectTest.class, "MySubject");
- EventSubject s2 = (EventSubject) Util.cloneViaSerialization(s1);
-
- assertNotSame(s1, s2);
- assertEquals(s1, s2);
- assertEquals(s1.hashCode(), s2.hashCode());
- }
-
@Test
public void identicalSubject() {
EventSubject s1 = EventSubject.getSubject(EventSubjectTest.class, "MySubject");
diff --git a/cayenne/src/test/java/org/apache/cayenne/map/DataMapTest.java b/cayenne/src/test/java/org/apache/cayenne/map/DataMapTest.java
index 861f6857e..c970b6fb5 100644
--- a/cayenne/src/test/java/org/apache/cayenne/map/DataMapTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/map/DataMapTest.java
@@ -22,7 +22,6 @@ package org.apache.cayenne.map;
import org.apache.cayenne.configuration.EmptyConfigurationNodeVisitor;
import org.apache.cayenne.configuration.xml.XMLDataMapLoader;
import org.apache.cayenne.resource.URLResource;
-import org.apache.cayenne.util.Util;
import org.apache.cayenne.util.XMLEncoder;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -33,7 +32,6 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URL;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.*;
@@ -44,19 +42,6 @@ import static org.mockito.Mockito.*;
*/
public class DataMapTest {
- @Test
- public void serializability() throws Exception {
- DataMap m1 = new DataMap("abc");
- DataMap d1 = (DataMap) Util.cloneViaSerialization(m1);
- assertEquals(m1.getName(), d1.getName());
-
- ObjEntity oe1 = new ObjEntity("oe1");
- m1.addObjEntity(oe1);
-
- DataMap d2 = (DataMap) Util.cloneViaSerialization(m1);
- assertNotNull(d2.getObjEntity(oe1.getName()));
- }
-
@Test
public void defaultSchema() {
DataMap map = new DataMap();
diff --git a/cayenne/src/test/java/org/apache/cayenne/map/DbEntityIT.java b/cayenne/src/test/java/org/apache/cayenne/map/DbEntityIT.java
index 922e02e51..f5c48054a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/map/DbEntityIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/map/DbEntityIT.java
@@ -25,7 +25,6 @@ import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.unit.CayenneProjects;
import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.apache.cayenne.util.Util;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -36,35 +35,6 @@ public class DbEntityIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
- @Test
- public void serializability() throws Exception {
- DbEntity entity = new DbEntity("entity");
-
- DbAttribute pk = new DbAttribute("pk");
- pk.setPrimaryKey(true);
- entity.addAttribute(pk);
-
- DbAttribute generated = new DbAttribute("generated");
- generated.setGenerated(true);
- entity.addAttribute(generated);
-
- DbEntity d2 = Util.cloneViaSerialization(entity);
-
- assertNotNull(d2.getPrimaryKeys());
- assertEquals(entity.getPrimaryKeys().size(), d2.getPrimaryKeys().size());
-
- DbAttribute pk2 = d2.getAttribute(pk.getName());
- assertNotNull(pk2);
- assertTrue(d2.getPrimaryKeys().contains(pk2));
-
- assertNotNull(d2.getGeneratedAttributes());
- assertEquals(entity.getGeneratedAttributes().size(), d2.getGeneratedAttributes().size());
-
- DbAttribute generated2 = d2.getAttribute(generated.getName());
- assertNotNull(generated2);
- assertTrue(d2.getGeneratedAttributes().contains(generated2));
- }
-
@Test
public void constructor1() {
DbEntity ent = new DbEntity();
diff --git a/cayenne/src/test/java/org/apache/cayenne/map/EntityIT.java b/cayenne/src/test/java/org/apache/cayenne/map/EntityIT.java
index 1fe75ab8c..9a4e00a61 100644
--- a/cayenne/src/test/java/org/apache/cayenne/map/EntityIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/map/EntityIT.java
@@ -24,7 +24,6 @@ import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.unit.CayenneProjects;
import org.apache.cayenne.unit.CayenneTestsEnv;
import org.apache.cayenne.util.CayenneMapEntry;
-import org.apache.cayenne.util.Util;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -44,36 +43,6 @@ public class EntityIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
- @Test
- public void serializability() throws Exception {
- MockEntity entity = new MockEntity("entity");
-
- MockEntity d1 = Util.cloneViaSerialization(entity);
- assertEquals(entity.getName(), d1.getName());
-
- entity.addAttribute(new MockAttribute("abc"));
- entity.addRelationship(new MockRelationship("xyz"));
- MockEntity d2 = Util.cloneViaSerialization(entity);
- assertNotNull(d2.getAttribute("abc"));
-
- // test that ref collection wrappers are still working
- assertNotNull(d2.getAttributes());
- assertEquals(entity.getAttributes().size(), d2.getAttributes().size());
- assertTrue(d2.getAttributes().contains(d2.getAttribute("abc")));
-
- assertNotNull(d2.getRelationships());
- assertEquals(entity.getRelationships().size(), d2.getRelationships().size());
- assertTrue(d2.getRelationships().contains(d2.getRelationship("xyz")));
-
- assertNotNull(d2.getAttributeMap());
- assertEquals(entity.getAttributes().size(), d2.getAttributeMap().size());
- assertSame(d2.getAttribute("abc"), d2.getAttributeMap().get("abc"));
-
- assertNotNull(d2.getRelationshipMap());
- assertEquals(entity.getRelationships().size(), d2.getRelationshipMap().size());
- assertSame(d2.getRelationship("xyz"), d2.getRelationshipMap().get("xyz"));
- }
-
@Test
public void name() {
MockEntity entity = new MockEntity();
diff --git a/cayenne/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java b/cayenne/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java
index 5c1f0c468..af42997b1 100644
--- a/cayenne/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java
@@ -19,13 +19,11 @@
package org.apache.cayenne.map;
-import org.apache.cayenne.util.Util;
import org.junit.jupiter.api.Test;
import java.sql.Types;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ObjAttributeTest {
@@ -59,14 +57,6 @@ public class ObjAttributeTest {
assertEquals(type, attribute.getType());
}
- @Test
- public void serializability() throws Exception {
- ObjAttribute a1 = new ObjAttribute("a1");
-
- ObjAttribute a2 = Util.cloneViaSerialization(a1);
- assertEquals(a1.getName(), a2.getName());
- }
-
@Test
public void getJavaClass() throws Exception {
diff --git a/cayenne/src/test/java/org/apache/cayenne/map/ObjEntityIT.java b/cayenne/src/test/java/org/apache/cayenne/map/ObjEntityIT.java
index 289004859..db72236a6 100644
--- a/cayenne/src/test/java/org/apache/cayenne/map/ObjEntityIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/map/ObjEntityIT.java
@@ -27,7 +27,6 @@ import org.apache.cayenne.exp.parser.ASTObjPath;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.CayenneProjects;
import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.apache.cayenne.util.Util;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -197,14 +196,6 @@ public class ObjEntityIT {
assertTrue(entity.getPrimaryKeyNames().contains(pk2.getName()));
}
- @Test
- public void serializability() throws Exception {
- ObjEntity entity = new ObjEntity("entity");
-
- ObjEntity d1 = Util.cloneViaSerialization(entity);
- assertEquals(entity.getName(), d1.getName());
- }
-
@Test
public void dbEntityName() {
ObjEntity entity = new ObjEntity("entity");
diff --git a/cayenne/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java b/cayenne/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
index 0b32e3b7f..896caef53 100644
--- a/cayenne/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
@@ -35,7 +35,6 @@ import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.testdo.inheritance_vertical.Iv2Sub1;
import org.apache.cayenne.unit.CayenneProjects;
import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.apache.cayenne.util.Util;
import org.apache.cayenne.util.XMLEncoder;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -103,18 +102,6 @@ public class ObjRelationshipIT {
assertEquals("java.util.Map", r.getCollectionType());
}
- @Test
- public void serializability() throws Exception {
- ObjEntity artistObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
-
- // start with "to many"
- ObjRelationship r1 = artistObjEnt.getRelationship("paintingArray");
-
- ObjRelationship r2 = Util.cloneViaSerialization(r1);
- assertEquals(r1.getName(), r2.getName());
- assertEquals(r1.getDbRelationshipPath(), r2.getDbRelationshipPath());
- }
-
@Test
public void getReverseDbRelationshipPath() {
ObjEntity artistObjEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist");
diff --git a/cayenne/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java b/cayenne/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
index 393076813..f1296671c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
@@ -20,7 +20,6 @@
package org.apache.cayenne.query;
import org.apache.cayenne.ObjectId;
-import org.apache.cayenne.util.Util;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
@@ -36,17 +35,6 @@ public class ObjectIdQueryTest {
assertSame(oid, query.getObjectId());
}
- @Test
- public void serializability() throws Exception {
- ObjectId oid = ObjectId.of("test", "a", "b");
- ObjectIdQuery query = new ObjectIdQuery(oid);
-
- Object o = Util.cloneViaSerialization(query);
- assertNotNull(o);
- assertTrue(o instanceof ObjectIdQuery);
- assertEquals(oid, ((ObjectIdQuery) o).getObjectId());
- }
-
/**
* Proper 'equals' and 'hashCode' implementations are important when mapping results of a multi-query
* execution back to the query.
diff --git a/cayenne/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java b/cayenne/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java
index 6e3025024..b7a03b39f 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java
@@ -20,14 +20,10 @@
package org.apache.cayenne.query;
import org.apache.cayenne.exp.path.CayennePath;
-import org.apache.cayenne.util.Util;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class PrefetchTreeNodeTest {
@@ -84,39 +80,6 @@ public class PrefetchTreeNodeTest {
assertEquals(CayennePath.of("xyz"), n4.getPath());
}
- @Test
- public void treeSerialization() throws Exception {
- PrefetchTreeNode n1 = new PrefetchTreeNode();
- PrefetchTreeNode n2 = n1.addPath("abc");
-
- PrefetchTreeNode nc1 = (PrefetchTreeNode) Util.cloneViaSerialization(n1);
- assertNotNull(nc1);
-
- PrefetchTreeNode nc2 = nc1.getNode("abc");
- assertNotNull(nc2);
- assertNotSame(nc2, n2);
- assertSame(nc1, nc2.getParent());
- assertEquals("abc", nc2.getName());
- }
-
- @Test
- public void subtreeSerialization() throws Exception {
- PrefetchTreeNode n1 = new PrefetchTreeNode();
- PrefetchTreeNode n2 = n1.addPath("abc");
- PrefetchTreeNode n3 = n2.addPath("xyz");
-
- // test that substree was serialized as independent tree, instead of sucking
- PrefetchTreeNode nc2 = (PrefetchTreeNode) Util.cloneViaSerialization(n2);
- assertNotNull(nc2);
- assertNull(nc2.getParent());
-
- PrefetchTreeNode nc3 = nc2.getNode("xyz");
- assertNotNull(nc3);
- assertNotSame(nc3, n3);
- assertSame(nc2, nc3.getParent());
- assertEquals("xyz", nc3.getName());
- }
-
@Test
public void cloneJointSubtree() throws Exception {
PrefetchTreeNode root = new PrefetchTreeNode(null, "root");
diff --git a/cayenne/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java b/cayenne/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
index 0cdbd4c83..d158d4001 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
@@ -20,7 +20,6 @@ package org.apache.cayenne.query;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -35,7 +34,6 @@ import java.util.Map;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.util.Util;
import org.junit.jupiter.api.Test;
public class SQLTemplateTest {
@@ -171,19 +169,6 @@ public class SQLTemplateTest {
assertEquals(CapsStrategy.UPPER, q1.getColumnNamesCapitalization());
}
- @Test
- public void serializability() throws Exception {
- SQLTemplate o = new SQLTemplate("Test", "DO SQL");
- Object clone = Util.cloneViaSerialization(o);
-
- assertTrue(clone instanceof SQLTemplate);
- SQLTemplate c1 = (SQLTemplate) clone;
-
- assertNotSame(o, c1);
- assertEquals(o.getRoot(), c1.getRoot());
- assertEquals(o.getDefaultTemplate(), c1.getDefaultTemplate());
- }
-
@Test
public void notReadOnlyMetadata() {
assertFalse(new SQLTemplate("E1", "SELECT").getMetaData(mock(EntityResolver.class)).isReadOnly());
diff --git a/cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectAttributePropertyTest.java b/cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectAttributePropertyTest.java
deleted file mode 100644
index e37d92ac7..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectAttributePropertyTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.reflect.generic;
-
-import org.apache.cayenne.map.ObjAttribute;
-import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.util.Util;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-public class PersistentObjectAttributePropertyTest {
-
- @Test
- public void serialization() throws Exception {
- ObjEntity e1 = new ObjEntity("objEntityName");
- ObjAttribute a1 = new ObjAttribute("aName", "aType", e1);
-
- PersistentObjectAttributeProperty p1 = new PersistentObjectAttributeProperty(a1, new DefaultValueComparisonStrategyFactory.DefaultValueComparisonStrategy());
- PersistentObjectAttributeProperty p2 = Util.cloneViaSerialization(p1);
-
- assertNotNull(p2);
- assertNotNull(p2.getAttribute());
- assertEquals(p1.getAttribute().getName(), p2.getAttribute().getName());
- assertEquals(p1.getName(), p2.getName());
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/annotation/ArtistAnnotation.java b/cayenne/src/test/java/org/apache/cayenne/testdo/annotation/ArtistAnnotation.java
index 643552488..dfb4af3c5 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/annotation/ArtistAnnotation.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/annotation/ArtistAnnotation.java
@@ -23,8 +23,6 @@ import org.apache.cayenne.testdo.annotation.auto._ArtistAnnotation;
public class ArtistAnnotation extends _ArtistAnnotation {
- private static final long serialVersionUID = 1L;
-
@PostAdd
protected void testPostAdd() {
postCallback = "testPostAdd";
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/annotation/auto/_ArtistAnnotation.java b/cayenne/src/test/java/org/apache/cayenne/testdo/annotation/auto/_ArtistAnnotation.java
index 210735534..8a3951c59 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/annotation/auto/_ArtistAnnotation.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/annotation/auto/_ArtistAnnotation.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.annotation.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
@@ -19,8 +15,6 @@ import org.apache.cayenne.testdo.annotation.ArtistAnnotation;
*/
public abstract class _ArtistAnnotation extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<ArtistAnnotation> SELF = PropertyFactory.createSelf(ArtistAnnotation.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "ArtistAnnotation", Integer.class);
@@ -89,26 +83,4 @@ public abstract class _ArtistAnnotation extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.postCallback);
- out.writeObject(this.preCallback);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.postCallback = (String)in.readObject();
- this.preCallback = (String)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/array_type/ArrayTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/array_type/ArrayTestEntity.java
index 1600b1145..ce646535d 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/array_type/ArrayTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/array_type/ArrayTestEntity.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.array_type.auto._ArrayTestEntity;
public class ArrayTestEntity extends _ArrayTestEntity {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/array_type/auto/_ArrayTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/array_type/auto/_ArrayTestEntity.java
index c73fd2bb3..be5f1151e 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/array_type/auto/_ArrayTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/array_type/auto/_ArrayTestEntity.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.array_type.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.BaseProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -19,8 +15,6 @@ import org.apache.cayenne.testdo.array_type.ArrayTestEntity;
*/
public abstract class _ArrayTestEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<ArrayTestEntity> SELF = PropertyFactory.createSelf(ArrayTestEntity.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "ArrayTestEntity", Integer.class);
@@ -70,24 +64,4 @@ public abstract class _ArrayTestEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.doubleArray);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.doubleArray = (Double[])in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest1.java b/cayenne/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest1.java
index 785c9972f..28618f2ad 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest1.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.binary_pk.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -22,8 +19,6 @@ import org.apache.cayenne.testdo.binary_pk.BinaryPKTest2;
*/
public abstract class _BinaryPKTest1 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<BinaryPKTest1> SELF = PropertyFactory.createSelf(BinaryPKTest1.class);
public static final BaseIdProperty<byte[]> BIN_ID_PK_PROPERTY = PropertyFactory.createBaseId("BIN_ID", "BinaryPKTest1", byte[].class);
@@ -93,26 +88,4 @@ public abstract class _BinaryPKTest1 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.binaryPKDetails);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.binaryPKDetails = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest2.java b/cayenne/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest2.java
index e8d1a4fbd..b7023a670 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest2.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.binary_pk.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -21,8 +17,6 @@ import org.apache.cayenne.testdo.binary_pk.BinaryPKTest2;
*/
public abstract class _BinaryPKTest2 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<BinaryPKTest2> SELF = PropertyFactory.createSelf(BinaryPKTest2.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "BinaryPKTest2", Integer.class);
@@ -87,26 +81,4 @@ public abstract class _BinaryPKTest2 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.detailName);
- out.writeObject(this.toBinaryPKMaster);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.detailName = (String)in.readObject();
- this.toBinaryPKMaster = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/Team.java b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/Team.java
index ac40e4d7d..01534eeb9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/Team.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/Team.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.cay_2032.auto._Team;
public class Team extends _Team {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/Users.java b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/Users.java
index 3bf1d12ec..3169aa6ae 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/Users.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/Users.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.cay_2032.auto._Users;
public class Users extends _Users {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java
index c92e8c2bf..65d2c8fd5 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.cay_2032.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -21,8 +18,6 @@ import org.apache.cayenne.testdo.cay_2032.Users;
*/
public abstract class _Team extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Team> SELF = PropertyFactory.createSelf(Team.class);
public static final NumericIdProperty<Integer> TEAM_ID_PK_PROPERTY = PropertyFactory.createNumericId("team_id", "Team", Integer.class);
@@ -75,24 +70,4 @@ public abstract class _Team extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.teamUsers);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.teamUsers = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Users.java b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Users.java
index 7488ff998..513181c2b 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Users.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Users.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.cay_2032.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -22,8 +19,6 @@ import org.apache.cayenne.testdo.cay_2032.Users;
*/
public abstract class _Users extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Users> SELF = PropertyFactory.createSelf(Users.class);
public static final NumericIdProperty<Integer> USER_ID_PK_PROPERTY = PropertyFactory.createNumericId("user_id", "Users", Integer.class);
@@ -93,26 +88,4 @@ public abstract class _Users extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.userTeams);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (byte[])in.readObject();
- this.userTeams = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/ArtistLazy.java b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/ArtistLazy.java
index bb417b2e3..e3c13ce80 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/ArtistLazy.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/ArtistLazy.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.cay_2641.auto._ArtistLazy;
public class ArtistLazy extends _ArtistLazy {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/PaintingLazy.java b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/PaintingLazy.java
index e6dc099dc..35dc6e5b9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/PaintingLazy.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/PaintingLazy.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.cay_2641.auto._PaintingLazy;
public class PaintingLazy extends _PaintingLazy {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/auto/_ArtistLazy.java b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/auto/_ArtistLazy.java
index 9fa125aea..fecc716a5 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/auto/_ArtistLazy.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/auto/_ArtistLazy.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.cay_2641.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.Fault;
@@ -23,8 +20,6 @@ import org.apache.cayenne.testdo.cay_2641.PaintingLazy;
*/
public abstract class _ArtistLazy extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<ArtistLazy> SELF = PropertyFactory.createSelf(ArtistLazy.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "ArtistLazy", Integer.class);
@@ -114,28 +109,4 @@ public abstract class _ArtistLazy extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.surname);
- out.writeObject(this.paintings);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = in.readObject();
- this.surname = (String)in.readObject();
- this.paintings = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/auto/_PaintingLazy.java b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/auto/_PaintingLazy.java
index 664771f67..92ab82899 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/auto/_PaintingLazy.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2641/auto/_PaintingLazy.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.cay_2641.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.Fault;
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
@@ -22,8 +18,6 @@ import org.apache.cayenne.testdo.cay_2641.PaintingLazy;
*/
public abstract class _PaintingLazy extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<PaintingLazy> SELF = PropertyFactory.createSelf(PaintingLazy.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "PaintingLazy", Integer.class);
@@ -91,26 +85,4 @@ public abstract class _PaintingLazy extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.artist);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = in.readObject();
- this.artist = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2666/CAY2666.java b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2666/CAY2666.java
index 049ed09e4..b2bc5a800 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2666/CAY2666.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2666/CAY2666.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.cay_2666.auto._CAY2666;
public class CAY2666 extends _CAY2666 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2666/auto/_CAY2666.java b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2666/auto/_CAY2666.java
index 53d6f77c7..a31fc64f6 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2666/auto/_CAY2666.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/cay_2666/auto/_CAY2666.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.cay_2666.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
@@ -18,8 +14,6 @@ import org.apache.cayenne.testdo.cay_2666.CAY2666;
*/
public abstract class _CAY2666 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CAY2666> SELF = PropertyFactory.createSelf(CAY2666.class);
public static final String ID_PK_COLUMN = "ID";
@@ -68,24 +62,4 @@ public abstract class _CAY2666 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name$);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name$ = (String)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundIntPk.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundIntPk.java
index e96dea296..320dd5422 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundIntPk.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundIntPk.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.compound.auto._CompoundIntPk;
public class CompoundIntPk extends _CompoundIntPk {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrder.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrder.java
index 02a9b9653..10a5a10df 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrder.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrder.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.testdo.compound.auto._CompoundOrder;
public class CompoundOrder extends _CompoundOrder {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrderLine.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrderLine.java
index cfbd9eae5..7668e9b3b 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrderLine.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrderLine.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.testdo.compound.auto._CompoundOrderLine;
public class CompoundOrderLine extends _CompoundOrderLine {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrderLineInfo.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrderLineInfo.java
index 2d018382b..708e614e6 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrderLineInfo.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/CompoundOrderLineInfo.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.testdo.compound.auto._CompoundOrderLineInfo;
public class CompoundOrderLineInfo extends _CompoundOrderLineInfo {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharFkTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharFkTestEntity.java
index b129793a6..3d2619428 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharFkTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharFkTestEntity.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.compound.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -21,8 +17,6 @@ import org.apache.cayenne.testdo.compound.CharPkTestEntity;
*/
public abstract class _CharFkTestEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CharFkTestEntity> SELF = PropertyFactory.createSelf(CharFkTestEntity.class);
public static final NumericIdProperty<Integer> PK_PK_PROPERTY = PropertyFactory.createNumericId("PK", "CharFkTestEntity", Integer.class);
@@ -87,26 +81,4 @@ public abstract class _CharFkTestEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.toCharPK);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.toCharPK = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharPkTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharPkTestEntity.java
index dd20facee..8774b0079 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharPkTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharPkTestEntity.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.compound.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -21,8 +18,6 @@ import org.apache.cayenne.testdo.compound.CharPkTestEntity;
*/
public abstract class _CharPkTestEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CharPkTestEntity> SELF = PropertyFactory.createSelf(CharPkTestEntity.class);
public static final String PK_COL_PK_COLUMN = "PK_COL";
@@ -108,28 +103,4 @@ public abstract class _CharPkTestEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.otherCol);
- out.writeObject(this.pkCol);
- out.writeObject(this.charFKs);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.otherCol = (String)in.readObject();
- this.pkCol = (String)in.readObject();
- this.charFKs = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundFkTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundFkTestEntity.java
index 7930207cd..a0f84ec42 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundFkTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundFkTestEntity.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.compound.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -21,8 +17,6 @@ import org.apache.cayenne.testdo.compound.CompoundPkTestEntity;
*/
public abstract class _CompoundFkTestEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CompoundFkTestEntity> SELF = PropertyFactory.createSelf(CompoundFkTestEntity.class);
public static final NumericIdProperty<Integer> PKEY_PK_PROPERTY = PropertyFactory.createNumericId("PKEY", "CompoundFkTestEntity", Integer.class);
@@ -87,26 +81,4 @@ public abstract class _CompoundFkTestEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.toCompoundPk);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.toCompoundPk = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundIntPk.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundIntPk.java
index 04ca0d546..cba2fc063 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundIntPk.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundIntPk.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.compound.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.NumericProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
@@ -19,8 +15,6 @@ import org.apache.cayenne.testdo.compound.CompoundIntPk;
*/
public abstract class _CompoundIntPk extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CompoundIntPk> SELF = PropertyFactory.createSelf(CompoundIntPk.class);
public static final String ID1_PK_COLUMN = "id1";
@@ -104,28 +98,4 @@ public abstract class _CompoundIntPk extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.id1);
- out.writeObject(this.id2);
- out.writeObject(this.name);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.id1 = (Integer)in.readObject();
- this.id2 = (Integer)in.readObject();
- this.name = (String)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrder.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrder.java
index 198ab4423..89ecb1e34 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrder.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrder.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.compound.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.GenericPersistentObject;
@@ -22,8 +19,6 @@ import org.apache.cayenne.testdo.compound.CompoundOrderLine;
*/
public abstract class _CompoundOrder extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CompoundOrder> SELF = PropertyFactory.createSelf(CompoundOrder.class);
public static final NumericIdProperty<Integer> ORDER_NUMBER_PK_PROPERTY = PropertyFactory.createNumericId("order_number", "CompoundOrder", Integer.class);
@@ -93,26 +88,4 @@ public abstract class _CompoundOrder extends GenericPersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.info);
- out.writeObject(this.lines);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.info = (String)in.readObject();
- this.lines = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrderLine.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrderLine.java
index 670250963..c8b5d6bcf 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrderLine.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrderLine.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.compound.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.GenericPersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -22,8 +18,6 @@ import org.apache.cayenne.testdo.compound.CompoundOrderLineInfo;
*/
public abstract class _CompoundOrderLine extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CompoundOrderLine> SELF = PropertyFactory.createSelf(CompoundOrderLine.class);
public static final String ORDER_LINE_NUMBER_PK_COLUMN = "order_line_number";
@@ -104,28 +98,4 @@ public abstract class _CompoundOrderLine extends GenericPersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeInt(this.lineNumber);
- out.writeObject(this.info);
- out.writeObject(this.order);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.lineNumber = in.readInt();
- this.info = in.readObject();
- this.order = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrderLineInfo.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrderLineInfo.java
index fab043d80..74535df11 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrderLineInfo.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundOrderLineInfo.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.compound.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.GenericPersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -21,8 +17,6 @@ import org.apache.cayenne.testdo.compound.CompoundOrderLineInfo;
*/
public abstract class _CompoundOrderLineInfo extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CompoundOrderLineInfo> SELF = PropertyFactory.createSelf(CompoundOrderLineInfo.class);
public static final NumericIdProperty<Integer> ORDER_LINE_NUMBER_PK_PROPERTY = PropertyFactory.createNumericId("order_line_number", "CompoundOrderLineInfo", Integer.class);
@@ -89,26 +83,4 @@ public abstract class _CompoundOrderLineInfo extends GenericPersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.info);
- out.writeObject(this.line);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.info = (String)in.readObject();
- this.line = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundPkTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundPkTestEntity.java
index caff28dac..35ed52cdb 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundPkTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundPkTestEntity.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.compound.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -21,8 +18,6 @@ import org.apache.cayenne.testdo.compound.CompoundPkTestEntity;
*/
public abstract class _CompoundPkTestEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CompoundPkTestEntity> SELF = PropertyFactory.createSelf(CompoundPkTestEntity.class);
public static final String KEY1_PK_COLUMN = "KEY1";
@@ -126,30 +121,4 @@ public abstract class _CompoundPkTestEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.key1);
- out.writeObject(this.key2);
- out.writeObject(this.name);
- out.writeObject(this.compoundFkArray);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.key1 = (String)in.readObject();
- this.key2 = (String)in.readObject();
- this.name = (String)in.readObject();
- this.compoundFkArray = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/DurationTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/DurationTestEntity.java
index fa52f2fa8..0da7b5c33 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/DurationTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/DurationTestEntity.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.datetime.auto._DurationTestEntity;
public class DurationTestEntity extends _DurationTestEntity {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTestEntity.java
index d27437cbb..0a35c9f06 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTestEntity.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.testdo.datetime.auto._LocalDateTestEntity;
public class LocalDateTestEntity extends _LocalDateTestEntity {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTimeTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTimeTestEntity.java
index 4917e8887..d15ecaeb8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTimeTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTimeTestEntity.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.testdo.datetime.auto._LocalDateTimeTestEntity;
public class LocalDateTimeTestEntity extends _LocalDateTimeTestEntity {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalTimeTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalTimeTestEntity.java
index f30987658..3ecd11f87 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalTimeTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalTimeTestEntity.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.testdo.datetime.auto._LocalTimeTestEntity;
public class LocalTimeTestEntity extends _LocalTimeTestEntity {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/PeriodTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/PeriodTestEntity.java
index f7d312386..380730398 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/PeriodTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/PeriodTestEntity.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.datetime.auto._PeriodTestEntity;
public class PeriodTestEntity extends _PeriodTestEntity {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_DurationTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_DurationTestEntity.java
index 969751618..a4f564a7f 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_DurationTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_DurationTestEntity.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.datetime.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.time.Duration;
import org.apache.cayenne.PersistentObject;
@@ -20,8 +17,6 @@ import org.apache.cayenne.testdo.datetime.DurationTestEntity;
*/
public abstract class _DurationTestEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<DurationTestEntity> SELF = PropertyFactory.createSelf(DurationTestEntity.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "DurationTest", Integer.class);
@@ -156,34 +151,4 @@ public abstract class _DurationTestEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.durationBigInt);
- out.writeObject(this.durationDecimal);
- out.writeObject(this.durationInt);
- out.writeObject(this.durationLongVarchar);
- out.writeObject(this.durationNumeric);
- out.writeObject(this.durationVarchar);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.durationBigInt = (Duration)in.readObject();
- this.durationDecimal = (Duration)in.readObject();
- this.durationInt = (Duration)in.readObject();
- this.durationLongVarchar = (Duration)in.readObject();
- this.durationNumeric = (Duration)in.readObject();
- this.durationVarchar = (Duration)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTestEntity.java
index bc76df12a..980cc3f79 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTestEntity.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.datetime.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.time.LocalDate;
import org.apache.cayenne.PersistentObject;
@@ -20,8 +17,6 @@ import org.apache.cayenne.testdo.datetime.LocalDateTestEntity;
*/
public abstract class _LocalDateTestEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<LocalDateTestEntity> SELF = PropertyFactory.createSelf(LocalDateTestEntity.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "LocalDateTest", Integer.class);
@@ -71,24 +66,4 @@ public abstract class _LocalDateTestEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.date);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.date = (LocalDate)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTimeTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTimeTestEntity.java
index 7de9350ad..1cc0518c6 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTimeTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTimeTestEntity.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.datetime.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.time.LocalDateTime;
import org.apache.cayenne.PersistentObject;
@@ -20,8 +17,6 @@ import org.apache.cayenne.testdo.datetime.LocalDateTimeTestEntity;
*/
public abstract class _LocalDateTimeTestEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<LocalDateTimeTestEntity> SELF = PropertyFactory.createSelf(LocalDateTimeTestEntity.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "LocalDateTimeTest", Integer.class);
@@ -71,24 +66,4 @@ public abstract class _LocalDateTimeTestEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.timestamp);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.timestamp = (LocalDateTime)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalTimeTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalTimeTestEntity.java
index a3b875815..d3becc421 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalTimeTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalTimeTestEntity.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.datetime.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.time.LocalTime;
import org.apache.cayenne.PersistentObject;
@@ -20,8 +17,6 @@ import org.apache.cayenne.testdo.datetime.LocalTimeTestEntity;
*/
public abstract class _LocalTimeTestEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<LocalTimeTestEntity> SELF = PropertyFactory.createSelf(LocalTimeTestEntity.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "LocalTimeTest", Integer.class);
@@ -71,24 +66,4 @@ public abstract class _LocalTimeTestEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.time);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.time = (LocalTime)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_PeriodTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_PeriodTestEntity.java
index 4c63b2e69..46902a2bb 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_PeriodTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_PeriodTestEntity.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.datetime.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.time.Period;
import org.apache.cayenne.PersistentObject;
@@ -20,8 +17,6 @@ import org.apache.cayenne.testdo.datetime.PeriodTestEntity;
*/
public abstract class _PeriodTestEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<PeriodTestEntity> SELF = PropertyFactory.createSelf(PeriodTestEntity.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "PeriodTest", Integer.class);
@@ -71,24 +66,4 @@ public abstract class _PeriodTestEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.periodField);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.periodField = (Period)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java b/cayenne/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java
index 6e4aebc08..f712ffcd6 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.db1.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -23,8 +20,6 @@ import org.apache.cayenne.testdo.db2.CrossdbM2E2;
*/
public abstract class _CrossdbM1E1 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CrossdbM1E1> SELF = PropertyFactory.createSelf(CrossdbM1E1.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "CrossdbM1E1", Integer.class);
@@ -114,28 +109,4 @@ public abstract class _CrossdbM1E1 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.flattened);
- out.writeObject(this.listOfM2E2);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.flattened = in.readObject();
- this.listOfM2E2 = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java b/cayenne/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java
index 3936c8986..0e19766ac 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.db2.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -22,8 +19,6 @@ import org.apache.cayenne.testdo.db2.CrossdbM2E2;
*/
public abstract class _CrossdbM2E1 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CrossdbM2E1> SELF = PropertyFactory.createSelf(CrossdbM2E1.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "CrossdbM2E1", Integer.class);
@@ -93,26 +88,4 @@ public abstract class _CrossdbM2E1 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.listOfM2E2);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.listOfM2E2 = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java b/cayenne/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java
index 011a40444..625329b45 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.db2.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -22,8 +18,6 @@ import org.apache.cayenne.testdo.db2.CrossdbM2E2;
*/
public abstract class _CrossdbM2E2 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<CrossdbM2E2> SELF = PropertyFactory.createSelf(CrossdbM2E2.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "CrossdbM2E2", Integer.class);
@@ -103,28 +97,4 @@ public abstract class _CrossdbM2E2 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.toM1E1);
- out.writeObject(this.toM2E1);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.toM1E1 = in.readObject();
- this.toM2E1 = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedChild.java b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedChild.java
index 63f857b1b..f5800152c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedChild.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedChild.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.testdo.embeddable.auto._EmbedChild;
public class EmbedChild extends _EmbedChild {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedEntity1.java b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedEntity1.java
index f2c2eaaa3..119a0ce66 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedEntity1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedEntity1.java
@@ -22,8 +22,6 @@ import org.apache.cayenne.testdo.embeddable.auto._EmbedEntity1;
public class EmbedEntity1 extends _EmbedEntity1 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedEntity2.java b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedEntity2.java
index 5d4433d7c..55622be66 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedEntity2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedEntity2.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.testdo.embeddable.auto._EmbedEntity2;
public class EmbedEntity2 extends _EmbedEntity2 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedRoot.java b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedRoot.java
index 893eccaf5..5dedff54a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedRoot.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/EmbedRoot.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.testdo.embeddable.auto._EmbedRoot;
public class EmbedRoot extends _EmbedRoot {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedChild.java b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedChild.java
index 21a71087d..b6127a500 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedChild.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedChild.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.embeddable.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
@@ -19,8 +15,6 @@ import org.apache.cayenne.testdo.embeddable.EmbedRoot;
*/
public abstract class _EmbedChild extends EmbedRoot {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<EmbedChild> SELF = PropertyFactory.createSelf(EmbedChild.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "EmbedChild", Integer.class);
@@ -70,24 +64,4 @@ public abstract class _EmbedChild extends EmbedRoot {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.childAttr);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.childAttr = (String)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java
index d8fadc464..f088311a2 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.embeddable.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -24,8 +21,6 @@ import org.apache.cayenne.testdo.embeddable.Embeddable1;
*/
public abstract class _EmbedEntity1 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<EmbedEntity1> SELF = PropertyFactory.createSelf(EmbedEntity1.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "EmbedEntity1", Integer.class);
@@ -129,30 +124,4 @@ public abstract class _EmbedEntity1 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.embedded1);
- out.writeObject(this.embedded2);
- out.writeObject(this.name);
- out.writeObject(this.embedEntity2s);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.embedded1 = (Embeddable1)in.readObject();
- this.embedded2 = (Embeddable1)in.readObject();
- this.name = (String)in.readObject();
- this.embedEntity2s = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity2.java b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity2.java
index 635425470..87743690d 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity2.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.embeddable.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EmbeddableProperty;
import org.apache.cayenne.exp.property.EntityProperty;
@@ -23,8 +19,6 @@ import org.apache.cayenne.testdo.embeddable.Embeddable1;
*/
public abstract class _EmbedEntity2 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<EmbedEntity2> SELF = PropertyFactory.createSelf(EmbedEntity2.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "EmbedEntity2", Integer.class);
@@ -106,28 +100,4 @@ public abstract class _EmbedEntity2 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.embedded);
- out.writeObject(this.name);
- out.writeObject(this.entity1);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.embedded = (Embeddable1)in.readObject();
- this.name = (String)in.readObject();
- this.entity1 = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedRoot.java b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedRoot.java
index a46785de2..7bdc9dcad 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedRoot.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedRoot.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.embeddable.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EmbeddableProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -22,8 +18,6 @@ import org.apache.cayenne.testdo.embeddable.Embeddable1;
*/
public abstract class _EmbedRoot extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<EmbedRoot> SELF = PropertyFactory.createSelf(EmbedRoot.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "EmbedRoot", Integer.class);
@@ -107,28 +101,4 @@ public abstract class _EmbedRoot extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.embedded);
- out.writeObject(this.name);
- out.writeInt(this.type);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.embedded = (Embeddable1)in.readObject();
- this.name = (String)in.readObject();
- this.type = in.readInt();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_Embeddable1.java b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_Embeddable1.java
index 169d3ded7..738f80bbb 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_Embeddable1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_Embeddable1.java
@@ -1,7 +1,5 @@
package org.apache.cayenne.testdo.embeddable.auto;
-import java.io.Serializable;
-
import org.apache.cayenne.EmbeddableObject;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.exp.property.PropertyFactory;
@@ -13,7 +11,7 @@ import org.apache.cayenne.exp.property.StringProperty;
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public abstract class _Embeddable1 implements EmbeddableObject, Serializable {
+public abstract class _Embeddable1 implements EmbeddableObject {
public static final StringProperty<String> EMBEDDED20 = PropertyFactory.createString("embedded20", String.class);
public static final StringProperty<String> EMBEDDED10 = PropertyFactory.createString("embedded10", String.class);
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/EnumEntity2.java b/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/EnumEntity2.java
index 06e9016d7..161a279e9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/EnumEntity2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/EnumEntity2.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.enum_test.auto._EnumEntity2;
public class EnumEntity2 extends _EnumEntity2 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/EnumEntity3.java b/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/EnumEntity3.java
index 5dbd9f5b7..0579b6cb0 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/EnumEntity3.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/EnumEntity3.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.testdo.enum_test.auto._EnumEntity3;
public class EnumEntity3 extends _EnumEntity3 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity.java
index 1acf3147a..d328f02ae 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.enum_test.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.BaseProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -20,8 +16,6 @@ import org.apache.cayenne.testdo.enum_test.EnumEntity;
*/
public abstract class _EnumEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<EnumEntity> SELF = PropertyFactory.createSelf(EnumEntity.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "EnumEntity", Integer.class);
@@ -71,24 +65,4 @@ public abstract class _EnumEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.enumAttribute);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.enumAttribute = (Enum1)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity2.java b/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity2.java
index 0a55d77be..e64a752b8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity2.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.enum_test.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.BaseProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -20,8 +16,6 @@ import org.apache.cayenne.testdo.enum_test.EnumEntity2;
*/
public abstract class _EnumEntity2 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<EnumEntity2> SELF = PropertyFactory.createSelf(EnumEntity2.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "EnumEntity2", Integer.class);
@@ -71,24 +65,4 @@ public abstract class _EnumEntity2 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.enumAttribute);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.enumAttribute = (Enum1)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity3.java b/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity3.java
index 829e17163..b40c6340b 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity3.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity3.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.enum_test.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.BaseProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -20,8 +16,6 @@ import org.apache.cayenne.testdo.enum_test.EnumEntity3;
*/
public abstract class _EnumEntity3 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<EnumEntity3> SELF = PropertyFactory.createSelf(EnumEntity3.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "EnumEntity3", Integer.class);
@@ -71,24 +65,4 @@ public abstract class _EnumEntity3 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.enumAttribute);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.enumAttribute = (Enum1)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/extended_type/auto/_ExtendedTypeEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/extended_type/auto/_ExtendedTypeEntity.java
index 6aa478b1a..858d80629 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/extended_type/auto/_ExtendedTypeEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/extended_type/auto/_ExtendedTypeEntity.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.extended_type.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.BaseProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -20,8 +16,6 @@ import org.apache.cayenne.testdo.extended_type.StringET1;
*/
public abstract class _ExtendedTypeEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<ExtendedTypeEntity> SELF = PropertyFactory.createSelf(ExtendedTypeEntity.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "ExtendedTypeEntity", Integer.class);
@@ -71,24 +65,4 @@ public abstract class _ExtendedTypeEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (StringET1)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/GeneratedReflexive.java b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/GeneratedReflexive.java
index 7d32c1d82..1fb86e508 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/GeneratedReflexive.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/GeneratedReflexive.java
@@ -22,6 +22,4 @@ import org.apache.cayenne.testdo.generated.auto._GeneratedReflexive;
public class GeneratedReflexive extends _GeneratedReflexive {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompKey.java b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompKey.java
index 23ab53990..2540f508b 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompKey.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompKey.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.generated.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -21,8 +17,6 @@ import org.apache.cayenne.testdo.generated.GeneratedColumnCompMaster;
*/
public abstract class _GeneratedColumnCompKey extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<GeneratedColumnCompKey> SELF = PropertyFactory.createSelf(GeneratedColumnCompKey.class);
public static final NumericIdProperty<Integer> AUTO_PK_PK_PROPERTY = PropertyFactory.createNumericId("AUTO_PK", "GeneratedColumnCompKey", Integer.class);
@@ -91,26 +85,4 @@ public abstract class _GeneratedColumnCompKey extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.toMaster);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.toMaster = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompMaster.java b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompMaster.java
index 813c5221c..4900f8361 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompMaster.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompMaster.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.generated.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -22,8 +19,6 @@ import org.apache.cayenne.testdo.generated.GeneratedColumnCompMaster;
*/
public abstract class _GeneratedColumnCompMaster extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<GeneratedColumnCompMaster> SELF = PropertyFactory.createSelf(GeneratedColumnCompMaster.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "GeneratedColumnCompMaster", Integer.class);
@@ -93,26 +88,4 @@ public abstract class _GeneratedColumnCompMaster extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.toDetail);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.toDetail = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnDep.java b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnDep.java
index 9aa29aca1..012027d32 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnDep.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnDep.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.generated.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -21,8 +17,6 @@ import org.apache.cayenne.testdo.generated.GeneratedColumnTestEntity;
*/
public abstract class _GeneratedColumnDep extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<GeneratedColumnDep> SELF = PropertyFactory.createSelf(GeneratedColumnDep.class);
public static final NumericIdProperty<Integer> GENERATED_COLUMN_FK_PK_PROPERTY = PropertyFactory.createNumericId("GENERATED_COLUMN_FK", "GeneratedColumnDep", Integer.class);
@@ -87,26 +81,4 @@ public abstract class _GeneratedColumnDep extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.toMaster);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.toMaster = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTest2.java b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTest2.java
index 4837914d2..ec16c2d97 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTest2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTest2.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.generated.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
@@ -19,8 +15,6 @@ import org.apache.cayenne.testdo.generated.GeneratedColumnTest2;
*/
public abstract class _GeneratedColumnTest2 extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<GeneratedColumnTest2> SELF = PropertyFactory.createSelf(GeneratedColumnTest2.class);
public static final NumericIdProperty<Integer> GENERATED_COLUMN_PK_PROPERTY = PropertyFactory.createNumericId("GENERATED_COLUMN", "GeneratedColumnTest2", Integer.class);
@@ -70,24 +64,4 @@ public abstract class _GeneratedColumnTest2 extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTestEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTestEntity.java
index ea73c9161..9631ee71c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTestEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTestEntity.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.generated.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -21,8 +17,6 @@ import org.apache.cayenne.testdo.generated.GeneratedColumnTestEntity;
*/
public abstract class _GeneratedColumnTestEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<GeneratedColumnTestEntity> SELF = PropertyFactory.createSelf(GeneratedColumnTestEntity.class);
public static final NumericIdProperty<Integer> GENERATED_COLUMN_PK_PROPERTY = PropertyFactory.createNumericId("GENERATED_COLUMN", "GeneratedColumnTestEntity", Integer.class);
@@ -87,26 +81,4 @@ public abstract class _GeneratedColumnTestEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.toDep);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.toDep = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF1.java b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF1.java
index c494ca5fa..be3407c6f 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF1.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.generated.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.GenericPersistentObject;
@@ -21,8 +18,6 @@ import org.apache.cayenne.testdo.generated.GeneratedF2;
*/
public abstract class _GeneratedF1 extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<GeneratedF1> SELF = PropertyFactory.createSelf(GeneratedF1.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "GeneratedF1", Integer.class);
@@ -75,24 +70,4 @@ public abstract class _GeneratedF1 extends GenericPersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.f2);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.f2 = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF2.java b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF2.java
index 5109444ee..2cf104692 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF2.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.generated.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.GenericPersistentObject;
@@ -21,8 +18,6 @@ import org.apache.cayenne.testdo.generated.GeneratedF2;
*/
public abstract class _GeneratedF2 extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<GeneratedF2> SELF = PropertyFactory.createSelf(GeneratedF2.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "GeneratedF2", Integer.class);
@@ -75,24 +70,4 @@ public abstract class _GeneratedF2 extends GenericPersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.f1);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.f1 = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedReflexive.java b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedReflexive.java
index 5702f34dd..a71599079 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedReflexive.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedReflexive.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.generated.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.GenericPersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -20,8 +16,6 @@ import org.apache.cayenne.testdo.generated.GeneratedReflexive;
*/
public abstract class _GeneratedReflexive extends GenericPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<GeneratedReflexive> SELF = PropertyFactory.createSelf(GeneratedReflexive.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "GeneratedReflexive", Integer.class);
@@ -86,26 +80,4 @@ public abstract class _GeneratedReflexive extends GenericPersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.next);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.next = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/generic/auto/_Generic.java b/cayenne/src/test/java/org/apache/cayenne/testdo/generic/auto/_Generic.java
index 1824c53cf..fa62500c3 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/generic/auto/_Generic.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/generic/auto/_Generic.java
@@ -1,7 +1,5 @@
package org.apache.cayenne.testdo.generic.auto;
-
-
/**
* This class was generated by Cayenne.
* It is probably a good idea to avoid changing this class manually,
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/HybridEntity1.java b/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/HybridEntity1.java
index cb07e4b81..bd22e92b7 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/HybridEntity1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/HybridEntity1.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.hybrid.auto._HybridEntity1;
public class HybridEntity1 extends _HybridEntity1 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/HybridEntity2.java b/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/HybridEntity2.java
index a89c5ee92..9737800c8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/HybridEntity2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/HybridEntity2.java
@@ -23,6 +23,4 @@ import org.apache.cayenne.testdo.hybrid.auto._HybridEntity2;
public class HybridEntity2 extends _HybridEntity2 {
- private static final long serialVersionUID = 1L;
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/auto/_HybridEntity1.java b/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/auto/_HybridEntity1.java
index 87908682a..6004b7f9d 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/auto/_HybridEntity1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/auto/_HybridEntity1.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.hybrid.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.HybridPersistentObject;
@@ -23,8 +20,6 @@ import org.apache.cayenne.testdo.hybrid.HybridEntity2;
*/
public abstract class _HybridEntity1 extends HybridPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<HybridEntity1> SELF = PropertyFactory.createSelf(HybridEntity1.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "HybridEntity1", Integer.class);
@@ -111,28 +106,4 @@ public abstract class _HybridEntity1 extends HybridPersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeInt(this.intField);
- out.writeObject(this.strField);
- out.writeObject(this.hybridEntities2);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.intField = in.readInt();
- this.strField = (String)in.readObject();
- this.hybridEntities2 = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/auto/_HybridEntity2.java b/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/auto/_HybridEntity2.java
index bb67eb32a..ec66c0900 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/auto/_HybridEntity2.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/hybrid/auto/_HybridEntity2.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.hybrid.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.HybridPersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -22,8 +18,6 @@ import org.apache.cayenne.testdo.hybrid.HybridEntity2;
*/
public abstract class _HybridEntity2 extends HybridPersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<HybridEntity2> SELF = PropertyFactory.createSelf(HybridEntity2.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "HybridEntity2", Integer.class);
@@ -105,28 +99,4 @@ public abstract class _HybridEntity2 extends HybridPersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeInt(this.intField);
- out.writeObject(this.strField);
- out.writeObject(this.hybridEntity1);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.intField = in.readInt();
- this.strField = (String)in.readObject();
- this.hybridEntity1 = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java
index 524e9bbe2..1b3bb9c0b 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.inheritance.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -22,8 +18,6 @@ import org.apache.cayenne.testdo.inheritance.RelatedEntity;
*/
public abstract class _BaseEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<BaseEntity> SELF = PropertyFactory.createSelf(BaseEntity.class);
public static final NumericIdProperty<Integer> BASE_ENTITY_ID_PK_PROPERTY = PropertyFactory.createNumericId("BASE_ENTITY_ID", "BaseEntity", Integer.class);
@@ -103,28 +97,4 @@ public abstract class _BaseEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.entityType);
- out.writeObject(this.toDirectToSubEntity);
- out.writeObject(this.toRelatedEntity);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.entityType = (String)in.readObject();
- this.toDirectToSubEntity = in.readObject();
- this.toRelatedEntity = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java
index f050dc878..6978df3ca 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.inheritance.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -21,8 +18,6 @@ import org.apache.cayenne.testdo.inheritance.SubEntity;
*/
public abstract class _DirectToSubEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<DirectToSubEntity> SELF = PropertyFactory.createSelf(DirectToSubEntity.class);
public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "DirectToSubEntity", Integer.class);
@@ -75,24 +70,4 @@ public abstract class _DirectToSubEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.subEntities);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.subEntities = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java
index 51a36a648..31ee18378 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.inheritance.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -22,8 +19,6 @@ import org.apache.cayenne.testdo.inheritance.SubEntity;
*/
public abstract class _RelatedEntity extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<RelatedEntity> SELF = PropertyFactory.createSelf(RelatedEntity.class);
public static final NumericIdProperty<Integer> RELATED_ENTITY_ID_PK_PROPERTY = PropertyFactory.createNumericId("RELATED_ENTITY_ID", "RelatedEntity", Integer.class);
@@ -96,26 +91,4 @@ public abstract class _RelatedEntity extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.baseEntities);
- out.writeObject(this.subEntities);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.baseEntities = in.readObject();
- this.subEntities = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_SubEntity.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_SubEntity.java
index 5edabaacc..2300c094c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_SubEntity.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_SubEntity.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.inheritance.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
@@ -18,8 +14,6 @@ import org.apache.cayenne.testdo.inheritance.SubEntity;
*/
public abstract class _SubEntity extends BaseEntity {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<SubEntity> SELF = PropertyFactory.createSelf(SubEntity.class);
public static final NumericIdProperty<Integer> BASE_ENTITY_ID_PK_PROPERTY = PropertyFactory.createNumericId("BASE_ENTITY_ID", "SubEntity", Integer.class);
@@ -52,22 +46,4 @@ public abstract class _SubEntity extends BaseEntity {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java
index 7621aac99..989f9fe95 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.inheritance_flat.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.exp.property.EntityProperty;
@@ -22,8 +19,6 @@ import org.apache.cayenne.testdo.inheritance_flat.User;
*/
public abstract class _Group extends User {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Group> SELF = PropertyFactory.createSelf(Group.class);
public static final String ID_PK_COLUMN = "id";
@@ -90,26 +85,4 @@ public abstract class _Group extends User {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.groupMembers);
- out.writeObject(this.groupProperties);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.groupMembers = in.readObject();
- this.groupProperties = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java
index 5d3f897ce..195b11154 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.inheritance_flat.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericProperty;
@@ -21,8 +17,6 @@ import org.apache.cayenne.testdo.inheritance_flat.GroupProperties;
*/
public abstract class _GroupProperties extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<GroupProperties> SELF = PropertyFactory.createSelf(GroupProperties.class);
public static final String ID_PK_COLUMN = "id";
@@ -103,28 +97,4 @@ public abstract class _GroupProperties extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.description);
- out.writeObject(this.id);
- out.writeObject(this.group);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.description = (String)in.readObject();
- this.id = (Long)in.readObject();
- this.group = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_InheritanceFlat.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_InheritanceFlat.java
index 993a78a7d..ee22fb023 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_InheritanceFlat.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_InheritanceFlat.java
@@ -1,7 +1,5 @@
package org.apache.cayenne.testdo.inheritance_flat.auto;
-
-
/**
* This class was generated by Cayenne.
* It is probably a good idea to avoid changing this class manually,
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java
index 594995bb8..9b2e9c8f9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.inheritance_flat.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -22,8 +19,6 @@ import org.apache.cayenne.testdo.inheritance_flat.Role;
*/
public abstract class _Role extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Role> SELF = PropertyFactory.createSelf(Role.class);
public static final String ID_PK_COLUMN = "id";
@@ -130,30 +125,4 @@ public abstract class _Role extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeLong(this.id);
- out.writeObject(this.name);
- out.writeInt(this.type);
- out.writeObject(this.roleGroups);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.id = in.readLong();
- this.name = (String)in.readObject();
- this.type = in.readInt();
- this.roleGroups = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java
index ecdffddc0..434c01b2a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.inheritance_flat.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
@@ -19,8 +15,6 @@ import org.apache.cayenne.testdo.inheritance_flat.UserProperties;
*/
public abstract class _User extends Role {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<User> SELF = PropertyFactory.createSelf(User.class);
public static final String ID_PK_COLUMN = "id";
@@ -67,24 +61,4 @@ public abstract class _User extends Role {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.userProperties);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.userProperties = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java
index e1cbe9602..779a5848a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.inheritance_flat.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericProperty;
@@ -21,8 +17,6 @@ import org.apache.cayenne.testdo.inheritance_flat.UserProperties;
*/
public abstract class _UserProperties extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<UserProperties> SELF = PropertyFactory.createSelf(UserProperties.class);
public static final String ID_PK_COLUMN = "id";
@@ -103,28 +97,4 @@ public abstract class _UserProperties extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.id);
- out.writeObject(this.nickname);
- out.writeObject(this.user);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.id = (Long)in.readObject();
- this.nickname = (String)in.readObject();
- this.user = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_AbstractPerson.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_AbstractPerson.java
index b7f3f8e53..321fb0c4c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_AbstractPerson.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_AbstractPerson.java
@@ -1,8 +1,5 @@
package org.apache.cayenne.testdo.inheritance_people.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.util.List;
import org.apache.cayenne.PersistentObject;
@@ -22,8 +19,6 @@ import org.apache.cayenne.testdo.inheritance_people.PersonNotes;
*/
public abstract class _AbstractPerson extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<AbstractPerson> SELF = PropertyFactory.createSelf(AbstractPerson.class);
public static final NumericIdProperty<Integer> PERSON_ID_PK_PROPERTY = PropertyFactory.createNumericId("PERSON_ID", "AbstractPerson", Integer.class);
@@ -110,28 +105,4 @@ public abstract class _AbstractPerson extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.personType);
- out.writeObject(this.notes);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.personType = (String)in.readObject();
- this.notes = in.readObject();
- }
-
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Address.java b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Address.java
index e1991c3b1..ee0facac1 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Address.java
+++ b/cayenne/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Address.java
@@ -1,9 +1,5 @@
package org.apache.cayenne.testdo.inheritance_people.auto;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.exp.property.EntityProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
@@ -21,8 +17,6 @@ import org.apache.cayenne.testdo.inheritance_people.Employee;
*/
public abstract class _Address extends PersistentObject {
- private static final long serialVersionUID = 1L;
-
public static final SelfProperty<Address> SELF = PropertyFactory.createSelf(Address.class);
public static final NumericIdProperty<Integer> ADDRESS_ID_PK_PROPERTY = PropertyFactory.createNumericId("ADDRESS_ID", "Address", Integer.class);
@@ -87,26 +81,4 @@ public abstract class _Address extends PersistentObject {
}
}
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.city);
- out.writeObject(this.toEmployee);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.city = (String)in.readObject();
- this.toEmployee = in.readObject();
- }
-
... 9173 lines suppressed ...