This is an automated email from the ASF dual-hosted git repository. ahuber pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
from 1011449029 ISIS-3197: minor post merge refactoring (2) add 4174060ff1 ISIS-3200: ManagedObjects of type VALUE should provide bookmarks themselves add dc81b4205c ISIS-3200: opens up _ObjectMemento for refactoring add 1ea27cefda ISIS-3200: value memento to respect actual bookmark add eb255e43cb ISIS-3200: mementos: make use of the fact that bookmark is serializable add 8fd71d3826 ISIS-3200: mementos: remove superfluous code add 06d22a3ca5 ISIS-3200: mementos: simplify add fc9c18478d ISIS-3200: wrong name singleton->scalar add bcacb94afe ISIS-3200: simplify memento to string converter add 2029ec9f91 ISIS-3200: simplify choice-provider id to memento converter add d6fb3c356b ISIS-3200: removes bookmarkable to UUID fallbacks add e08bbd89fe ISIS-3200: fixes to pass regr. tests. except for 2 failing add aec2f498de ISIS-3200: fixes to now pass all regr. test add 4ed48a854f ISIS-3200: ManagedObject: memoize bookmark beyond detachment add ff4cfb3998 ISIS-3200: JDO handle the postLifecycleEventIfRequired also for the no OID case add f1a7e784b7 ISIS-3200: pre-store fixes add 5c8fbf83dc ISIS-3200: polish pre-store add 495e75d1e0 ISIS-3200: remove debug code add a00feeb43d ISIS-3200: wip add 6e42534572 ISIS-3200: _ManagedObjectEntityHybrid has 2 morph states new acf914a6ed Merge pull request #1078 from apache/3200_broken-value-choices The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../isis/applib/services/bookmark/Bookmark.java | 17 +- .../applib/services/bookmark/BookmarkHolder.java | 2 +- .../applib/services/repository/EntityState.java | 11 +- ...os_MementoDefault.java => _MementoDefault.java} | 8 +- .../isis/commons/internal/memento/_Mementos.java | 4 +- .../images/managed-object-diagram.drawio.svg | 2 +- .../_testing/ObjectMementoService_forTesting.java | 7 +- .../facets/object/callbacks/CallbackFacet.java | 1 - .../facets/object/entity/EntityFacet.java | 36 ++ .../facets/object/value/ValueFacetAbstract.java | 10 +- .../facets/object/value/ValueSerializer.java | 9 +- .../object/value/ValueSerializerDefault.java | 32 +- .../object/viewmodel/ViewModelFacetAbstract.java | 4 +- .../isis/core/metamodel/object/ManagedObject.java | 14 +- .../isis/core/metamodel/object/ManagedObjects.java | 12 +- .../core/metamodel/object/MmAssertionUtil.java | 14 + .../object/_ManagedObjectEntityHybrid.java | 103 +++- .../metamodel/object/_ManagedObjectService.java | 4 +- .../core/metamodel/object/_ManagedObjectValue.java | 9 +- .../metamodel/object/_ManagedObjectViewmodel.java | 2 +- .../metamodel/objectmanager/ObjectManager.java | 27 +- .../objectmanager/identify/ObjectBookmarker.java | 25 +- .../identify/ObjectBookmarker_builtinHandlers.java | 79 ++- .../load/ObjectLoader_builtinHandlers.java | 16 +- .../objectmanager/memento/ObjectMemento.java | 26 + .../memento/ObjectMementoCollection.java | 2 +- .../memento/ObjectMementoForEmpty.java | 2 +- .../memento/ObjectMementoService.java | 11 +- .../objectlifecycle/ObjectLifecyclePublisher.java | 6 +- .../HasObjectSpecification.java} | 44 +- .../core/metamodel/util/snapshot/XmlSnapshot.java | 26 +- .../value/JavaTimeValueSemanticsProviderTest.java | 11 +- .../ValueSemanticsProviderAbstractTestCase.java | 41 +- .../isis/core/runtime/IsisModuleCoreRuntime.java | 4 +- ...ervice.java => IdStringifierLookupService.java} | 42 +- .../bookmarks/BookmarkServiceDefault.java | 10 +- .../command/CommandDtoFactoryDefault.java | 4 +- .../interaction/InteractionDtoFactoryDefault.java | 11 +- .../memento/ObjectMementoServiceDefault.java | 75 +-- .../runtimeservices/memento/_ObjectMemento.java | 608 --------------------- .../memento/_ObjectMementoForScalar.java | 171 ++++++ .../core/runtimeservices/memento/_Recreatable.java | 74 +++ .../memento/_RecreatableLookup.java | 59 ++ .../memento/_RecreatableSerializable.java | 54 ++ .../runtimeservices/memento/_RecreatableValue.java | 59 ++ .../publish/LifecycleCallbackNotifier.java | 35 +- .../publish/ObjectLifecyclePublisherDefault.java | 5 +- .../DelegatingInvocationHandlerDefault.java | 9 +- .../handlers/DomainObjectInvocationHandler.java | 7 + .../integtest/CommandLog_IntegTestAbstract.java | 1 - .../integtest/ExecutionLog_IntegTestAbstract.java | 6 +- .../changetracking/JdoLifecycleListener.java | 14 +- .../entities/DnEntityStateProvider.java | 8 +- .../metamodel/facets/entity/JdoEntityFacet.java | 46 +- .../jpa/applib/integration/IsisEntityListener.java | 19 +- .../jpa/integration/entity/JpaEntityFacet.java | 32 +- .../integration/entity/JpaEntityFacetFactory.java | 2 +- .../testdomain/rest/DomainObjectResourceTest.java | 4 +- .../applib/IsisIntegrationTestAbstract.java | 12 +- .../JsonValueEncoderServiceDefault.java | 4 +- .../wicket/model/models/ManagedObjectModel.java | 7 +- .../models/interaction/BookmarkedObjectWkt.java | 6 +- .../wicket/model/util/PageParameterUtils.java | 20 +- .../select2/providers/ChoiceProviderAbstract.java | 11 +- .../ChoiceProviderAbstractForScalarModel.java | 16 - .../integration/ConverterForObjectAdapter.java | 23 +- .../ConverterForObjectAdapterMemento.java | 40 +- .../viewer/wicketapp/IsisWicketApplication.java | 2 +- 68 files changed, 1003 insertions(+), 1114 deletions(-) rename commons/src/main/java/org/apache/isis/commons/internal/memento/{_Mementos_MementoDefault.java => _MementoDefault.java} (94%) copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/{objectmanager/memento/ObjectMementoCollection.java => spec/HasObjectSpecification.java} (52%) rename core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/{IdStringifierService.java => IdStringifierLookupService.java} (68%) delete mode 100644 core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/memento/_ObjectMemento.java create mode 100644 core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/memento/_ObjectMementoForScalar.java create mode 100644 core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/memento/_Recreatable.java create mode 100644 core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/memento/_RecreatableLookup.java create mode 100644 core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/memento/_RecreatableSerializable.java create mode 100644 core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/memento/_RecreatableValue.java