This is an automated email from the ASF dual-hosted git repository. joergrade pushed a commit to branch ISIS-3171 in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9517f0e91003b27d07cf430b794e160a2cd97d44 Merge: 49c32a3a1f 6c24ee7569 Author: Joerg Rade <[email protected]> AuthorDate: Thu Sep 8 17:53:15 2022 +0200 Merge remote-tracking branch 'origin/master' into ISIS-3171 .../pages/index/annotation/CollectionLayout.adoc | 11 + .../pages/index/annotation/DomainObjectLayout.adoc | 11 + .../pages/index/annotation/TableDecoration.adoc | 64 + .../layout/component/CollectionLayoutData.adoc | 2 + .../layout/component/DomainObjectLayoutData.adoc | 2 + .../index/layout/component/TableDecoration.adoc} | 17 +- .../pages/index/services/bookmark/Bookmark.adoc | 16 +- .../index/services/bookmark/BookmarkHolder.adoc | 8 +- .../index/services/bookmark/IdStringifier.adoc | 11 + .../pages/index/services/metamodel/BeanSort.adoc | 2 +- .../index/services/registry/ServiceRegistry.adoc | 16 +- .../index/services/repository/EntityState.adoc | 55 +- .../modules/applib/pages/index/value/Clob.adoc | 1 + .../index/metamodel/object/ManagedObject.adoc | 103 +- .../publish/LifecycleCallbackNotifier.adoc | 8 +- .../publish/ObjectLifecyclePublisherDefault.adoc | 2 +- .../applib/layout/component/component.xsd | 9 + .../isis/applib/annotation/ActionLayout.java | 1 + .../isis/applib/annotation/CollectionLayout.java | 9 + .../isis/applib/annotation/DomainObjectLayout.java | 8 + .../isis/applib/annotation/TableDecoration.java | 60 + .../isis/applib/domain/DomainObjectList.java | 2 +- .../apache/isis/applib/graph/tree/TreeAdapter.java | 21 +- .../layout/component/CollectionLayoutData.java | 20 + .../layout/component/DomainObjectLayoutData.java | 18 + .../applib/layout/component/TableDecoration.java | 13 +- .../metamodel/Object_downloadMetamodelXml.java | 12 +- .../isis/applib/services/bookmark/Bookmark.java | 17 +- .../applib/services/bookmark/BookmarkHolder.java | 2 +- .../applib/services/bookmark/IdStringifier.java | 15 + .../isis/applib/services/metamodel/BeanSort.java | 7 +- .../isis/applib/services/metamodel/Config.java | 108 +- .../services/metamodel/MetaModelServiceMenu.java | 58 +- .../applib/services/registry/ServiceRegistry.java | 5 +- .../applib/services/repository/EntityState.java | 61 +- .../java/org/apache/isis/applib/value/Clob.java | 9 + .../metamodel/MetaModelService_Config_Test.java | 21 +- .../apache/isis/schema/metamodel/metamodel-2.0.xsd | 702 +- bom/pom.xml | 10 +- .../org/apache/isis/commons/collections/Can.java | 43 +- .../commons/collections/ImmutableCollection.java | 94 + .../isis/commons/collections/ImmutableEnumSet.java | 9 + .../isis/commons/internal/assertions/_Assert.java | 75 +- .../commons/internal/collections/_Collections.java | 30 +- .../commons/internal/ioc/_ManagedBeanAdapter.java | 9 +- ...os_MementoDefault.java => _MementoDefault.java} | 8 +- .../isis/commons/internal/memento/_Mementos.java | 4 +- .../isis/commons/internal/reflection/_Reflect.java | 40 + core/adoc/modules/_overview/pages/about.adoc | 266 +- .../apache/isis/core/config/IsisConfiguration.java | 157 +- .../IsisBeanFactoryPostProcessorForSpring.java | 11 +- .../isis/core/config/beans/IsisBeanMetaData.java | 33 +- .../beans/IsisBeanTypeClassifierDefault.java | 42 +- .../beans/IsisComponentScanInterceptorImpl.java | 2 +- .../core/config/beans/ScannedTypeMetaData.java | 5 +- ...Configuration.java => ActionConfigOptions.java} | 26 +- .../facets/CollectionLayoutConfigOptions.java | 75 + ...uration.java => DomainObjectConfigOptions.java} | 22 +- ...s.java => DomainObjectLayoutConfigOptions.java} | 30 +- ...erPolicies.java => ParameterConfigOptions.java} | 4 +- ...nfiguration.java => PropertyConfigOptions.java} | 21 +- .../metamodel/facets/PublishingPolicies.java | 81 - .../progmodel/ProgrammingModelConstants.java | 103 + .../{MessageBroker.java => MessageBrokerImpl.java} | 19 +- .../images/managed-object-diagram.drawio.svg | 2 +- .../core/metamodel/IsisModuleCoreMetamodel.java | 64 + .../_testing/MetaModelContext_forTesting.java | 74 +- .../_testing/ObjectMementoService_forTesting.java | 68 - .../_testing/ServiceRegistry_forTesting.java | 24 +- .../metamodel/_testing/_ServiceInjectorLegacy.java | 34 +- .../isis/core/metamodel/commons/MethodUtil.java | 13 +- .../core/metamodel/commons/ParameterAdapter.java | 57 +- .../core/metamodel/consent/InteractionResult.java | 3 +- .../metamodel/context/HasMetaModelContext.java | 72 +- .../core/metamodel/context/MetaModelContext.java | 114 +- ...gIoc.java => MetaModelContext_usingSpring.java} | 23 +- .../core/metamodel/context/MetaModelContexts.java | 2 +- .../metamodel/execution/InteractionInternal.java | 19 + .../isis/core/metamodel/facets/FacetedMethod.java | 41 +- .../metamodel/facets/FacetedMethodParameter.java | 11 +- ...rCollectionIdentifyingFacetFactoryAbstract.java | 5 +- .../facets/SingleIntValueFacetAbstract.java | 9 +- .../isis/core/metamodel/facets/TypedHolder.java | 12 +- .../core/metamodel/facets/TypedHolderAbstract.java | 22 +- .../facets/actcoll/typeof/TypeOfFacet.java | 82 +- .../facets/actcoll/typeof/TypeOfFacetAbstract.java | 57 +- ...omGenerics.java => TypeOfFacetFromFeature.java} | 5 +- ...acetFromArray.java => TypeOfFacetFromType.java} | 7 +- .../action/ActionAnnotationFacetFactory.java | 22 +- ...nChoicesForCollectionParameterFacetFactory.java | 30 +- ...ctionInvocationFacetForDomainEventAbstract.java | 19 +- .../typeof/TypeOfFacetForActionAnnotation.java | 15 +- .../actions/layout/ActionLayoutFacetFactory.java | 1 + .../CollectionAccessorFacetViaAccessorFactory.java | 15 +- .../CollectionAnnotationFacetFactory.java | 33 +- .../typeof/TypeOfFacetForCollectionAnnotation.java | 11 +- .../javautilcollection/CollectionFacetFactory.java | 19 +- .../layout/CollectionLayoutFacetFactory.java | 8 + .../PagedFacetForCollectionLayoutAnnotation.java | 11 +- ...agedFacetOverriddenByDataTablesDecoration.java} | 17 +- .../CollectionLayoutTableDecorationFacet.java | 72 + ...lectionLayoutTableDecorationFacetAbstract.java} | 27 +- ...orationFacetForCollectionLayoutAnnotation.java} | 12 +- ...ForCollectionLayoutAnnotationAsConfigured.java} | 12 +- ...TableDecorationFacetForCollectionLayoutXml.java | 53 + ...youtTableDecorationFacetFromConfiguration.java} | 12 +- .../collparam/semantics/CollectionSemantics.java | 136 - ...CssClassFaFacetOnMemberFromConfiguredRegex.java | 2 +- .../CommandPublishingFacetForActionAnnotation.java | 4 +- ...ommandPublishingFacetForPropertyAnnotation.java | 4 +- ...onPublishingActionFacetForActionAnnotation.java | 4 +- ...blishingPropertyFacetForPropertyAnnotation.java | 4 +- .../facets/object/callbacks/CallbackFacet.java | 3 +- .../choices/ChoicesFacetFromBoundedAbstract.java | 2 +- .../object/choices/enums/ChoicesFacetFromEnum.java | 2 +- .../ImmutableFacetForDomainObjectAnnotation.java | 4 +- ...gePublishingFacetForDomainObjectAnnotation.java | 4 +- ...ObjectLayoutAnnotationUsingCssClassUiEvent.java | 5 +- .../DomainObjectLayoutFacetFactory.java | 13 +- ...mainObjectLayoutAnnotationUsingIconUiEvent.java | 5 +- ...inObjectLayoutAnnotationUsingLayoutUiEvent.java | 5 +- .../PagedFacetForDomainObjectLayoutAnnotation.java | 12 +- ...agedFacetOverriddenByDataTablesDecoration.java} | 17 +- ...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 4 +- .../DomainObjectLayoutTableDecorationFacet.java | 71 + ...nObjectLayoutTableDecorationFacetAbstract.java} | 16 +- ...ationFacetForDomainObjectLayoutAnnotation.java} | 12 +- ...rDomainObjectLayoutAnnotationAsConfigured.java} | 12 +- ...bleDecorationFacetForDomainObjectLayoutXml.java | 61 + ...youtTableDecorationFacetFromConfiguration.java} | 12 +- .../facets/object/entity/EntityFacet.java | 109 +- .../object/entity/_EntityFacetForTesting.java | 11 +- .../metamodel/facets/object/paged/PagedFacet.java | 14 - .../ident/TitleFacetFromProjectionFacet.java | 2 +- .../facets/object/title/TitleRenderRequest.java | 17 +- .../annotation/TitleFacetViaTitleAnnotation.java | 2 +- .../facets/object/value/CompositeValueUpdater.java | 2 +- .../facets/object/value/ValueFacetAbstract.java | 10 +- .../facets/object/value/ValueSerializer.java | 9 +- .../object/value/ValueSerializerDefault.java | 32 +- .../facets/object/viewmodel/ViewModelFacet.java | 9 - .../object/viewmodel/ViewModelFacetAbstract.java | 16 +- .../ViewModelFacetForViewModelInterface.java | 5 +- .../objectvalue/maxlen/MaxLengthFacetAbstract.java | 12 +- .../objectvalue/regex/RegExFacetAbstract.java | 2 +- .../typicallen/TypicalLengthFacetAbstract.java | 11 +- .../ActionParameterAutoCompleteFacetViaMethod.java | 4 +- .../ActionParameterChoicesFacetViaMethod.java | 4 +- ...ActionFacetForActionAnnotationAsConfigured.java | 4 +- .../depdef/ParameterDependentDefaultsFacet.java | 13 +- .../ParameterDependentDefaultsFacetAbstract.java | 6 +- ...pendentDefaultsFacetForParameterAnnotation.java | 4 +- ...terDependentDefaultsFacetFromConfiguration.java | 4 +- .../accessor/PropertyAccessorFacetViaAccessor.java | 4 +- .../method/PropertyChoicesFacetViaMethod.java | 6 +- .../metamodel/inspect/Object_inspectMetamodel.java | 24 +- .../core/metamodel/inspect/model/ActionNode.java | 13 +- .../{FacetGroupNode.java => AnnotationNode.java} | 25 +- .../metamodel/inspect/model/AnnotationNode.svg | 83 + .../metamodel/inspect/model/CollectionNode.java | 13 +- .../metamodel/inspect/model/FacetAttrNode.java | 6 + .../metamodel/inspect/model/FacetGroupNode.java | 10 +- .../core/metamodel/inspect/model/FacetNode.java | 30 +- .../isis/core/metamodel/inspect/model/MMNode.java | 71 +- .../metamodel/inspect/model/MMNodeFactory.java | 9 + .../metamodel/inspect/model/MMTreeAdapter.java | 6 +- .../core/metamodel/inspect/model/MemberNode.java | 6 + .../metamodel/inspect/model/ParameterNode.java | 13 +- .../core/metamodel/inspect/model/PropertyNode.java | 13 +- .../core/metamodel/inspect/model/TypeNode.java | 16 +- .../isis/core/metamodel/inspect/model/icons.html | 2 + .../managed/ActionInteractionHead.java | 2 +- .../interactions/managed/ManagedAction.java | 6 +- .../interactions/managed/ManagedMember.java | 9 +- .../managed/ParameterNegotiationModel.java | 18 +- .../managed/PropertyNegotiationModel.java | 3 +- .../interactions/managed/_BindingUtil.java | 6 +- .../interactions/managed/nonscalar/DataRow.java | 3 +- .../managed/nonscalar/DataTableModel.java | 5 +- .../isis/core/metamodel/object/Bookmarkable.java | 88 + .../isis/core/metamodel/object/ManagedObject.java | 345 +- .../isis/core/metamodel/object/ManagedObjects.java | 82 +- .../core/metamodel/object/MmAssertionUtil.java | 54 +- .../isis/core/metamodel/object/MmEntityUtil.java | 133 +- .../MmSpecUtil.java} | 32 +- .../isis/core/metamodel/object/MmTitleUtil.java | 19 +- .../core/metamodel/object/MmVisibilityUtil.java | 2 +- .../isis/core/metamodel/object/ProtoObject.java | 59 + .../core/metamodel/object/_InternalTitleUtil.java | 16 +- .../core/metamodel/object/_ManagedObjectEmpty.java | 29 +- .../object/_ManagedObjectEntityBookmarked.java | 157 + .../object/_ManagedObjectEntityDetached.java | 72 + .../object/_ManagedObjectEntityHybrid.java | 169 + ...edObjectEmpty.java => _ManagedObjectMixin.java} | 56 +- ...ecifiedLegacy.java => _ManagedObjectOther.java} | 41 +- .../metamodel/object/_ManagedObjectPacked.java | 26 +- ...ObjectValue.java => _ManagedObjectService.java} | 43 +- .../metamodel/object/_ManagedObjectSpecified.java | 74 +- .../object/_ManagedObjectUnspecified.java | 30 +- .../core/metamodel/object/_ManagedObjectValue.java | 21 +- .../metamodel/object/_ManagedObjectViewmodel.java | 160 + .../object/_ManagedObjectWithBookmark.java | 174 - .../object/_ManagedObjectWithEagerSpec.java | 74 - .../isis/core/metamodel/object/_Refetchable.java} | 11 +- .../metamodel/object/_RefreshableViewmodel.java | 29 +- .../metamodel/objectmanager/ObjectBookmarker.java} | 28 +- .../metamodel/objectmanager/ObjectBulkLoader.java | 121 + ...tor_builtinHandlers.java => ObjectCreator.java} | 31 +- .../core/metamodel/objectmanager/ObjectLoader.java | 154 + .../metamodel/objectmanager/ObjectManager.java | 165 +- .../objectmanager/ObjectManagerDefault.java | 63 +- .../objectmanager/create/ObjectCreator.java | 74 - .../objectmanager/detach/ObjectDetacher.java | 57 - .../detach/ObjectDetacher_builtinHandlers.java | 109 - .../objectmanager/identify/ObjectBookmarker.java | 53 - .../identify/ObjectBookmarker_builtinHandlers.java | 204 - .../metamodel/objectmanager/load/ObjectLoader.java | 71 - .../load/ObjectLoader_builtinHandlers.java | 221 - .../objectmanager/memento/ObjectMemento.java | 29 +- .../memento/ObjectMementoCollection.java | 4 +- .../memento/ObjectMementoForEmpty.java | 5 +- .../memento/ObjectMementoForScalar.java | 158 + .../objectmanager/memento/ObjectMemorizer.java | 139 - .../memento/ObjectMemorizer_builtinHandlers.java | 81 - .../objectmanager/memento/_Recreatable.java | 69 + .../objectmanager/memento/_RecreatableLookup.java | 59 + ...tMementoService.java => _RecreatableValue.java} | 34 +- .../objectmanager/query/ObjectBulkLoader.java | 68 - .../query/ObjectBulkLoader_builtinHandlers.java | 130 - .../objectmanager/refresh/ObjectRefresher.java | 63 - .../refresh/ObjectRefresher_builtinHandlers.java | 107 - .../objectmanager/serialize/ObjectSerializer.java | 128 - .../ObjectSerializer_builtinHandlers.java | 113 - .../ClassSubstitutorForCollections.java | 33 +- .../ClassSubstitutorForDomainObjects.java | 6 +- .../services/grid/GridSystemServiceAbstract.java | 13 + .../Util.java => message/MessageBroker.java} | 32 +- .../services/metamodel/MetaModelAnnotator.java | 111 + .../services/metamodel/MetaModelExporter.java | 231 +- .../metamodel/MetaModelServiceDefault.java | 17 +- .../ShadowedFactetAttributeAnnotator.java | 97 + .../services/metamodel/TitleAnnotator.java | 127 + .../core/metamodel/services/metamodel/_Util.java | 153 + .../objectlifecycle/ObjectLifecyclePublisher.java | 6 +- .../services/registry/ServiceRegistryDefault.java | 5 +- .../schema/SchemaValueMarshallerAbstract.java | 12 +- .../services/title/TitleServiceDefault.java | 4 +- .../spec/ElementSpecificationProvider.java | 44 - .../HasObjectSpecification.java} | 44 +- .../isis/core/metamodel/spec/Hierarchical.java | 5 + .../core/metamodel/spec/ObjectSpecification.java | 36 +- .../core/metamodel/spec/TypeOfAnyCardinality.java | 185 + .../spec/feature/ObjectActionParameter.java | 3 +- .../metamodel/spec/feature/OneToManyFeature.java | 13 +- .../specloader/SpecificationLoaderDefault.java | 19 +- .../specloader/specimpl/FacetedMethodsBuilder.java | 11 +- .../specloader/specimpl/ObjectActionDefault.java | 4 +- .../specloader/specimpl/ObjectMemberAbstract.java | 2 +- .../specimpl/ObjectSpecificationAbstract.java | 49 +- .../specimpl/OneToManyActionParameterDefault.java | 18 +- .../specimpl/OneToManyAssociationDefault.java | 19 +- .../specimpl/OneToManyAssociationMixedIn.java | 4 +- .../specimpl/OneToOneAssociationDefault.java | 6 +- .../specimpl/dflt/ObjectSpecificationDefault.java | 68 +- .../apache/isis/core/metamodel/util/Facets.java | 24 +- .../core/metamodel/util/snapshot/XmlSnapshot.java | 32 +- .../facets/AbstractFacetFactoryJUnit4TestCase.java | 14 +- .../metamodel/facets/AbstractFacetFactoryTest.java | 7 +- .../action/ActionAnnotationFacetFactoryTest.java | 14 +- ...ctionAnnotationFacetFactoryTest_Invocation.java | 4 - .../ActionAnnotationFacetFactoryTest_TypeOf.java | 17 +- ...tationFacetFactoryTest_executionPublishing.java | 26 +- ...nLayoutXmlLayoutAnnotationFacetFactoryTest.java | 56 - ...MenuFacetFromDomainServiceFacetFactoryTest.java | 40 - .../CollectionAnnotationFacetFactoryTest.java | 27 +- ...ollectionAnnotationFacetFactoryTest_typeOf.java | 28 +- .../DomainObjectAnnotationFacetFactoryTest.java | 29 +- .../title/TitleAnnotationFacetFactoryTest.java | 117 +- .../facets/object/mixin/MixinIntendedAs.java | 2 - .../ParameterAnnotationFacetFactoryTest.java | 12 +- .../PropertyAnnotationFacetFactoryTest.java | 41 - .../value/JavaTimeValueSemanticsProviderTest.java | 11 +- .../ValueSemanticsProviderAbstractTestCase.java | 41 +- .../core/metamodel/object/ManagedObjectTest.java | 127 + .../metamodel/services/grid/GridLoadingTest.java | 4 +- .../metamodel/spec/TypeOfAnyCardinalityTest.java | 182 + .../specloader/SpecificationLoaderTest_array.java | 64 - .../SpecificationLoaderTest_collection.java | 66 - .../SpecificationLoaderTest_nonScalar.java | 126 + core/pom.xml | 6 + .../isis/core/runtime/IsisModuleCoreRuntime.java | 4 +- .../core/runtime/context/IsisAppCommonContext.java | 156 - ...ervice.java => IdStringifierLookupService.java} | 42 +- .../IsisModuleCoreRuntimeServices.java | 2 - .../bookmarks/BookmarkServiceDefault.java | 12 +- .../command/CommandDtoFactoryDefault.java | 4 +- .../command/SchemaValueMarshallerDefault.java | 27 +- .../executor/MemberExecutorServiceDefault.java | 63 +- .../factory/FactoryServiceDefault.java | 11 +- .../interaction/InteractionDtoFactoryDefault.java | 11 +- .../memento/ObjectMementoServiceDefault.java | 195 - .../runtimeservices/memento/_ObjectMemento.java | 608 - .../message/MessageServiceDefault.java | 2 +- .../publish/LifecycleCallbackNotifier.java | 35 +- .../publish/ObjectLifecyclePublisherDefault.java | 5 +- .../repository/RepositoryServiceDefault.java | 55 +- .../DelegatingInvocationHandlerDefault.java | 9 +- .../handlers/DomainObjectInvocationHandler.java | 10 +- .../xmlsnapshot/XmlSnapshotBuilder.java | 2 +- .../xmlsnapshot/XmlSnapshotServiceDefault.java | 2 +- .../isis/core/webapp/IsisModuleCoreWebapp.java | 5 +- .../webapp/wicket/jpa/DemoAppWicketJpa.java | 1 + .../integtest/CommandLog_IntegTestAbstract.java | 1 - .../commandlog/jpa/dom/CommandLogEntryPK.java | 5 + .../excel/applib/service/_CellMarshaller.java | 2 +- .../integtest/ExecutionLog_IntegTestAbstract.java | 6 +- .../executionlog/jpa/dom/ExecutionLogEntryPK.java | 7 + .../jdo/dom/ExecutionOutboxEntryPK.java | 5 + .../jpa/dom/ExecutionOutboxEntryPK.java | 6 + .../jpa/integtests/AuditTrail_IntegTest.java | 13 +- .../spiimpl/SessionSubscriberForSessionLog.java | 3 +- .../sessionlog/jpa/dom/SessionLogEntryPK.java | 25 +- .../ui/components/ExcelFileModel.java | 2 +- .../wkt/viewer/EventProviderAbstract.java | 10 +- .../wkt/viewer/FullCalendarWithEventHandling.java | 20 +- extensions/vw/pdfjs/wicket/integration/pom.xml | 2 +- .../pdfjs/wkt/integration/PdfJsVersion.java | 2 +- .../ListeningMarkupPanelFactoriesForWicket.java | 4 +- .../graphql/viewer/source/ObjectTypeFactory.java | 2 +- .../graphql/viewer/source/QueryFieldFactory.java | 23 +- .../viewer/graphql/viewer/source/TypeMapper.java | 2 +- .../graphql/viewer/source/EndToEnd_IntegTest.java | 3 +- .../ui/components/collections/TableViewFx.java | 2 +- incubator/viewers/vaadin/.gitignore | 1 + .../viewer/vaadin/model/decorator/Decorators.java | 4 +- .../vaadin/ui/auth/AuthSessionStoreUtil.java | 3 +- .../viewer/vaadin/ui/binding/BindingsVaa.java | 7 +- .../vaadin/ui/components/blob/BlobField.java | 4 +- .../vaadin/ui/components/clob/ClobField.java | 4 +- .../ui/components/collection/TableViewVaa.java | 2 +- .../vaadin/ui/components/markup/MarkupField.java | 4 +- .../vaadin/ui/components/temporal/DateField.java | 4 +- .../viewer/vaadin/ui/pages/main/MainViewVaa.java | 11 +- .../ui/pages/main/MainView_createHeader.java | 6 +- .../vaadin/ui/pages/main/MenuBuilderVaa.java | 4 +- .../viewer/vaadin/ui/pages/main/TabUtil.java | 13 +- incubator/viewers/vaadin/ui/vite.config.ts | 9 + .../changetracking/EntityChangeTrackerDefault.java | 4 +- .../changetracking/JdoLifecycleListener.java | 44 +- .../jdo/datanucleus/changetracking/_Utils.java | 76 +- .../entities/DnEntityStateProvider.java | 13 +- .../entities/DnObjectProviderForIsis.java | 56 +- .../jdosupport/JdoSupportServiceDefault.java | 19 +- .../metamodel/facets/entity/JdoEntityFacet.java | 141 +- .../testing/AbstractFacetFactoryTest.java | 6 +- .../jpa/applib/integration/IsisEntityListener.java | 20 +- .../persistence/jpa/eclipselink/inject/_Util.java | 23 +- .../jpa/integration/entity/JpaEntityFacet.java | 97 +- .../integration/entity/JpaEntityFacetFactory.java | 2 +- pom.xml | 2 +- .../testdomain/rest/DomainObjectResourceTest.java | 4 +- regressiontests/stable-domainmodel/pom.xml | 16 + .../apache/isis/testdomain/domainmodel/.gitignore | 2 + .../domainmodel/AnnotationSyntesizerTest.java | 11 +- .../DomainModelTest_usingGoodDomain.java | 60 +- .../domainmodel/MetaModelRegressionTest.java | 68 +- .../MetaModelRegressionTest.verify.approved.xml | 26968 +++++++++++++++++++ .../src/test/resources/metamodel.xml.zip | Bin 102627 -> 0 bytes .../testdomain/interact/SimulatedUiChoices.java | 10 +- .../testdomain/interact/SimulatedUiComponent.java | 2 +- .../integtest/Layout_Counter_IntegTest.java | 10 +- .../integtest/Layout_SimpleObject_IntegTest.java | 16 +- .../domainmodel/jdo/DomainModelTest.java | 3 +- .../injecting/jdo/JdoEntityInjectingTest.java | 2 +- .../persistence/jpa/JpaBootstrappingTest.java | 6 +- .../JpaGeneratedLongIdEntityLifecycleTest.java | 13 +- ...JpaNonGeneratedStringIdEntityLifecycleTest.java | 15 +- .../springdata/SpringDataJpaBootstrappingTest.java | 3 +- .../isis/testdomain/value/ValueSemanticsTest.java | 2 +- .../testdomain/value/ValueSemanticsTester.java | 4 +- .../viewers/common/wkt/InteractionTestWkt.java | 4 +- .../viewers/jdo/wkt/InteractionTestJdoWkt.java | 90 +- .../testdomain/viewers/jpa/wkt/TestAppJpaWkt.java | 3 +- .../viewers/jpa/wkt/InteractionTestJpaWkt.java | 114 +- .../testdomain/conf/Configuration_usingWicket.java | 145 +- .../isis/testdomain/jdo/entities/JdoBook.java | 3 +- .../isis/testdomain/jpa/entities/JpaBook.java | 37 +- .../testdomain/model/good/ProperElementTypeVm.java | 36 +- ...ypeVm.java => ProperElementTypeVmAbstract.java} | 36 +- .../model/good/ProperMixinAsReturnType.java | 104 + .../publishing/PublishingTestFactoryJdo.java | 2 +- .../publishing/PublishingTestFactoryJpa.java | 2 +- .../interaction/DomainObjectTesterFactory.java | 11 +- starters/pom.xml | 2 +- .../applib/IsisIntegrationTestAbstract.java | 12 +- .../tooling/javamodel/test/ProjectSamples.java | 2 +- tooling/pom.xml | 2 +- .../commons/model/action/ActionFormUiModel.java | 2 +- .../binding/BindingConverterForManagedObject.java | 2 +- .../restfulobjects/rendering/IResourceContext.java | 2 +- .../domainobjects/CollectionSemantics.java | 4 +- .../domainobjects/DomainObjectLinkTo.java | 2 +- .../domainobjects/DomainObjectReprRenderer.java | 4 +- .../domainobjects/DomainServiceLinkTo.java | 4 +- .../ObjectCollectionReprRenderer.java | 2 +- .../domainobjects/ScalarValueReprRenderer.java | 2 +- ...entNegotiationServiceForRestfulObjectsV1_0.java | 5 +- .../service/swagger/internal/Generation.java | 2 +- .../rendering/service/swagger/internal/_Util.java | 2 +- .../JsonValueEncoderServiceDefault.java | 6 +- .../viewer/resources/HomePageReprRenderer.java | 2 +- .../viewer/resources/ResourceAbstract.java | 2 +- .../viewer/resources/_EndpointLogging.java | 2 +- .../wicket/model/modelhelpers/WhereAmIHelper.java | 10 +- .../viewer/wicket/model/models/AboutModel.java | 7 +- .../wicket/model/models/ActionModelImpl.java | 6 +- .../wicket/model/models/BookmarkedPagesModel.java | 6 +- .../viewer/wicket/model/models/BooleanModel.java | 2 +- .../wicket/model/models/ChainingObjectModel.java | 6 +- .../wicket/model/models/CommonContextModel.java | 10 +- .../wicket/model/models/EntityCollectionModel.java | 4 +- .../models/EntityCollectionModelAbstract.java | 6 +- .../models/EntityCollectionModelStandalone.java | 2 +- .../viewer/wicket/model/models/EntityModel.java | 20 +- .../wicket/model/models/FormExecutorContext.java | 4 +- .../wicket/model/models/ManagedObjectModel.java | 24 +- .../viewer/wicket/model/models/ModelAbstract.java | 17 +- .../wicket/model/models/ObjectAdapterModel.java | 4 +- .../wicket/model/models/ScalarConvertingModel.java | 2 +- .../wicket/model/models/ScalarModelWithChoice.java | 12 +- .../model/models/ScalarModelWithMultiChoice.java | 18 +- .../model/models/ScalarModelWithSingleChoice.java | 5 +- .../wicket/model/models/ScalarParameterModel.java | 8 +- .../wicket/model/models/ScalarPropertyModel.java | 8 +- .../wicket/model/models/ScalarUnwrappingModel.java | 2 +- .../wicket/model/models/ServiceActionsModel.java | 5 +- .../viewer/wicket/model/models/ValueModel.java | 12 +- .../isis/viewer/wicket/model/models/VoidModel.java | 5 +- .../viewer/wicket/model/models/WelcomeModel.java | 7 +- .../models/interaction/BookmarkedObjectWkt.java | 119 +- .../interaction/HasBookmarkedOwnerAbstract.java | 2 +- .../interaction/act/ParameterUiModelWkt.java | 10 +- .../interaction/prop/PropertyUiModelWkt.java | 10 +- .../viewer/wicket/model/util/ComponentHintKey.java | 8 +- .../wicket/model/util/PageParameterUtils.java | 25 +- .../isis/viewer/wicket/model/util/WktContext.java | 22 +- .../model/value/ValueSemanticsModelAbstract.java | 10 +- .../wicket/model/models/EntityModel_hintsTest.java | 11 +- viewers/wicket/ui/pom.xml | 37 +- .../viewer/wicket/ui/ComponentFactoryAbstract.java | 4 +- .../viewer/wicket/ui/IsisModuleViewerWicketUi.java | 1 + .../ActionResultResponseHandlingStrategy.java | 14 +- .../actionresponse/ActionResultResponseType.java | 21 +- .../wicket/ui/app/logout/LogoutHandlerWkt.java | 2 +- .../viewer/wicket/ui/components/LabelBase.java | 12 +- .../wicket/ui/components/WebComponentBase.java | 12 +- .../wicket/ui/components/about/AboutPanel.java | 2 +- .../ui/components/about/AboutPanelFactory.java | 2 +- .../ui/components/about/JarManifestModel.java | 28 +- .../ui/components/actioninfo/ActionInfoPanel.java | 2 +- .../entityactions/LinkAndLabelFactory.java | 2 +- .../actionmenu/serviceactions/CssMenuItem.java | 2 +- .../actionmenu/serviceactions/MenuActionPanel.java | 4 +- .../serviceactions/ServiceActionUtil.java | 10 +- .../serviceactions/ServiceActionsPanelFactory.java | 2 +- .../serviceactions/TertiaryMenuPanelFactory.java | 2 +- .../bookmarkedpages/BookmarkedPagesPanel.java | 2 +- .../ui/components/collection/CollectionPanel.java | 2 +- .../CollectionContentsAsAjaxTablePanel.java | 4 +- .../ajaxtable/PrototypingMessageProvider.java | 6 +- .../ajaxtable/columns/GenericColumnAbstract.java | 10 +- .../ajaxtable/columns/GenericPropertyColumn.java | 6 +- .../ajaxtable/columns/GenericTitleColumn.java | 8 +- .../ajaxtable/columns/GenericToggleboxColumn.java | 4 +- .../icons/CollectionContentsAsIconsPanel.java | 2 +- .../CollectionContentsMultipleViewsPanel.java | 2 +- .../summary/CollectionContentsAsSummary.java | 2 +- .../entity/collection/EntityCollectionPanel.java | 7 +- .../entity/icontitle/EntityIconAndTitlePanel.java | 10 +- .../wicket/ui/components/footer/FooterPanel.java | 8 +- .../wicket/ui/components/header/HeaderPanel.java | 2 +- .../ui/components/layout/bs/BSGridPanel.java | 2 +- .../wicket/ui/components/layout/bs/col/Col.java | 2 +- .../wicket/ui/components/layout/bs/row/Row.java | 2 +- .../components/layout/bs/tabs/TabGroupPanel.java | 5 +- .../ui/components/layout/bs/tabs/TabPanel.java | 2 +- .../PropertyEditPromptHeaderPanel.java | 2 +- .../components/scalars/ScalarPanelAbstract2.java | 3 +- .../viewer/wicket/ui/components/scalars/_Util.java | 5 +- .../datepicker/TextFieldWithDateTimePicker.java | 11 +- .../scalars/reference/ReferencePanel.java | 2 +- .../StandaloneCollectionPanel.java | 8 +- .../components/tree/IsisToWicketTreeAdapter.java | 36 +- .../ui/components/value/StandaloneValuePanel.java | 2 +- .../ui/components/welcome/WelcomePanelFactory.java | 2 +- .../widgets/breadcrumbs/BreadcrumbModel.java | 6 +- .../widgets/breadcrumbs/BreadcrumbPanel.java | 17 +- .../entitysimplelink/EntityLinkSimplePanel.java | 14 +- .../widgets/linkandlabel/ActionLink.java | 17 +- .../linkandlabel/LinkAndLabelFactoryAbstract.java | 2 +- .../ui/components/widgets/select2/Select2.java | 12 +- .../select2/providers/ChoiceProviderAbstract.java | 28 +- .../ChoiceProviderAbstractForScalarModel.java | 23 +- .../providers/ChoiceProviderForReferences.java | 14 +- .../select2/providers/ChoiceProviderForValues.java | 3 +- .../widgets/themepicker/ThemeChooser.java | 4 +- .../viewer/wicket/ui/errors/ExceptionModel.java | 18 +- .../viewer/wicket/ui/errors/JGrowlBehaviour.java | 24 +- .../isis/viewer/wicket/ui/errors/JGrowlUtil.java | 2 +- .../isis/viewer/wicket/ui/pages/PageAbstract.java | 37 +- .../isis/viewer/wicket/ui/pages/WebPageBase.java | 33 +- .../accmngt/AccountManagementPageAbstract.java | 8 +- .../ui/pages/accmngt/EmailAvailableValidator.java | 12 +- .../accmngt/SuccessFeedbackCookieManager.java | 3 +- .../pages/accmngt/UsernameAvailableValidator.java | 10 +- .../password_reset/PasswordResetEmailPanel.java | 4 +- .../accmngt/password_reset/PasswordResetPage.java | 2 +- .../accmngt/password_reset/PasswordResetPanel.java | 2 +- .../ui/pages/accmngt/register/RegisterPanel.java | 2 +- .../pages/accmngt/signup/RegistrationFormPage.java | 2 +- .../accmngt/signup/RegistrationFormPanel.java | 4 +- .../bootstrap/css/bootstrap-overrides-all-v2.css | 18 +- .../DatatablesCssBootstrap5ReferenceWkt.java | 47 +- .../datatables/DatatablesCssReferenceWkt.java | 35 +- .../pages/common/datatables/DatatablesDotNet.java | 21 +- ...DatatablesJavaScriptBootstrap5ReferenceWkt.java | 50 + .../DatatablesJavaScriptReferenceWkt.java | 50 + .../DatatablesJavaScriptResourceReferenceInit.java | 77 + .../common/datatables/dataTables.init.js.template | 14 +- .../common/viewer/js/jquery.isis.wicket.viewer.js | 7 +- .../viewer/wicket/ui/pages/entity/EntityPage.java | 8 +- .../viewer/wicket/ui/pages/error/ErrorPage.java | 2 +- .../isis/viewer/wicket/ui/pages/home/HomePage.java | 6 +- .../wicket/ui/pages/login/SignInPanelAbstract.java | 10 +- .../wicket/ui/pages/login/WicketSignInPage.java | 8 +- .../wicket/ui/pages/mmverror/MmvErrorPage.java | 8 +- .../isis/viewer/wicket/ui/panels/FormAbstract.java | 31 +- .../wicket/ui/panels/FormExecutorDefault.java | 32 +- .../isis/viewer/wicket/ui/panels/OkCancelForm.java | 4 +- .../viewer/wicket/ui/panels/PanelAbstract.java | 3 +- .../isis/viewer/wicket/ui/panels/PanelBase.java | 41 +- .../org/apache/isis/viewer/wicket/ui/util/Wkt.java | 9 +- .../isis/viewer/wicket/ui/util/WktDecorators.java | 4 +- .../viewer/wicket/ui/validation/ValidatorBase.java | 12 +- .../ui/ComponentFactoryAbstractTest_init.java | 32 +- .../choices/ChoiceProviderForReferencesTest.java | 5 +- .../choices/ChoiceProviderForValuesTest.java | 8 +- .../choices/ChoiceProviderTestAbstract.java | 19 +- .../AuthenticatedWebSessionForIsis.java | 30 +- .../integration/ConverterForObjectAdapter.java | 23 +- .../ConverterForObjectAdapterMemento.java | 40 +- .../viewer/integration/WebRequestCycleForIsis.java | 44 +- .../ComponentFactoryRegistryDefault.java | 7 +- .../viewer/services/DeepLinkServiceWicket.java | 2 +- .../IsisWicketAjaxRequestListenerUtil.java | 4 +- .../viewer/wicketapp/IsisWicketApplication.java | 17 +- .../wicket/viewer/wicketapp/_PageFactory.java | 6 +- .../viewer/wicketapp/config/JQueryInitWkt.java | 4 +- ...uthenticatedWebSessionForIsis_Authenticate.java | 35 +- .../AuthenticatedWebSessionForIsis_SignIn.java | 23 +- ...uthenticatedWebSessionForIsis_TestAbstract.java | 8 +- .../wicketapp/IsisWicketApplication_Defaults.java | 6 +- .../wicketapp/IsisWicketApplication_Pages.java | 2 +- 563 files changed, 35816 insertions(+), 7977 deletions(-)
