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 7be973659e27a869260af1c4eaaeef8c5db0b7dd Merge: 9517f0e910 fae8c15ba9 Author: Joerg Rade <[email protected]> AuthorDate: Thu Sep 15 14:53:08 2022 +0200 Merge remote-tracking branch 'origin/master' into ISIS-3171 api/applib/pom.xml | 19 +- api/applib/src/main/java/module-info.java | 154 +++++++++++++ .../org/apache/isis/applib/annotation/Domain.java | 13 +- .../isis/applib/services/clock/ClockService.java | 3 +- .../keyvaluestore/KeyValueSessionStore.java | 4 +- .../isis/applib/services/metamodel/BeanSort.java | 5 +- .../applib/services/repository/EntityState.java | 18 +- .../services/user/ImpersonatedUserHolder.java | 4 +- .../value/semantics/TemporalValueSemantics.java | 35 ++- .../commons/internal/reflection/ReflectTest.java | 9 +- .../isis/applib/events/InteractionEventTest.java | 39 ++-- .../isis/applib/graph/tree/TreePathTest.java | 10 +- ...ropertyLayoutData_renderedAsDayBefore_Test.java | 8 +- .../component/PropertyLayoutData_repaint_Test.java | 6 +- .../applib/layout/grid/bootstrap/BSColTest.java | 12 +- .../applib/layout/grid/bootstrap/SizeSpanTest.java | 9 +- .../bootstrap/BSMenuBars_roundtrip_Test.java | 20 +- .../NamedQueryTest_withStart_or_withCount.java | 32 +-- .../appfeat/ApplicationMemberTypeTest.java | 4 +- .../eventbus/AbstractDomainEvent_veto_Test.java | 98 ++++----- .../exceprecog/ExceptionRecognizerForTypeTest.java | 2 +- .../exceprecog/ExceptionRecognizerGeneralTest.java | 4 +- .../services/i18n/TranslatableStringTest.java | 38 ++-- .../isis/applib/services/jaxb/JaxbServiceTest.java | 9 +- .../metamodel/MetaModelService_Config_Test.java | 8 +- .../QueryResultsCache_KeyTest.java | 36 +-- .../wrapper/control/AsyncControl_Test.java | 10 +- .../services/wrapper/control/SyncControl_Test.java | 26 +-- .../applib/spec/AbstractSpecification2Test.java | 4 +- .../applib/spec/AbstractSpecificationTest.java | 4 +- .../org/apache/isis/applib/util/EnumsTest.java | 4 +- .../isis/applib/util/EnumsTest_converts.java | 4 +- .../java/org/apache/isis/applib/util/Invoice.java | 28 +-- .../org/apache/isis/applib/util/InvoiceItem.java | 28 +-- .../java/org/apache/isis/applib/util/Numbered.java | 28 +-- .../apache/isis/applib/util/NumberedEvaluator.java | 28 +-- .../applib/util/ObjectContractsTest_compareTo.java | 35 +-- .../applib/util/ObjectContractsTest_equals.java | 50 ++--- .../ObjectContractsTest_equals_and_hashCode.java | 48 ++-- .../applib/util/ObjectContractsTest_toString.java | 52 ++--- .../apache/isis/applib/util/ReasonBufferTest.java | 10 +- .../org/apache/isis/applib/util/ReasonsTest.java | 6 +- .../apache/isis/applib/util/TitleBufferTest.java | 26 +-- .../applib/util/schema/CommandDtoUtils_Test.java | 6 +- ...eractionDtoUtilsTest_deriveLogicalMemberId.java | 4 +- .../isis/applib/value/Blob_constructor_Test.java | 11 +- .../isis/applib/value/Clob_constructor_Test.java | 13 +- .../schema/src/main/java/module-info.java | 30 +-- bom/pom.xml | 15 +- commons/pom.xml | 18 +- commons/src/main/java/module-info.java | 78 +++++++ .../org/apache/isis/commons/collections/Can.java | 44 ++-- .../isis/commons/collections/ImmutableEnumSet.java | 5 +- .../isis/commons/internal/base/_NullSafe.java | 6 + .../isis/commons/internal/base/_Strings.java | 33 ++- .../isis/commons/internal/context/_Plugin.java | 1 + .../commons/internal/ioc/_IocContainer_Spring.java | 3 +- .../isis/commons/internal/reflection/_Reflect.java | 12 - .../isis/commons/collections/CanCompareTest.java | 12 +- .../internal/base/_Strings_trimmed_Test.java | 15 +- .../commons/internal/binding/BindableTest.java | 2 +- .../commons/internal/compare/ComparatorsTest.java | 10 +- .../internal/resources/XmlRoundTripTest.java | 64 ++++++ .../isis/commons/internal/strings/FormatTest.java | 17 +- core/codegen-bytebuddy/pom.xml | 4 +- .../src/main/java/module-info.java} | 25 +-- .../services/ClassLoadingStrategyAdvisor.java | 68 ++---- .../services/ProxyFactoryServiceByteBuddy.java | 28 +-- core/config/pom.xml | 3 +- core/config/src/main/java/module-info.java | 61 ++++++ .../core/config/beans/IsisBeanTypeClassifier.java | 10 +- .../config/environment/IsisLocaleInitializer.java | 12 +- .../environment/IsisTimeZoneInitializer.java | 8 +- .../progmodel/ProgrammingModelConstants.java | 7 +- ...ion_getMaxTitleLengthInParentedTables_Test.java | 18 +- ...n_getMaxTitleLengthInStandaloneTables_Test.java | 16 +- .../config/util/ConfigUtil_isProtected_Test.java | 24 +- .../core/config/util/ConfigUtil_mask_Test.java | 12 +- .../interaction/src/main/java/module-info.java | 43 ++-- .../interaction/InteractionDefaultTest_next.java | 10 +- core/internaltestsupport/pom.xml | 95 ++------ .../contract/ComparableContractTest_compareTo.java | 4 +- .../contract/ValueTypeContractTestAbstract.java | 13 +- core/internaltestvintage/pom.xml | 91 ++++++++ .../jmocking/ImposteriserUsingCodegenPlugin.java | 0 .../jmocking/Imposterisers.java | 0 .../jmocking/InjectIntoJMockAction.java | 0 .../internaltestsupport/jmocking/IsisActions.java | 0 .../internaltestsupport/jmocking/JMockActions.java | 0 .../jmocking/JUnitRuleMockery2.java | 0 .../internaltestsupport/jmocking/MyMockomatic.java | 0 .../jmocking/PostponedAction.java | 0 core/jdk-supplemental/pom.xml | 53 ++++- core/metamodel/pom.xml | 13 -- core/metamodel/src/main/java/module-info.java | 136 ++++++++++++ .../core/metamodel/IsisModuleCoreMetamodel.java | 2 + .../_testing/MetaModelContext_forTesting.java | 12 +- .../core/metamodel/_testing/_TestDummies.java} | 38 ++-- .../isis/core/metamodel/commons/ResourceUtil.java | 19 -- .../metamodel/context/HasMetaModelContext.java | 13 +- .../context/MetaModelContext_usingSpring.java | 6 +- .../isis/core/metamodel/facets/Evaluators.java | 7 +- .../NavigableParentAnnotationFacetFactory.java | 4 +- ...hod.java => NavigableParentFacetViaMethod.java} | 10 +- .../annotation/TitleFacetViaTitleAnnotation.java | 2 - .../title/methods/TitleFacetViaTitleMethod.java | 7 +- .../facets/object/value/ValueFacetAbstract.java | 2 +- .../ViewModelFacetForViewModelInterface.java | 5 +- .../managed/ParameterNegotiationModel.java | 12 +- .../isis/core/metamodel/object/ManagedObject.java | 6 +- .../isis/core/metamodel/object/MmEntityUtil.java | 18 ++ .../object/_ManagedObjectEntityHybrid.java | 26 +-- ...hed.java => _ManagedObjectEntityTransient.java} | 4 +- .../metamodel/object/_ManagedObjectViewmodel.java | 2 +- .../authorization/AuthorizationFacetAbstract.java | 7 +- .../progmodel/ProgrammingModelAbstract.java | 5 +- .../idstringifier/IdStringifierLookupService.java | 6 +- .../services/message/MessageServiceNoop.java | 5 +- .../services/metamodel/DomainMemberDefault.java | 2 +- .../core/metamodel/spec/ObjectSpecification.java | 2 +- .../isis/core/metamodel/spec/feature/MixedIn.java | 2 - .../specimpl => spec/feature}/MixedInMember.java | 4 +- .../spec/feature/ObjectActionParameter.java | 5 +- .../metamodel/spec/feature/ObjectAssociation.java | 7 +- .../specloader/specimpl/ObjectActionMixedIn.java | 13 +- .../specloader/specimpl/ObjectMemberAbstract.java | 1 + .../specimpl/ObjectSpecificationAbstract.java | 5 +- .../specimpl/OneToManyAssociationMixedIn.java | 1 + .../specimpl/OneToOneAssociationMixedIn.java | 1 + .../specloader/specimpl/_MixedInMemberFactory.java | 10 +- .../core/metamodel/commons/IoUtils_CopyTest.java | 21 +- .../commons/JavaClassUtilsTest_getBuiltIn.java | 6 +- .../metamodel/commons/ListUtilsTest_adjust.java | 4 +- .../metamodel/commons/ListUtilsTest_insert.java | 8 +- .../commons/ListUtilsTest_mutableCopy.java | 4 +- .../core/metamodel/commons/LocaleUtilsTest.java | 5 +- .../isis/core/metamodel/commons/NameUtilTest.java | 14 +- .../commons/StringUtilsTest_enumTitle.java | 4 +- .../commons/StringUtils_NaturalNameTest.java | 2 +- .../commons/StringUtils_NaturalizeTest.java | 4 +- .../commons/StringUtils_NormalizedTest.java | 56 ++--- .../StringUtils_RemoveLeadingWhiteSpace.java | 15 +- .../commons/StringUtils_SplitOnCommas.java | 45 ++-- .../commons/StringUtils_StripLeadingSlashTest.java | 10 +- .../commons/StringUtils_StripNewLinesTest.java | 4 +- .../commons/StringUtils_camelLowerFirst.java | 4 +- .../commons/StringUtils_toLineSeparated.java | 16 +- .../commons/StringUtils_toLowerDashed.java | 4 +- .../metamodel/commons/TypesTest_filteredList.java | 8 +- .../matchers/IsisMatchers_NonEmptyStringTest.java | 6 +- .../metamodel/consent/InteractionResultTest.java | 18 +- .../core/metamodel/facetapi/FacetAbstractTest.java | 15 +- .../facetapi/FeatureTypeTest_identifierFor.java | 2 +- ...va => AbstractFacetFactoryJupiterTestCase.java} | 89 ++++---- .../metamodel/facets/AbstractFacetFactoryTest.java | 42 ++-- .../facets/AbstractTestWithMetaModelContext.java | 67 ++++++ .../Annotations_getAnnotations_on_Field_Test.java | 14 +- .../Annotations_getAnnotations_on_Method_Test.java | 20 +- ...notations_getAnnotations_on_Parameter_Test.java | 22 +- ...nEventHelperTest_newActionInteractionEvent.java | 16 +- ...HelperTest_newCollectionDomainEvent_forAdd.java | 12 +- ...perTest_newCollectionDomainEvent_forRemove.java | 12 +- ...HelperTest_newPropertyDomainEvent_forClear.java | 16 +- ...elperTest_newPropertyDomainEvent_forModify.java | 8 +- .../metamodel/facets/MethodFinderUtilsTest.java | 20 +- .../metamodel/facets/ObjectAdapterUtilsTest.java | 36 ++- .../actions/ActionMethodsFacetFactoryTest.java | 53 +---- .../actions/IteratorFilteringFacetFactoryTest.java | 6 +- .../action/ActionAnnotationFacetFactoryTest.java | 37 ++-- ...nnotationFacetFactoryTest_ActionInvocation.java | 6 +- .../ActionAnnotationFacetFactoryTest_Hidden.java | 16 +- ...ctionAnnotationFacetFactoryTest_Invocation.java | 72 +++--- ...ctionAnnotationFacetFactoryTest_RestrictTo.java | 17 +- ...ActionAnnotationFacetFactoryTest_Semantics.java | 19 +- .../ActionAnnotationFacetFactoryTest_TypeOf.java | 36 +-- ...notationFacetFactoryTest_commandPublishing.java | 19 +- ...tationFacetFactoryTest_executionPublishing.java | 48 ++-- ...icsFacetFallbackToNonIdempotentFactoryTest.java | 5 +- .../PrototypeFacetAnnotationFactoryTest.java | 5 +- ...kmarkableAnnotationFacetFactoryTest_action.java | 5 +- ...nLayoutXmlLayoutAnnotationFacetFactoryTest.java | 38 ++-- ...MenuFacetFromDomainServiceFacetFactoryTest.java | 13 +- .../prototype/PrototypeFacetAbstractTest.java | 21 +- .../CollectionFieldMethodsFacetFactoryTest.java | 6 +- .../CollectionAnnotationFacetFactoryTest.java | 69 +++--- ...ollectionAnnotationFacetFactoryTest_typeOf.java | 5 +- .../cssclassfa/CssClassFaFacetAbstractTest.java | 2 +- .../ViewModelSemanticCheckingFacetFactoryTest.java | 18 +- ...okmarkableAnnotationFacetFactoryTest_class.java | 4 +- .../callback/CallbackFacetFactoryTestAbstract.java | 3 + ...CssClassFaFacetOnTypeAnnotationFactoryTest.java | 4 +- ...oicesFacetFromBoundedAnnotationFactoryTest.java | 5 +- .../DomainObjectAnnotationFacetFactoryTest.java | 141 +++++------- .../NamedAnnotationFacetFactoryTest.java | 10 +- .../DomainObjectLayoutFactoryTest.java | 78 +++---- .../DomainServiceFacetAnnotationFactoryTest.java | 5 +- .../DomainServiceLayoutFacetFactoryTest.java | 21 +- .../ident/cssclass/CssClassFacetMethodTest.java | 107 +++++---- .../CssClassFacetMethodWithProblemTest.java | 37 ++-- .../object/ident/icon/IconFacetMethodTest.java | 37 ++-- .../object/ident/layout/LayoutFacetMethodTest.java | 36 ++- .../title/TitleAnnotationFacetFactoryTest.java | 102 +++++---- .../ident/title/TitleFacetViaMethodTest.java | 31 ++- .../title/TitleFacetViaMethodsFactoryTest.java | 8 +- .../title/TitleFacetViaTitleAnnotationTest.java | 64 ++---- .../object/layoutxml/GridFacetDefaultTest.java | 6 +- .../logicaltype/LogicalTypeInferenceTest.java | 14 +- .../navparent/NavigableParentFacetMethodTest.java | 40 ++-- .../NavigableParentAnnotationFacetFactoryTest.java | 81 ++++--- .../RecreatableObjectFacetFactoryTest.java | 5 +- .../ObjectSupportFacetFactoryTestAbstract.java | 3 + .../memberorder/DeweyOrderComparatorTest.java | 86 ++++---- .../ordering/memberorder/DeweyOrderSetTest.java | 77 ++++--- .../ordering/memberorder/LayoutOrderTest.java | 44 ++-- ...cetForParameterLayoutAnnotationFactoryTest.java | 6 +- .../facets/param/name/ParameterNameFacetTest.java | 16 +- .../ParameterAnnotationFacetFactoryTest.java | 59 ++--- ...lableAnnotationOnParameterFacetFactoryTest.java | 8 +- ...RegExAnnotationOnParameterFacetFactoryTest.java | 11 +- .../PropertyMethodsFacetFactoryTest.java | 7 +- ...romptStyleFacetFromPropertyAnnotation_Test.java | 99 +++------ ...sabledAnnotationOnPropertyFacetFactoryTest.java | 4 +- .../MandatoryAnnotationFacetFactoryTest.java | 9 +- .../PropertyAnnotationFacetFactoryTest.java | 23 +- ...tionWithSnapshotOnPropertyFacetFactoryTest.java | 5 +- ...llableAnnotationOnPropertyFacetFactoryTest.java | 6 +- .../RegExAnnotationOnPropertyFacetFactoryTest.java | 11 +- .../specification/SpecificationAndTests.java | 10 +- .../specification/SpecificationNotTests.java | 10 +- .../specification/SpecificationOrTests.java | 10 +- .../BigDecimalValueSemanticsProviderTest.java | 14 +- .../value/BigIntValueSemanticsProviderTest.java | 14 +- .../value/BlobValueSemanticsProviderTest.java | 12 +- .../value/BooleanValueSemanticsProviderTest.java | 14 +- .../value/ByteValueSemanticsProviderTest.java | 14 +- .../value/CharacterValueSemanticsProviderTest.java | 14 +- .../value/ClobValueSemanticsProviderTest.java | 12 +- .../value/DoubleValueSemanticsProviderTest.java | 14 +- .../value/FloatValueSemanticsProviderTest.java | 14 +- .../value/IntValueSemanticsProviderTest.java | 14 +- .../JavaSqlDateValueSemanticsProviderTest.java | 14 +- .../value/JavaTimeValueSemanticsProviderTest.java | 6 +- .../value/LongValueSemanticsProviderTest.java | 12 +- .../value/PasswordValueSemanticsProviderTest.java | 12 +- .../value/ShortValueSemanticsProviderTest.java | 14 +- .../value/StringValueSemanticsProviderTest.java | 12 +- .../ValueSemanticsProviderAbstractTestCase.java | 79 +++---- .../ValueSemanticsAnnotationFacetFactoryTest.java | 10 +- ...jectAssociationPredicatesTest_visibleWhere.java | 156 +++++-------- .../interactions/InteractionUtils_isA_Test.java | 30 ++- .../objects/ObjectActionLayoutXmlDefaultTest.java | 2 +- .../objects/OneToManyAssociationDefaultTest.java | 26 ++- .../TypeExtractorMethodsParametersTest.java | 10 +- .../dom/JavaObjectWithBasicProgramConventions.java | 6 +- .../services/appfeat/ApplicationFeatureIdTest.java | 50 ++--- .../ApplicationFeatureRepositoryDefaultTest.java | 244 +++------------------ .../services/appfeat/ApplicationFeatureTest.java | 69 ++---- .../appfeat/ApplicationFeatureTypeTest.java | 55 ++--- ...zerForRecoverableException_recognizes_Test.java | 13 +- .../metamodel/services/grid/GridLoadingTest.java | 2 +- .../services/menubars/BSMenuBarsTest.java | 20 +- .../metamodel/MetaModelServiceDefaultTest.java | 67 ++---- .../specloader/SpecificationCacheDefaultTest.java | 72 +++--- .../ClassSubstitutorTest_getClass.java | 12 +- .../IntrospectionState_comparable_Test.java | 2 +- ...ionParameterAbstractTest_getId_and_getName.java | 184 ++-------------- .../specimpl/ObjectAssociationAbstractTest.java | 48 ++-- ...ObjectAssociationAbstractTest_alwaysHidden.java | 32 +-- .../specimpl/OneToOneAssociationAbstractTest.java | 58 ++--- core/pom.xml | 35 ++- {viewers/wicket => core/privileged}/pom.xml | 35 +-- .../apache/isis/core/privileged/_Privileged.java | 98 +++++++++ .../runtime/src/main/java/module-info.java | 43 ++-- .../isis/core/runtime/IsisModuleCoreRuntime.java | 2 - .../core/runtime/context/RuntimeContextBase.java | 72 ------ .../runtimeservices/src/main/java/module-info.java | 86 ++++++++ .../command/CommandExecutorServiceDefault.java | 12 +- .../executor/MemberExecutorServiceDefault.java | 6 + .../wrapper/WrapperFactoryDefault.java | 23 +- .../handlers/DomainObjectInvocationHandler.java | 2 +- .../core/runtimeservices/i18n/po/PoReaderTest.java | 52 ++--- .../i18n/po/PoWriterTest_escape.java | 6 +- .../urlencoding/UrlEncodingServiceTest.java | 2 +- .../wrapper/WrapperFactoryDefaultTest.java | 31 +-- .../XmlSnapshotServiceDefault_Test.java | 52 ++--- core/security/pom.xml | 23 +- core/security/src/main/java/module-info.java | 45 ++++ .../isis/security/EncodabilityContractTest.java | 8 +- .../AuthenticationManager_authenticators_Test.java | 25 ++- .../SimpleSessionEncodabilityNoRolesTest.java | 2 +- .../SimpleSessionEncodabilityTestAbstract.java | 2 +- .../SimpleSessionEncodabilityWithRolesTest.java | 2 +- ...rdAuthenticationManager_AuthenticationTest.java | 8 +- .../src/main/java/module-info.java} | 33 +-- .../PreAndPostValues_shouldAudit_Test.java | 9 +- core/webapp/pom.xml | 6 + core/webapp/src/main/java/module-info.java | 48 ++++ .../templresources/TemplateResourceServlet.java | 2 +- .../core/webapp/modules/templresources/_Util.java} | 28 ++- .../dom/types/isis/blobs/jdo/IsisBlobJdo.java | 3 +- .../dom/types/isis/clobs/jdo/IsisClobJdo.java | 3 +- .../common/ui/custom/WhereInTheWorldPanel.java | 19 +- .../ui/custom/WhereInTheWorldPanelFactory.java | 10 +- .../commandlog/applib/app/CommandLogMenu.java | 3 +- extensions/core/excel/applib/pom.xml | 2 +- .../audittrail/applib/app/AuditTrailMenu.java | 3 +- .../sessionlog/applib/app/SessionLogMenu.java | 3 +- .../CollectionContentsAsExcelFactory.java | 4 +- .../vw/fullcalendar/wicket/integration/pom.xml | 2 +- .../fullcalendar/res/FullCalendarCssReference.java | 5 +- .../fullcalendar/res/FullCalendarJsReference.java | 5 +- .../CalendaredCollectionFactoryAbstract.java | 4 +- .../wkt/viewer/EventProviderAbstract.java | 2 +- .../wkt/viewer/FullCalendarWithEventHandling.java | 4 +- .../pdfjs/wkt/ui/components/PdfJsViewerPanel.java | 29 +-- .../PdfJsViewerPanelComponentFactory.java | 6 +- .../ListeningMarkupPanelFactoriesForWicket.java | 2 +- .../graphql/applib/src/main/java/module-info.java | 5 + incubator/viewers/graphql/model/pom.xml | 12 + .../graphql/model/src/main/java/module-info.java | 7 + incubator/viewers/graphql/pom.xml | 26 +-- incubator/viewers/graphql/{viewer => test}/pom.xml | 52 ++--- .../viewer/graphql/viewer/test}/source/.gitignore | 0 .../EndToEnd_IntegTest.changeName.approved.gql | 0 .../EndToEnd_IntegTest.changeName.submit.gql | 0 .../EndToEnd_IntegTest.createE1.approved.gql | 0 .../source/EndToEnd_IntegTest.createE1.submit.gql | 0 .../EndToEnd_IntegTest.findAllE1.approved.gql | 0 .../source/EndToEnd_IntegTest.findAllE1.submit.gql | 0 .../viewer/test}/source/EndToEnd_IntegTest.java | 11 +- ...oEnd_IntegTest.simple_post_request.approved.gql | 0 ...dToEnd_IntegTest.simple_post_request.submit.gql | 0 .../viewer/test}/source/GQLSchema_IntegTest.java | 60 ++--- .../graphql/viewer/test}/source/ScratchPad.java | 2 +- .../source/TestDomainModuleIntegTestAbstract.java | 19 +- .../viewer/test}/source/gqltestdomain/E1.java | 2 +- .../viewer/test}/source/gqltestdomain/E2.java | 2 +- .../source/gqltestdomain/GQLTestDomainMenu.java | 2 +- .../source/gqltestdomain/TestDomainModule.java | 2 +- .../test}/source/gqltestdomain/TestEntity.java | 2 +- .../source/gqltestdomain/TestEntityRepository.java | 14 +- incubator/viewers/graphql/viewer/pom.xml | 54 ----- .../graphql/viewer/src/main/java/module-info.java | 27 +++ .../javafx/model/action/ActionUiModelFx.java | 4 +- .../javafx/ui/components/object/ObjectViewFx.java | 2 +- .../vaadin/model/action/ActionUiModelVaa.java | 4 +- .../vaadin/ui/components/debug/DebugField.java | 12 +- .../vaadin/ui/components/object/ObjectViewVaa.java | 2 +- .../ui/components/other/FallbackFieldFactory.java | 4 +- persistence/jdo/applib/pom.xml | 2 - .../changetracking/JdoLifecycleListener.java | 4 +- .../metamodel/facets/entity/JdoEntityFacet.java | 3 +- persistence/jdo/metamodel/pom.xml | 2 +- .../testing/AbstractFacetFactoryTest.java | 10 +- persistence/jdo/spring/pom.xml | 12 +- persistence/jpa/eclipselink/pom.xml | 6 + .../jpa/integration/entity/JpaEntityFacet.java | 12 +- .../eventhandling/GenericEventPublishingTest.java | 15 +- .../interact/WrapperInteractionTest3.java | 13 +- .../interact/WrapperInteractionTest4.java | 17 +- .../viewers/common/wkt/InteractionTestWkt.java | 6 +- .../testdomain/conf/Configuration_usingWicket.java | 4 +- .../bypass/src/main/java/module-info.java | 27 +-- security/keycloak/src/main/java/module-info.java | 42 ++++ security/shiro/pom.xml | 3 +- ...AuthenticatorOrAuthorizorTest_authenticate.java | 18 +- ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 18 +- .../spring/src/main/java/module-info.java | 45 ++-- starters/pom.xml | 2 +- .../demomodule/dom/FakeDataDemoObjectWithAll.java | 4 +- .../applib/personas/fixtures/EmployeeBuilder.java | 4 +- .../personas/fixtures/PersistAllFixtureScript.java | 4 +- .../personas/fixtures/PersonBuilderScript.java | 3 +- .../personas/fixtures/ScenarioFixtureScript.java | 5 +- testing/h2console/ui/pom.xml | 6 + .../ImposteriserTestUsingCodegenPlugin_Test.java | 44 ++-- tooling/metaprog/pom.xml | 28 +-- tooling/pom.xml | 17 +- .../asciidoc/applib/src/main/java/module-info.java | 28 ++- .../metamodel/src/main/java/module-info.java | 30 +-- .../persistence-jdo/src/main/java/module-info.java | 23 +- .../persistence-jpa/src/main/java/module-info.java | 24 +- .../ui/wicket/src/main/java/module-info.java | 30 +-- .../ui/wkt/components/AsciiDocComponentWkt.java | 2 +- .../jodatime/applib/src/main/java/module-info.java | 27 +-- .../integration/src/main/java/module-info.java | 42 ++-- .../markdown/applib/src/main/java/module-info.java | 42 ++-- .../metamodel/src/main/java/module-info.java | 26 +-- .../persistence-jdo/src/main/java/module-info.java | 23 +- .../persistence-jpa/src/main/java/module-info.java | 24 +- .../ui/wicket/src/main/java/module-info.java | 29 ++- .../commons/applib/src/main/java/module-info.java | 39 ++-- viewers/commons/model/pom.xml | 8 - .../commons/model/src/main/java/module-info.java | 39 ++++ .../viewer/commons/model/UiComponentHolder.java | 38 ---- .../{PlacementDirection.java => UiModel.java} | 7 +- .../commons/model/action/HasActionInteraction.java | 4 +- .../action/{ActionUiModel.java => UiAction.java} | 6 +- .../{ActionFormUiModel.java => UiActionForm.java} | 16 +- ...tionUiDecorator.java => UiActionDecorator.java} | 2 +- .../{ComponentType.java => UiComponentType.java} | 16 +- .../UiString.java} | 12 +- .../commons/model/decorators/ConfirmDecorator.java | 6 +- .../commons/model/decorators/TooltipDecorator.java | 14 +- .../commons/model/hints/HasRenderingHints.java | 57 +++++ .../viewer/commons/model/hints/RenderingHint.java | 71 ++++++ .../model/{gridlayout => layout}/UiGridLayout.java | 5 +- .../UiPlacementDirection.java} | 4 +- .../viewer/commons/model/mixin/HasUiMenuItem.java | 1 + .../DebugUiModel.java => mock/UiMockup.java} | 7 +- .../HasUiParentObject.java} | 7 +- .../viewer/commons/model/object/ObjectUiModel.java | 124 ----------- .../{SimpleObjectUiModel.java => UiObject.java} | 16 +- .../HasUiParameter.java} | 100 +++++++-- .../commons/model/scalar/HasUiProperty.java} | 32 +-- .../UiParameter.java} | 68 ++++-- .../UiProperty.java} | 14 +- .../ScalarUiModel.java => scalar/UiScalar.java} | 35 ++- .../src/main/java/module-info.java} | 10 +- .../services/src/main/java/module-info.java | 41 ++-- viewers/restfulobjects/applib/pom.xml | 13 +- viewers/restfulobjects/rendering/pom.xml | 2 +- .../restfulobjects/rendering/IResourceContext.java | 22 +- .../AbstractObjectMemberReprRenderer.java | 8 +- .../domainobjects/DomainObjectReprRenderer.java | 12 +- .../domainobjects/ObjectActionReprRenderer.java | 2 +- .../ObjectCollectionReprRenderer.java | 6 +- .../domainobjects/ObjectPropertyReprRenderer.java | 6 +- .../domainobjects/ScalarValueReprRenderer.java | 2 +- viewers/restfulobjects/testing/pom.xml | 2 +- viewers/restfulobjects/viewer/pom.xml | 2 +- .../viewer/context/ResourceContext.java | 51 +---- .../viewer/resources/HomePageReprRenderer.java | 2 +- .../viewer/resources/UserReprRenderer.java | 2 +- .../viewer/resources/UserResourceServerside.java | 13 +- viewers/wicket/applib/pom.xml | 8 - .../applib/src/main/java/module-info.java} | 15 +- .../applib/IsisModuleViewerWicketApplibMixins.java | 1 - viewers/wicket/{model => graceful}/pom.xml | 36 ++- .../wicket/graceful/WicketArtifactReplacer.java | 69 ++++++ .../wicket-artifacts-no-module-info/readme.txt | 3 + .../wicket-core-9.11.0.jar.mangled | Bin 0 -> 2389574 bytes .../wicket-util-9.11.0.jar.mangled | Bin 0 -> 382422 bytes viewers/wicket/model/pom.xml | 40 +--- .../wicket/model/src/main/java/module-info.java | 53 +++++ .../wicket/model/modelhelpers/WhereAmIHelper.java | 16 +- .../viewer/wicket/model/models/ActionModel.java | 4 +- .../wicket/model/models/ActionModelImpl.java | 12 +- .../wicket/model/models/BookmarkTreeNode.java | 14 +- .../wicket/model/models/BookmarkedPagesModel.java | 2 +- .../wicket/model/models/ChainingObjectModel.java | 7 +- .../wicket/model/models/EntityCollectionModel.java | 15 +- .../models/EntityCollectionModelParented.java | 6 +- .../wicket/model/models/FileUploadModels.java | 11 +- .../wicket/model/models/FormExecutorContext.java | 4 +- ...mExecutorContext.java => HasCommonContext.java} | 31 +-- .../viewer/wicket/model/models/ModelAbstract.java | 30 +-- .../wicket/model/models/ObjectAdapterModel.java | 7 +- .../viewer/wicket/model/models/ScalarModel.java | 103 ++------- .../wicket/model/models/ScalarModelWithChoice.java | 5 +- .../wicket/model/models/ScalarParameterModel.java | 49 +---- .../wicket/model/models/ScalarPropertyModel.java | 66 ++---- .../models/{EntityModel.java => UiObjectWkt.java} | 41 ++-- .../model/models/interaction/ObjectUiModelWkt.java | 27 --- .../interaction/act/ActionInteractionWkt.java | 11 +- ...arameterUiModelWkt.java => UiParameterWkt.java} | 30 +-- .../models/interaction/coll/DataTableModelWkt.java | 8 +- .../interaction/prop/PropertyInteractionWkt.java | 7 +- ...{PropertyUiModelWkt.java => UiPropertyWkt.java} | 29 +-- .../wicket/model/util/PageParameterUtils.java | 4 +- .../isis/viewer/wicket/model/util/WktContext.java | 3 +- .../model/value/ValueSemanticsModelAbstract.java | 9 +- .../wicket/model/models/EntityModel_hintsTest.java | 153 ------------- .../LowestCommonSuperclassClosureTest.java | 11 +- .../model/models/test/UiObjectWkt_hintsTest.java | 177 +++++++++++++++ viewers/wicket/pom.xml | 1 + viewers/wicket/ui/pom.xml | 11 +- viewers/wicket/ui/src/main/java/module-info.java | 164 ++++++++++++++ .../isis/viewer/wicket/ui/ComponentFactory.java | 14 +- .../viewer/wicket/ui/ComponentFactoryAbstract.java | 14 +- .../ui/app/registry/ComponentFactoryRegistrar.java | 6 +- .../ui/app/registry/ComponentFactoryRegistry.java | 42 ++-- ...essor.java => HasComponentFactoryRegistry.java} | 2 +- .../wicket/ui/components/WebComponentBase.java | 30 +-- .../ui/components/about/AboutPanelFactory.java | 4 +- .../actioninfo/ActionInfoPanelFactory.java | 4 +- .../entityactions/LinkAndLabelFactory.java | 6 +- .../serviceactions/ServiceActionUtil.java | 4 +- .../serviceactions/ServiceActionsPanelFactory.java | 4 +- .../serviceactions/TertiaryMenuPanelFactory.java | 4 +- .../actionprompt/ActionPromptHeaderPanel.java | 4 +- .../components/actions/ActionParametersForm.java | 18 +- .../actions/ActionParametersFormPanelFactory.java | 4 +- .../components/actions/ActionParametersPanel.java | 6 +- .../actions/ActionParametersPanelFactory.java | 4 +- .../BookmarkedPagesPanelFactory.java | 4 +- .../ui/components/collection/CollectionPanel.java | 4 +- .../CollectionPresentationSelectorHelper.java | 6 +- .../CollectionPresentationSelectorPanel.java | 10 +- .../CollectionContentsAsAjaxTablePanelFactory.java | 4 +- .../ajaxtable/IsisAjaxDataTable.java | 4 +- .../ajaxtable/IsisAjaxHeadersToolbar.java | 4 +- .../ajaxtable/IsisAjaxNavigationToolbar.java | 19 +- .../ajaxtable/IsisTotalRecordsToolbar.java | 15 +- .../ajaxtable/PrototypingMessageProvider.java | 25 +-- .../ajaxtable/columns/GenericColumnAbstract.java | 10 +- .../ajaxtable/columns/GenericPropertyColumn.java | 8 +- .../ajaxtable/columns/GenericTitleColumn.java | 18 +- .../icons/CollectionContentsAsIconsPanel.java | 4 +- .../CollectionContentsAsIconsPanelFactory.java | 4 +- .../CollectionContentsMultipleViewsPanel.java | 6 +- ...ollectionContentsMultipleViewsPanelFactory.java | 4 +- .../CollectionContentsAsSummaryFactory.java | 4 +- .../CollectionContentsHiddenPanelFactory.java | 4 +- .../empty/EmptyCollectionPanelFactory.java | 4 +- .../entity/EntityComponentFactoryAbstract.java | 20 +- .../entity/collection/EntityCollectionPanel.java | 8 +- .../collection/EntityCollectionPanelFactory.java | 8 +- .../components/entity/fieldset/PropertyGroup.java | 19 +- .../entity/header/EntityHeaderPanel.java | 16 +- .../entity/header/EntityHeaderPanelFactory.java | 8 +- .../entity/icontitle/EntityIconAndTitlePanel.java | 7 +- .../icontitle/EntityIconAndTitlePanelFactory.java | 14 +- .../icontitle/EntityIconTitleAndCopyLinkPanel.java | 4 +- .../EntityIconTitleAndCopyLinkPanelFactory.java | 8 +- .../ui/components/footer/FooterPanelFactory.java | 4 +- .../wicket/ui/components/header/HeaderPanel.java | 4 +- .../ui/components/header/HeaderPanelFactory.java | 4 +- .../ui/components/layout/bs/BSGridPanel.java | 49 ++--- .../components/layout/bs/BSGridPanelFactory.java | 10 +- .../ui/components/layout/bs/clearfix/ClearFix.java | 6 +- .../wicket/ui/components/layout/bs/col/Col.java | 14 +- .../wicket/ui/components/layout/bs/row/Row.java | 6 +- .../components/layout/bs/tabs/TabGroupPanel.java | 8 +- .../ui/components/layout/bs/tabs/TabPanel.java | 12 +- .../ui/components/property/PropertyEditForm.java | 4 +- .../property/PropertyEditFormPanelFactory.java | 4 +- .../ui/components/property/PropertyEditPanel.java | 10 +- .../property/PropertyEditPanelFactory.java | 4 +- .../PropertyEditPromptHeaderPanel.java | 8 +- .../scalars/ComponentFactoryScalarAbstract.java | 4 +- .../ui/components/scalars/ScalarPanelAbstract.java | 8 +- .../components/scalars/ScalarPanelAbstract2.java | 10 +- .../scalars/ScalarPanelSelectAbstract.java | 4 +- .../scalars/ScalarPanelTextFieldAbstract.java | 4 +- .../blobclob/IsisBlobOrClobPanelAbstract.java | 6 +- .../ui/components/scalars/bool/BooleanPanel.java | 4 +- .../scalars/image/JavaAwtImagePanelFactory.java | 4 +- .../components/scalars/markup/MarkupComponent.java | 6 +- .../scalars/markup/MarkupPanelFactories.java | 6 +- .../scalars/reference/ReferencePanel.java | 16 +- .../scalars/reference/ReferencePanelFactory.java | 4 +- .../valuechoices/ValueChoicesSelect2Panel.java | 6 +- .../ValueChoicesSelect2PanelFactory.java | 4 +- .../StandaloneCollectionPanel.java | 4 +- .../StandaloneCollectionPanelFactory.java | 4 +- .../components/tree/IsisToWicketTreeAdapter.java | 6 +- .../ui/components/tree/TreePanelFactories.java | 6 +- .../ui/components/unknown/UnknownModelPanel.java | 6 +- .../unknown/UnknownModelPanelFactory.java | 8 +- .../value/StandaloneValuePanelFactory.java | 4 +- .../voidreturn/VoidReturnPanelFactory.java | 4 +- .../ui/components/welcome/WelcomePanelFactory.java | 4 +- .../widgets/breadcrumbs/BreadcrumbModel.java | 24 +- .../widgets/breadcrumbs/BreadcrumbPanel.java | 28 +-- .../widgets/buttons/ToggleButtonsPanel.java | 4 +- .../entitysimplelink/EntityLinkSimplePanel.java | 4 +- .../EntityLinkSimplePanelFactory.java | 8 +- .../formcomponent/FormComponentPanelAbstract.java | 24 +- .../widgets/linkandlabel/ActionLink.java | 10 +- .../ui/components/widgets/select2/Select2.java | 13 +- .../select2/providers/ChoiceProviderAbstract.java | 18 +- .../providers/ChoiceProviderForReferences.java | 8 +- .../themepicker/IsisWicketThemeSupportDefault.java | 2 +- .../widgets/zclip/ZeroClipboardPanel.java | 6 +- .../wicket/ui/errors/ExceptionStackTracePanel.java | 4 +- .../viewer/wicket/ui/errors/JGrowlBehaviour.java | 10 +- .../isis/viewer/wicket/ui/errors/JGrowlUtil.java | 5 +- ...stryAccessor.java => HasPageClassRegistry.java} | 2 +- .../isis/viewer/wicket/ui/pages/PageAbstract.java | 34 +-- .../isis/viewer/wicket/ui/pages/WebPageBase.java | 41 +--- .../viewer/wicket/ui/pages/about/AboutPage.java | 4 +- .../viewer/wicket/ui/pages/entity/EntityPage.java | 20 +- .../isis/viewer/wicket/ui/pages/home/HomePage.java | 6 +- .../StandaloneCollectionPage.java | 4 +- .../viewer/wicket/ui/pages/value/ValuePage.java | 4 +- .../wicket/ui/pages/voidreturn/VoidReturnPage.java | 4 +- .../isis/viewer/wicket/ui/panels/FormAbstract.java | 39 +--- .../wicket/ui/panels/FormExecutorDefault.java | 13 +- .../viewer/wicket/ui/panels/PanelAbstract.java | 26 +-- .../isis/viewer/wicket/ui/panels/PanelBase.java | 64 ++---- .../org/apache/isis/viewer/wicket/ui/util/Wkt.java | 34 ++- .../isis/viewer/wicket/ui/util/WktComponents.java | 14 +- .../isis/viewer/wicket/ui/util/WktDecorators.java | 14 +- .../isis/viewer/wicket/ui/util/WktLinks.java | 7 +- .../isis/viewer/wicket/ui/util/WktTooltips.java | 28 +-- .../ComponentFactoryAbstractTest_init.java | 25 ++- .../ui/{ => test}/ComponentType_ConstantsTest.java | 14 +- .../EntityIconAndTitlePanelTest_abbreviated.java | 8 +- .../components/scalars/ConverterTester.java | 18 +- .../scalars/jdkdates/JavaSqlDateConverterTest.java | 4 +- .../jdkdates/JavaUtilDateConverterTest.java | 4 +- .../scalars/jdkmath/BigDecimalConverterTest.java | 4 +- .../jodatime/JodaDateTimeConverterTest.java | 4 +- .../jodatime/JodaLocalDateConverterTest.java | 4 +- .../jodatime/JodaLocalDateTimeConverterTest.java | 4 +- .../jodatime/jdk8time/LocalDateConverterTest.java | 4 +- .../jdk8time/LocalDateTimeConverterTest.java | 4 +- .../jdk8time/OffsetDateTimeConverterTest.java | 4 +- .../components/scalars/uuid/UuidConverterTest.java | 4 +- .../choices/ChoiceProviderForReferencesTest.java | 31 +-- .../choices/ChoiceProviderForValuesTest.java | 2 +- .../choices/ChoiceProviderTestAbstract.java | 2 +- .../ui/{ => test}/errors/JGrowlUtilTest.java | 4 +- .../wicket/ui/{ => test}/fixtures/Customers.java | 2 +- .../ui/{ => test}/pages/PageAbstractTest.java | 4 +- .../accmngt/SuccessFeedbackCookieUtilTest.java | 4 +- .../password_reset/EmailAddressValidator_Test.java | 4 +- viewers/wicket/viewer/pom.xml | 32 +-- .../AuthenticatedWebSessionForIsis.java | 9 +- .../viewer/integration/WebRequestCycleForIsis.java | 32 ++- .../ComponentFactoryRegistryDefault.java | 38 ++-- .../viewer/wicketapp/IsisWicketApplication.java | 8 +- .../ComponentFactoryRegistryDefaultTest.java | 10 +- .../wicketapp/IsisWicketApplication_Defaults.java | 28 +-- .../wicketapp/IsisWicketApplication_Pages.java | 42 ++-- 626 files changed, 6165 insertions(+), 6012 deletions(-)
