This is an automated email from the ASF dual-hosted git repository. joergrade pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit b7670c7c2a822afaf142a8477f449271a806e8f2 Merge: bd837ed 3bef297 Author: Jörg Rade <[email protected]> AuthorDate: Wed Oct 20 18:09:13 2021 +0200 Merge remote-tracking branch 'origin/master' .github/dependabot.yml | 14 +- .../ci-build-artifacts-no-push-gradle.yml | 8 +- .../workflows/ci-build-artifacts-no-push-maven.yml | 6 +- .github/workflows/ci-build-site-no-push.yml | 6 +- antora/supplemental-ui/img/home/favicon.png | Bin 1597 -> 1741 bytes ...csProvider.java => ValueSemanticsAbstract.java} | 18 +- .../applib/adapters/ValueSemanticsProvider.java | 13 + .../apache/isis/applib/adapters/package-info.java | 2 +- .../applib/services/bookmark/BookmarkService.java | 13 +- .../exceprecog/ExceptionRecognizerAbstract.java | 7 +- .../java/org/apache/isis/applib/util/Enums.java | 40 +- .../apache/isis/commons/binding/Observable.java | 4 + .../org/apache/isis/commons/btree/Compound.java | 147 +++++++ .../org/apache/isis/commons/btree/FunCompound.java | 203 +++++++++ .../apache/isis/commons/internal/base/_Either.java | 42 +- .../apache/isis/commons/internal/base/_Files.java | 16 +- .../isis/commons/internal/base/_NullSafe.java | 6 + .../isis/commons/internal/base/_Strings.java | 34 +- .../apache/isis/commons/internal/base/_Text.java | 34 +- .../internal/binding/_BindableAbstract.java | 17 +- .../isis/commons/internal/binding/_Bindables.java | 17 +- .../commons/internal/binding/_Observables.java | 30 +- .../commons/internal/ioc/_IocContainer_Spring.java | 12 +- .../isis/commons/internal/reflection/_Reflect.java | 28 ++ .../apache/isis/commons/btree/CompoundTest.java | 171 ++++++++ .../core/config/beans/IsisBeanTypeClassifier.java | 30 +- ...mpl.java => IsisBeanTypeClassifierDefault.java} | 16 +- .../core/config/beans/IsisBeanTypeRegistry.java | 6 +- .../beans/IsisComponentScanInterceptorImpl.java | 6 +- .../config/valuetypes/ValueSemanticsRegistry.java | 20 +- .../core/metamodel/IsisModuleCoreMetamodel.java | 55 ++- .../_testing/MetaModelContext_forTesting.java | 21 + .../_testing/ObjectMementoService_forTesting.java} | 34 +- .../_testing/ServiceRegistry_forTesting.java | 25 +- .../isis/core/metamodel/facets/ActionSupport.java | 19 +- .../core/metamodel/facets/DomainEventHelper.java | 2 +- .../isis/core/metamodel/facets/FacetFactory.java | 7 +- .../isis/core/metamodel/facets/FacetedMethod.java | 25 +- .../metamodel/facets/FacetedMethodParameter.java | 16 +- .../core/metamodel/facets/ParameterSupport.java | 57 +-- ...nChoicesForCollectionParameterFacetFactory.java | 2 +- .../action/invocation/ActionInvocationFacet.java | 2 +- ...ctionInvocationFacetForDomainEventAbstract.java | 8 +- .../actions/action/invocation/CommandUtil.java | 4 +- .../CollectionAccessorFacetViaAccessor.java | 4 +- .../metamodel/facets/jaxb/JaxbFacetFactory.java | 4 +- ...cesFacetEnum.java => ChoicesFacetFromEnum.java} | 4 +- ...ctory.java => ChoicesFacetFromEnumFactory.java} | 21 +- ...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 6 +- .../object/encodeable/EncodableFacetAbstract.java | 90 ---- .../annotcfg/EncodableFacetFromConfiguration.java | 32 -- ...ObjectFacetDeclarativeInitializingAbstract.java | 6 +- .../annotation/TitleAnnotationFacetFactory.java | 4 +- .../annotation/TitleFacetViaTitleAnnotation.java | 6 +- .../title/parser/TitleFacetUsingValueFacet.java | 11 +- .../metamodel/facets/object/value/ValueFacet.java | 29 +- .../facets/object/value/ValueFacetAbstract.java | 63 ++- .../facets/object/value/ValueFacetSimple.java | 31 -- ...ionOrAnyMatchingValueSemanticsFacetFactory.java | 130 +++--- .../ValueFacetUsingSemanticsProviderFactory.java | 113 ----- .../ValueSemanticsProviderAndFacetAbstract.java | 266 ----------- .../defaults/ActionParameterDefaultsFacet.java | 9 +- .../ActionParameterDefaultsFacetViaMethod.java | 14 +- ...ActionParameterSupportFacetFactoryAbstract.java | 2 +- ...icalLengthFacetOnParameterInferredFromType.java | 7 +- .../PropertyOrCollectionAccessorFacet.java | 2 +- .../PropertyOrCollectionAccessorFacetAbstract.java | 12 +- .../accessor/PropertyAccessorFacetViaAccessor.java | 4 +- .../EntityPropertyChangePublishingPolicyFacet.java | 2 +- ...tySetterOrClearFacetForDomainEventAbstract.java | 2 +- .../facets/schema/IsisSchemaMetaModelRefiner.java | 55 --- .../facets/schema/IsisSchemaValueTypeProvider.java | 46 -- .../facets/schema/chg/ChangesDtoValueFacet.java | 29 -- ...DtoValueFacetUsingSemanticsProviderFactory.java | 49 --- .../chg/v2/ChangesDtoValueSemanticsProvider.java | 87 ---- .../facets/schema/cmd/CommandDtoValueFacet.java | 29 -- ...DtoValueFacetUsingSemanticsProviderFactory.java | 49 --- .../cmd/v2/CommandDtoValueSemanticsProvider.java | 86 ---- .../schema/ixn/InteractionDtoValueFacet.java | 29 -- ...DtoValueFacetUsingSemanticsProviderFactory.java | 49 --- .../v2/InteractionDtoValueSemanticsProvider.java | 86 ---- ...iveValueFacetUsingSemanticsProviderFactory.java | 46 -- .../chars/CharValueSemanticsProviderAbstract.java | 90 ---- ...perValueFacetUsingSemanticsProviderFactory.java | 46 -- .../chars/CharWrapperValueSemanticsProvider.java | 30 -- .../facets/value/date/DateValueFacet.java | 32 -- .../datejodalocal/JodaLocalDateValueFacet.java | 32 -- ...ateValueFacetUsingSemanticsProviderFactory.java | 49 --- ...ateValueFacetUsingSemanticsProviderFactory.java | 49 --- .../value/datetimejoda/JodaDateTimeValueFacet.java | 32 -- ...imeValueFacetUsingSemanticsProviderFactory.java | 49 --- .../JodaLocalDateTimeValueFacet.java | 32 -- ...imeValueFacetUsingSemanticsProviderFactory.java | 49 --- ...ateValueFacetUsingSemanticsProviderFactory.java | 50 --- .../doubles/DoubleFloatingPointValueFacet.java | 29 -- ...iveValueFacetUsingSemanticsProviderFactory.java | 46 -- .../DoublePrimitiveValueSemanticsProvider.java | 42 -- .../DoubleValueSemanticsProviderAbstract.java | 114 ----- ...perValueFacetUsingSemanticsProviderFactory.java | 46 -- .../DoubleWrapperValueSemanticsProvider.java | 30 -- ...iveValueFacetUsingSemanticsProviderFactory.java | 46 -- .../FloatPrimitiveValueSemanticsProvider.java | 43 -- .../FloatValueSemanticsProviderAbstract.java | 110 ----- ...perValueFacetUsingSemanticsProviderFactory.java | 46 -- .../floats/FloatWrapperValueSemanticsProvider.java | 30 -- .../facets/value/temporal/TemporalAdjustUtil.java | 79 ---- ...ralValueFacetUsingSemanticsProviderFactory.java | 67 --- ...ateValueFacetUsingSemanticsProviderFactory.java | 36 -- ...imeValueFacetUsingSemanticsProviderFactory.java | 36 -- ...imeValueFacetUsingSemanticsProviderFactory.java | 36 -- ...imeValueFacetUsingSemanticsProviderFactory.java | 36 -- ...imeValueFacetUsingSemanticsProviderFactory.java | 36 -- ...imeValueFacetUsingSemanticsProviderFactory.java | 36 -- .../JodaLocalTimeValueFacetSimpleFactory.java | 53 --- ...imeValueFacetUsingSemanticsProviderFactory.java | 50 --- ...ampValueFacetUsingSemanticsProviderFactory.java | 50 --- .../interactions/managed/ActionInteraction.java | 41 +- .../managed/ActionInteractionHead.java | 125 +++--- .../managed/CollectionInteraction.java | 19 +- .../interactions/managed/ManagedAction.java | 93 +++- .../interactions/managed/ManagedCollection.java | 14 +- .../interactions/managed/ManagedFeature.java | 11 +- .../interactions/managed/ManagedMember.java | 4 +- .../interactions/managed/ManagedParameter.java | 1 + .../interactions/managed/ManagedProperty.java | 6 +- .../interactions/managed/ManagedValue.java | 21 +- .../managed/MultiselectChoices.java} | 10 +- .../managed/ParameterNegotiationModel.java | 68 ++- .../interactions/managed/PropertyInteraction.java | 17 +- .../managed/PropertyNegotiationModel.java | 30 +- .../interactions/managed/_BindingUtil.java | 12 +- .../interactions/managed/nonscalar/DataColumn.java | 45 ++ .../interactions/managed/nonscalar/DataRow.java | 57 +++ .../managed/nonscalar/DataTableModel.java | 275 ++++++++++++ .../interactions/managed/nonscalar/_Debug.java | 30 +- .../metamodel/objectmanager/ObjectManager.java | 2 + .../objectmanager/ObjectManagerDefault.java | 27 +- .../objectmanager/create/ObjectCreator.java | 5 +- .../objectmanager}/memento/ObjectMemento.java | 8 +- .../memento/ObjectMementoCollection.java | 2 +- .../memento/ObjectMementoForEmpty.java | 2 +- .../memento/ObjectMementoService.java | 2 +- .../objectmanager/memento/ObjectMemorizer.java | 143 ++++++ .../memento/ObjectMemorizer_builtinHandlers.java | 76 ++++ .../ObjectSpecificationPostProcessorAbstract.java | 10 +- .../DeriveDescribedAsFromTypePostProcessor.java | 4 +- ...arameterChoicesFacetFromParentedCollection.java | 12 +- ...meterDefaultsFacetFromAssociatedCollection.java | 35 +- ...ectionParamDefaultsAndChoicesPostProcessor.java | 8 +- ...NavigationFacetFromHiddenTypePostProcessor.java | 4 +- .../DeriveDisabledFromImmutablePostProcessor.java | 2 +- ...iveChoicesFromExistingChoicesPostProcessor.java | 4 +- .../DeriveDefaultFromTypePostProcessor.java | 2 +- .../DeriveTypicalLengthFromTypePostProcessor.java | 4 +- .../dflt/ProgrammingModelFacetsJava11.java | 50 +-- .../ApplicationFeatureRepositoryDefault.java | 12 +- .../services/metamodel/MetaModelExporter.java | 6 +- .../isis/core/metamodel/spec/ManagedObject.java | 2 + .../isis/core/metamodel/spec/ManagedObjects.java | 63 ++- .../core/metamodel/spec/ObjectSpecification.java | 26 +- .../core/metamodel/spec/feature/ObjectAction.java | 30 +- .../spec/feature/ObjectActionParameter.java | 29 +- .../metamodel/spec/feature/ObjectAssociation.java | 9 +- .../spec/feature/ObjectAssociationContainer.java | 2 +- .../core/metamodel/spec/feature/ObjectFeature.java | 14 +- .../core/metamodel/spec/feature/ObjectMember.java | 50 +++ .../spec/feature/OneToManyAssociation.java | 57 ++- .../spec/feature/OneToOneAssociation.java | 2 +- .../specloader/SpecificationLoaderDefault.java | 38 +- .../specloader/facetprocessor/FacetProcessor.java | 8 +- .../specloader/specimpl/FacetedMethodsBuilder.java | 10 +- .../specloader/specimpl/ObjectActionDefault.java | 120 +++-- .../specloader/specimpl/ObjectActionMixedIn.java | 8 +- .../specimpl/ObjectActionParameterAbstract.java | 59 ++- .../specimpl/ObjectActionParameterContributee.java | 25 -- .../specimpl/ObjectAssociationAbstract.java | 18 +- .../specimpl/OneToManyActionParameterDefault.java | 8 +- .../specimpl/OneToManyAssociationDefault.java | 8 +- .../specimpl/OneToManyAssociationMixedIn.java | 4 +- .../specimpl/OneToOneActionParameterDefault.java | 8 +- .../specimpl/OneToOneAssociationDefault.java | 4 +- .../specimpl/OneToOneAssociationMixedIn.java | 2 +- .../specimpl/_MixedInMemberNamingStrategy.java | 2 +- .../specimpl/dflt/ObjectSpecificationDefault.java | 2 +- .../specimpl/dflt/_PropertiesAsColumns.java | 46 +- .../core/metamodel/util/snapshot/XmlSnapshot.java | 17 +- .../valuesemantics/BigDecimalValueSemantics.java | 15 +- .../valuesemantics/BigIntegerValueSemantics.java | 15 +- .../valuesemantics/BlobValueSemantics.java | 15 +- .../valuesemantics/BooleanValueSemantics.java | 19 +- .../BufferedImageValueSemantics.java | 15 +- .../valuesemantics/ByteValueSemantics.java | 19 +- ...emantics.java => ChangesDtoValueSemantics.java} | 48 +- ...Semantics.java => CharacterValueSemantics.java} | 71 +-- .../valuesemantics/ClobValueSemantics.java | 15 +- ...emantics.java => CommandDtoValueSemantics.java} | 48 +- ...lueSemantics.java => DoubleValueSemantics.java} | 70 +-- .../EnumValueSemanticsAbstract.java} | 156 ++++--- ...alueSemantics.java => FloatValueSemantics.java} | 70 +-- .../valuesemantics/IntValueSemantics.java | 19 +- ...tics.java => InteractionDtoValueSemantics.java} | 48 +- .../LocalResourcePathValueSemantics.java | 19 +- .../valuesemantics/LongValueSemantics.java | 19 +- .../valuesemantics/MarkupValueSemantics.java | 17 +- .../valuesemantics/PasswordValueSemantics.java | 15 +- .../valuesemantics/ShortValueSemantics.java | 19 +- .../valuesemantics/StringValueSemantics.java | 15 +- .../valuesemantics/TreeNodeValueSemantics.java | 16 +- .../valuesemantics/URLValueSemantics.java | 19 +- .../valuesemantics/UUIDValueSemantics.java | 19 +- .../temporal/LocalDateTimeValueSemantics.java} | 37 +- .../temporal/LocalDateValueSemantics.java} | 37 +- .../temporal/LocalTimeValueSemantics.java} | 37 +- .../temporal/OffsetDateTimeValueSemantics.java} | 38 +- .../temporal/OffsetTimeValueSemantics.java} | 37 +- .../temporal/TemporalAdjust.java | 59 ++- .../temporal/TemporalValueSemantics.java} | 18 +- .../temporal/TemporalValueSemanticsProvider.java} | 105 ++--- .../temporal/ZonedDateTimeValueSemantics.java} | 37 +- .../legacy/JavaSqlDateValueSemantics.java} | 63 ++- .../legacy/JavaSqlTimeStampValueSemantics.java} | 44 +- .../legacy/JavaSqlTimeValueSemantics.java} | 46 +- .../legacy/JavaUtilDateValueSemantics.java} | 57 +-- .../LegacyTemporalValueSemanticsAbstract.java} | 165 ++++--- .../legacy/joda/JodaDateTimeValueSemantics.java} | 41 +- .../joda/JodaLocalDateTimeValueSemantics.java} | 98 ++--- .../legacy/joda/JodaLocalDateValueSemantics.java} | 97 ++-- .../legacy/joda/JodaLocalTimeValueSemantics.java | 24 +- .../temporal/legacy/joda/_JodaFunctions.java} | 8 +- .../legacy/joda/_JodaLocalDateTimeUtil.java} | 47 +- .../temporal/legacy/joda/_JodaLocalDateUtil.java} | 13 +- .../valuetypes/ValueSemanticsRegistryDefault.java | 109 +++++ .../metamodel/valuetypes/ValueTypeDefinition.java | 47 -- .../metamodel/valuetypes/ValueTypeProvider.java | 29 -- .../valuetypes/ValueTypeProviderDefault.java | 53 --- .../valuetypes/ValueTypeProviderForBuiltin.java | 55 --- .../ValueTypeProviderForCollections.java | 47 -- .../metamodel/valuetypes/ValueTypeRegistry.java | 95 ---- .../facets/AbstractFacetFactoryJUnit4TestCase.java | 2 +- .../metamodel/facets/AbstractFacetFactoryTest.java | 8 +- .../actions/ActionMethodsFacetFactoryTest.java | 12 +- ...nnotationFacetFactoryTest_ActionInvocation.java | 6 +- .../facets/object/mixin/MixinIntendedAs.java | 4 +- ...eFacetAnnotationOrConfigurationFactoryTest.java | 106 ----- ...cetForParameterLayoutAnnotationFactoryTest.java | 2 +- ...cetForParameterLayoutAnnotationFactoryTest.java | 2 +- .../facets/param/name/ParameterNameFacetTest.java | 6 +- .../ParameterAnnotationFacetFactoryTest.java | 20 +- ...lableAnnotationOnParameterFacetFactoryTest.java | 8 +- ...RegExAnnotationOnParameterFacetFactoryTest.java | 4 +- ...ValidationDigitsAnnotationFacetFactoryTest.java | 2 +- .../BigDecimalValueSemanticsProviderTest.java | 2 +- .../value/BigIntValueSemanticsProviderTest.java | 2 +- .../value/BlobValueSemanticsProviderTest.java | 2 +- .../value/BooleanValueSemanticsProviderTest.java | 6 +- .../value/ByteValueSemanticsProviderTest.java | 2 +- .../value/CharacterValueSemanticsProviderTest.java | 12 +- .../value/ClobValueSemanticsProviderTest.java | 2 +- .../value/DoubleValueSemanticsProviderTest.java | 26 +- .../value/FloatValueSemanticsProviderTest.java | 12 +- .../value/IntValueSemanticsProviderTest.java | 2 +- .../JavaSqlDateValueSemanticsProviderTest.java | 16 +- .../JavaSqlTimeValueSemanticsProviderTest.java | 11 +- .../JavaUtilDateValueSemanticsProviderTest.java | 23 +- .../value/LongValueSemanticsProviderTest.java | 2 +- .../value/PasswordValueSemanticsProviderTest.java | 2 +- .../value/ShortValueSemanticsProviderTest.java | 2 +- .../value/StringValueSemanticsProviderTest.java | 2 +- .../ValueSemanticsProviderAbstractTestCase.java | 39 +- ...odaLocalDateTimeValueSemanticsProviderTest.java | 35 +- .../facets/value/temporal/TemporalAdjustTest.java | 54 +-- .../metamodel/MetaModelServiceDefaultTest.java | 19 +- .../services/title/TitleServiceDefaultTest.java | 8 +- ...ionParameterAbstractTest_getId_and_getName.java | 26 +- .../testspec/ObjectSpecificationStub.java | 9 +- core/pom.xml | 2 +- .../core/runtime/context/IsisAppCommonContext.java | 36 +- .../IsisModuleCoreRuntimeServices.java | 2 + .../bookmarks/BookmarkServiceDefault.java | 44 +- .../command/CommandDtoFactoryDefault.java | 4 +- .../memento/ObjectMementoServiceDefault.java | 51 ++- .../runtimeservices/memento/_ObjectMemento.java | 104 ++--- .../handlers/DomainObjectInvocationHandler.java | 16 +- .../manager/AuthenticationManager.java | 6 +- .../domain/actions/progmodel/depargs/DemoItem.java | 5 + .../progmodel/depargs/DependentArgsActionDemo.java | 3 +- .../DependentArgsActionDemo_useDefault.java | 8 +- .../jdo/ComplexNumberJdoValueSemantics.java | 16 +- .../jpa/ComplexNumberJpaValueSemantics.java | 16 +- .../javalang/strings/vm/JavaLangStringVm.java | 1 + .../static/images/apache-isis/logo-48x48.png | Bin 2622 -> 2875 bytes .../resources/static/images/apache-isis/logo.png | Bin 14160 -> 13687 bytes .../src/main/resources/static/images/favicon.png | Bin 1597 -> 1740 bytes .../main/java/demoapp/javafx/DemoAppJavaFx.java | 7 +- .../common/ui/custom/WhereInTheWorldPanel.java | 2 +- .../webapp/wicket/jpa/DemoAppWicketJpa.java | 3 + .../authenticator/AuthenticatorSecman.java | 4 +- .../TableColumnVisibilityServiceForSecman.java | 2 +- .../userreg/UserRegistrationServiceForSecman.java | 3 +- .../secman/shiro/AuthInfoForApplicationUser.java | 8 +- .../secman/shiro/PrincipalForApplicationUser.java | 6 +- .../ui/components/CollectionContentsAsExcel.java | 9 +- .../ui/components/ExcelFileModel.java | 59 ++- .../value/CalendarEventSemanticsProvider.java | 15 +- .../ui/component/CalendaredCollectionAbstract.java | 13 +- .../CalendaredCollectionFactoryAbstract.java | 2 +- .../ui/component/EventProviderAbstract.java | 5 +- .../component/FullCalendarWithEventHandling.java | 2 +- .../CalendarableCollectionAsFullCalendar.java | 3 +- .../CalendarEventableCollectionAsFullCalendar.java | 3 +- .../wicket/pdfjs/applib/config/PdfJsConfig.java | 2 + .../pdfjs/ui/components/PdfJsViewerPanel.java | 16 +- .../viewer/javafx/model/binding/BindingsFx.java | 83 ++-- .../javafx/ui/components/UiComponentHandlerFx.java | 46 +- .../ui/components/collections/TableViewFx.java | 2 +- .../ui/components/number/NumberFieldFactory.java | 64 +-- .../javafx/ui/components/object/ObjectViewFx.java | 3 + .../components/temporal/TemporalFieldFactory.java | 89 ++-- .../ui/components/text/TextFieldFactory.java | 73 +--- .../viewer/vaadin/ui/binding/BindingsVaa.java | 8 +- .../ui/components/collection/TableViewVaa.java | 2 +- .../vaadin/ui/components/object/ObjectViewVaa.java | 3 + .../ui/components/other/FallbackFieldFactory.java | 2 +- .../components/temporal/TemporalFieldFactory.java | 36 +- isis-parent/pom.xml | 4 +- mavendeps/pom.xml | 2 +- .../jdo/metamodel/beans/JdoBeanTypeClassifier.java | 5 +- ...nferredFromJdoColumnAnnotationFacetFactory.java | 4 +- .../testing/AbstractFacetFactoryTest.java | 4 +- regressiontests/incubating/pom.xml | 94 +++- regressiontests/pom.xml | 265 +++++------ regressiontests/stable-cucumber/pom.xml | 26 +- .../DomainModelTest_usingGoodDomain.java | 16 +- .../stable-injecting/log4j2-debug-persistence.xml | 75 ---- .../resources/application-config-test.properties | 25 -- .../testdomain/interact/ActionInteractionTest.java | 111 +++-- .../interact/CollectionInteractionTest.java | 146 +++++++ .../testdomain/interact/NewParameterModelTest.java | 10 +- .../interact/PropertyInteractionTest.java | 55 +-- .../testdomain/interact/SimulatedUiChoices.java | 10 +- .../testdomain/interact/SimulatedUiComponent.java | 19 +- .../stable-logging/log4j2-debug-persistence.xml | 75 ---- .../resources/application-config-test.properties | 25 -- regressiontests/stable-persistence-jdo/pom.xml | 32 +- .../injecting/jdo/JdoEntityInjectingTest.java | 0 regressiontests/stable-persistence-jpa/pom.xml | 32 +- .../injecting/jpa/JpaEntityInjectingTest.java | 0 regressiontests/stable-publishing-jpa/pom.xml | 32 +- regressiontests/stable-rest/pom.xml | 30 +- .../resources/application-config-test.properties | 25 -- .../log4j2-test.xml | 22 - .../{stable-injecting => stable-viewers}/pom.xml | 33 +- .../testdomain/viewers/InteractionTestWkt.java | 189 ++++++++ .../isis/testdomain/viewers}/LoggerSetupTest.java | 2 +- .../src/test/resources/junit-platform.properties | 0 regressiontests/stable/pom.xml | 102 ++++- .../testdomain/conf/Configuration_usingWicket.java | 134 ++++++ .../model/interaction/InteractionDemo.java | 54 ++- .../model/interaction/InteractionDemoItem.java | 125 ++++++ .../publishing/PublishingTestFactoryJdo.java | 2 +- .../publishing/PublishingTestFactoryJpa.java | 2 +- ...onfiguration_usingLifecycleEventPublishing.java | 4 +- .../LifecycleEventPublishingTestAbstract.java | 16 +- ... => LifecycleEventSubscriberJdoForTesting.java} | 61 +-- ... => LifecycleEventSubscriberJpaForTesting.java} | 60 +-- .../util/interaction/DataTableTester.java | 99 +++++ .../interaction/DomainObjectTesterFactory.java | 486 +++++++++++++++++++-- .../util/interaction/InteractionTestAbstract.java | 43 +- starters/pom.xml | 4 +- .../subdomains/excel/applib/dom/RowHandler.java | 3 + .../excel/applib/dom/WorksheetContent.java | 4 + .../subdomains/excel/applib/dom/WorksheetSpec.java | 8 + .../excel/applib/dom/util/CellMarshaller.java | 26 +- .../excel/applib/dom/util/ExcelConverter.java | 2 +- .../applib/classrules/ArchitectureJdoRules.java | 6 + .../applib/entity/jdo/dom/JdoEntity2.java | 7 +- .../applib/entity/jdo/dom/JdoEntitySubtype.java | 3 +- .../stable-logging => tooling/dsl}/pom.xml | 49 ++- .../tooling/dsl/GraphQLToJavaSourceConverter.java | 258 +++++++++++ .../dsl/JavaSourceCompilingClassLoader.java | 148 +++++++ .../apache/isis/tooling/dsl/GraphQLTest.graphqls | 28 ++ .../org/apache/isis/tooling/dsl/GraphQLTest.java | 94 ++++ .../src/test/resources/junit-platform.properties | 0 .../dsl/src/test/resources}/log4j2-test.xml | 22 - .../tooling/javamodel/ast/TypeDeclarations.java | 3 +- tooling/pom.xml | 3 +- .../metamodel/IsisModuleValAsciidocMetaModel.java | 49 +-- .../semantics/AsciiDocValueSemantics.java | 21 +- ...a => ChangesDtoValueSemanticsPrettyRender.java} | 14 +- ...a => CommandDtoValueSemanticsPrettyRender.java} | 14 +- ... InteractionDtoValueSemanticsPrettyRender.java} | 14 +- .../semantics/XmlValueSemanticsAbstract.java | 26 +- .../metamodel/IsisModuleValMarkdownMetaModel.java | 38 -- .../semantics/MarkdownValueSemantics.java | 21 +- .../isis/viewer/common/model/HasParentUiModel.java | 8 + .../common/model/action/ActionUiMetaModel.java | 16 +- .../model/action/form/FormPendingParamUiModel.java | 57 --- .../common/model/action/form/FormUiModel.java | 7 +- .../common/model/binding/BindingConverter.java | 60 +-- .../binding/BindingConverterForManagedObject.java | 35 +- .../binding/NumberConverterForStringComponent.java | 82 ---- .../TemporalConverterForLocalDateComponent.java | 84 ---- .../model/components/UiComponentFactory.java | 11 +- .../model/decorator/disable/DisablingUiModel.java | 3 +- .../decorator/prototyping/PrototypingUiModel.java | 4 +- .../common/model/feature/ParameterUiModel.java | 9 +- .../viewer/common/model/feature/ScalarUiModel.java | 2 + .../common/model/gridlayout/UiGridLayout.java | 49 ++- .../viewer/common/model/object/ObjectUiModel.java | 27 +- .../AbstractObjectMemberReprRenderer.java | 4 +- .../rendering/domainobjects/MemberType.java | 27 +- .../domainobjects/ObjectActionReprRenderer.java | 52 +-- .../domainobjects/ObjectPropertyReprRenderer.java | 4 +- .../ActionParameterDescriptionReprRenderer.java | 2 +- .../CollectionDescriptionReprRenderer.java | 2 +- .../PropertyDescriptionReprRenderer.java | 2 +- ...entNegotiationServiceForRestfulObjectsV1_0.java | 2 +- .../service/swagger/internal/Generation.java | 8 +- .../rendering/service/swagger/internal/Util.java | 6 +- .../resources/DomainObjectResourceServerside.java | 2 +- .../viewer/resources/ObjectActionArgHelper.java | 2 +- .../resources/ObjectAdapterUpdateHelper.java | 2 +- .../wicket/model/common/OnSelectionHandler.java | 37 -- .../wicket/model/common/PageParametersUtils.java | 76 ---- .../viewer/wicket/model/links/LinkAndLabel.java | 15 +- .../wicket/model/links/LinkAndLabelAbstract.java | 14 +- .../viewer/wicket/model/models/AboutModel.java | 19 +- .../wicket/model/models/ActionArgumentCache.java | 146 ------- .../viewer/wicket/model/models/ActionModel.java | 256 +++-------- .../wicket/model/models/BookmarkTreeNode.java | 2 +- .../wicket/model/models/BookmarkedPagesModel.java | 18 +- ...jectReference.java => ChainingObjectModel.java} | 81 ++-- .../{WelcomeModel.java => CommonContextModel.java} | 30 +- .../wicket/model/models/EntityCollectionModel.java | 85 +--- .../models/EntityCollectionModelAbstract.java | 142 +++--- .../model/models/EntityCollectionModelDummy.java | 76 ---- ...Model.java => EntityCollectionModelHidden.java} | 27 +- .../models/EntityCollectionModelParented.java | 115 +---- .../models/EntityCollectionModelStandalone.java | 91 +--- .../viewer/wicket/model/models/EntityModel.java | 264 +++++------ .../wicket/model/models/FormExecutorContext.java | 4 +- .../wicket/model/models/ManagedObjectModel.java | 39 +- .../viewer/wicket/model/models/ModelAbstract.java | 22 +- .../wicket/model/models/ObjectAdapterModel.java | 15 +- .../viewer/wicket/model/models/PendingModel.java | 76 ---- .../viewer/wicket/model/models/ScalarModel.java | 180 ++++---- ...utorContext.java => ScalarModelWithChoice.java} | 22 +- .../model/models/ScalarModelWithMultiChoice.java | 93 ++++ .../model/models/ScalarModelWithMultiPending.java | 120 ----- .../model/models/ScalarModelWithPending.java | 113 ----- .../model/models/ScalarModelWithSingleChoice.java | 74 ++++ .../wicket/model/models/ScalarParameterModel.java | 100 ++--- .../wicket/model/models/ScalarPropertyModel.java | 95 ++-- .../viewer/wicket/model/models/ValueModel.java | 31 +- .../viewer/wicket/model/models/WelcomeModel.java | 19 +- ...izer.java => _HintPageParameterSerializer.java} | 31 +- .../models/interaction/BookmarkedObjectWkt.java | 168 +++++++ .../models/interaction/HasBookmarkedOwner.java | 10 +- .../interaction/HasBookmarkedOwnerAbstract.java | 77 ++++ .../model/models/interaction/ObjectUiModelWkt.java | 8 +- .../interaction/act/ActionInteractionWkt.java | 142 ++++++ .../interaction/act/ParameterUiModelWkt.java | 109 +++++ .../model/models/interaction/coll/DataRowWkt.java | 65 +++ .../models/interaction/coll/DataTableModelWkt.java | 126 ++++++ .../interaction/prop/PropertyInteractionWkt.java | 119 +++++ .../interaction/prop/PropertyUiModelWkt.java | 93 ++++ .../model/{common => util}/CommonContextUtils.java | 12 +- .../viewer/wicket/model/util/ComponentHintKey.java | 1 - .../PageParameterUtils.java} | 116 ++++- .../wicket/model/models/EntityModel_hintsTest.java | 20 +- .../ScalarModel_isScalarSubtypingAnyOf_Test.java | 106 ----- .../model/{models => util}/ActionModelTest.java | 10 +- .../actionresponse/ActionResultResponseType.java | 100 +++-- .../ui/app/registry/ComponentFactoryRegistry.java | 18 +- .../viewer/wicket/ui/components/LabelBase.java | 2 +- .../wicket/ui/components/WebComponentBase.java | 2 +- .../wicket/ui/components/about/AboutPanel.java | 25 +- .../ui/components/about/AboutPanelFactory.java | 3 +- .../entityactions/EntityActionLinkFactory.java | 13 +- .../actionmenu/entityactions/LinkAndLabelUtil.java | 16 +- .../serviceactions/MenuActionLinkFactory.java | 3 +- .../serviceactions/ServiceActionUtil.java | 2 +- .../actions/ActionFormExecutorStrategy.java | 94 ---- .../components/actions/ActionParametersForm.java | 40 +- .../actions/ActionParametersFormPanel.java | 2 +- .../components/actions/ActionParametersPanel.java | 13 - .../ui/components/collection/CollectionPanel.java | 101 +---- .../collection/bulk/BulkActionsProvider.java | 4 +- .../selector/CollectionSelectorHelper.java | 18 +- .../selector/CollectionSelectorPanel.java | 14 +- .../CollectionContentsAsAjaxTablePanel.java | 54 ++- .../CollectionContentsSortableDataProvider.java | 108 ++--- .../ajaxtable/IsisAjaxFallbackDataTable.java | 14 +- .../ajaxtable/IsisAjaxHeadersToolbar.java | 4 +- .../ajaxtable/IsisAjaxNavigationToolbar.java | 16 +- .../ajaxtable/PrototypingMessageProvider.java | 2 +- .../ajaxtable/columns/GenericColumn.java | 9 +- ...umnAbstract.java => GenericColumnAbstract.java} | 19 +- ...pertyColumn.java => GenericPropertyColumn.java} | 48 +- ...terTitleColumn.java => GenericTitleColumn.java} | 50 ++- ...eboxColumn.java => GenericToggleboxColumn.java} | 68 +-- .../icons/CollectionContentsAsIconsPanel.java | 16 +- .../CollectionContentsAsIconsPanelFactory.java | 2 +- .../CollectionContentsMultipleViewsPanel.java | 33 +- .../summary/CollectionContentsAsSummary.java | 16 +- .../CollectionContentsAsSummaryFactory.java | 6 +- .../unresolved/CollectionContentsHiddenPanel.java | 6 +- .../CollectionContentsHiddenPanelFactory.java | 6 +- .../entity/collection/EntityCollectionPanel.java | 5 +- .../components/entity/fieldset/PropertyGroup.java | 111 ++--- .../entity/header/EntityHeaderPanel.java | 2 +- .../icontitle/EntityIconAndTitlePanelFactory.java | 36 +- .../wicket/ui/components/footer/FooterPanel.java | 4 +- .../wicket/ui/components/header/HeaderPanel.java | 4 +- .../wicket/ui/components/layout/bs3/col/Col.java | 2 +- .../components/layout/bs3/tabs/TabGroupPanel.java | 4 +- .../ui/components/property/PropertyEditForm.java | 11 +- .../ui/components/property/PropertyEditPanel.java | 2 +- .../property/PropertyFormExecutorStrategy.java | 77 ---- .../ui/components/scalars/ScalarPanelAbstract.java | 48 +- .../scalars/ScalarPanelSelectAbstract.java | 8 +- .../scalars/ScalarPanelTextFieldAbstract.java | 7 +- .../scalars/ScalarPanelTextFieldNumeric.java | 5 +- .../ScalarPanelTextFieldParseableAbstract.java | 2 +- .../scalars/image/JavaAwtImagePanelFactory.java | 2 +- .../components/scalars/image/WicketImageUtil.java | 11 +- .../components/scalars/markup/MarkupComponent.java | 14 +- .../scalars/markup/MarkupPanelFactories.java | 14 +- .../scalars/markup/ParentedMarkupPanel.java | 2 + .../components/scalars/primitive/BooleanPanel.java | 2 +- .../scalars/reference/ReferencePanel.java | 12 +- .../scalars/reference/ReferencePanelFactory.java | 2 +- .../scalars/value/ValuePanelFactory.java | 2 +- .../valuechoices/ValueChoicesSelect2Panel.java | 30 +- .../StandaloneCollectionPanel.java | 33 +- .../components/tree/IsisToWicketTreeAdapter.java | 39 +- .../wicket/ui/components/welcome/WelcomePanel.java | 16 +- .../ui/components/welcome/WelcomePanelFactory.java | 11 +- .../widgets/breadcrumbs/BreadcrumbModel.java | 16 +- .../widgets/breadcrumbs/BreadcrumbPanel.java | 2 +- .../widgets/checkbox/ContainedToggleboxPanel.java | 20 +- .../entitysimplelink/EntityLinkSimplePanel.java | 46 +- .../EntityLinkSimplePanelFactory.java | 21 +- .../formcomponent/FormComponentPanelAbstract.java | 5 +- .../widgets/linkandlabel/ActionLink.java | 12 +- .../linkandlabel/LinkAndLabelFactoryAbstract.java | 56 +-- .../ui/components/widgets/select2/ChoiceExt.java | 2 +- .../ui/components/widgets/select2/Select2.java | 12 +- .../widgets/select2/Select2ChoiceExt.java | 4 +- .../widgets/select2/Select2MultiChoiceExt.java | 4 +- .../select2/providers/EmptyChoiceProvider.java | 2 +- .../ObjectAdapterMementoProviderAbstract.java | 10 +- .../ObjectAdapterMementoProviderForChoices.java | 2 +- ...tAdapterMementoProviderForReferenceChoices.java | 2 +- ...entoProviderForReferenceObjectAutoComplete.java | 8 +- ...derForReferenceParamOrPropertyAutoComplete.java | 22 +- ...bjectAdapterMementoProviderForValueChoices.java | 2 +- .../widgets/zclip/ZeroClipboardPanel.java | 4 +- .../viewer/wicket/ui/errors/JGrowlBehaviour.java | 2 +- .../isis/viewer/wicket/ui/pages/PageAbstract.java | 4 +- .../isis/viewer/wicket/ui/pages/WebPageBase.java | 2 +- .../viewer/wicket/ui/pages/entity/EntityPage.java | 97 ++-- .../viewer/wicket/ui/pages/error/ErrorPage.java | 4 +- .../isis/viewer/wicket/ui/pages/home/HomePage.java | 2 +- .../StandaloneCollectionPage.java | 6 +- .../viewer/wicket/ui/pages/value/ValuePage.java | 4 +- .../wicket/ui/pages/voidreturn/VoidReturnPage.java | 4 +- .../isis/viewer/wicket/ui/panels/FormAbstract.java | 2 +- .../wicket/ui/panels/FormExecutorDefault.java | 366 +++------------- .../isis/viewer/wicket/ui/panels/PanelBase.java | 2 +- .../wicket/ui/panels/PromptFormAbstract.java | 27 +- ...tAdapterMementoProviderForValueChoicesTest.java | 2 +- .../viewer/IsisModuleViewerWicketViewer.java | 2 - .../ConverterForObjectAdapterMemento.java | 2 +- .../viewer/integration/WebRequestCycleForIsis.java | 2 +- .../ComponentFactoryRegistryDefault.java | 30 +- .../viewer/services/DeepLinkServiceWicket.java | 6 +- .../services/WicketViewerSettingsDefault.java | 2 +- .../viewer/wicketapp/IsisWicketApplication.java | 5 +- .../IsisWicketApplication_newPageFactory.java | 10 +- .../ComponentFactoryRegistryDefaultTest.java | 8 +- .../wicketapp/IsisWicketApplication_Defaults.java | 2 +- 582 files changed, 9782 insertions(+), 10323 deletions(-)
