You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/18 16:25:57 UTC

[isis] branch master updated (c003307 -> ae695a6)

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from c003307  Bump org.eclipse.persistence.jpa from 2.7.8 to 2.7.9
     add e3e0bc6  ISIS-2750: replaces `@Order(OrderPrecedence.xxx)` with @javax.annotation.Priority(OrderPrecedence.xxx)
     add 9408245  ISIS-2750: changes @Order(literal) to @Priority(corresponding_literal)
     add 4f7c17f  ISIS-2750: updates OrderPrecedence constants so that none are negative
     add c97d3d1  ISIS-2750: renames OrderPrecedence to PriorityPrecedence
     add fdf0aed  ISIS-2750: renames OrderPrecedence to PriorityPrecedence
     add 06faaf5  ISIS-2750: removes @Primary throughout
     add b8dae52  ISIS-2750: fixes compile issue, import statements
     add acb583d  ISIS-2750: fixes lombok compile issue?
     add d240d1d  ISIS-2750: further compile fixes
     add 71ba561  ISIS-2750: further compile fixes
     new ae695a6  Merge pull request #617 from apache/ISIS-2750

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../replacing-default-service-implementations.adoc |  2 +-
 ...rderPrecedence.java => PriorityPrecedence.java} | 48 ++++++++++++++--------
 .../isis/applib/services/clock/ClockService.java   |  8 ++--
 .../conmap/ContentMappingServiceForCommandDto.java | 27 +++++-------
 .../ContentMappingServiceForCommandsDto.java       |  8 ++--
 .../spi/CommandDtoProcessorServiceIdentity.java    |  5 +--
 .../services/publishing/log/CommandLogger.java     |  8 ++--
 .../publishing/log/EntityChangesLogger.java        |  8 ++--
 .../publishing/log/EntityPropertyChangeLogger.java |  8 ++--
 .../services/publishing/log/ExecutionLogger.java   |  8 ++--
 .../queryresultscache/QueryResultsCache.java       |  8 ++--
 .../session/SessionLoggingServiceLogging.java      |  8 ++--
 .../isis/applib/services/sudo/SudoService.java     |  8 ++--
 .../isis/applib/services/user/UserService.java     |  8 ++--
 .../config/beans/IsisBeanTypeRegistryDefault.java  |  9 ++--
 .../DataSourceIntrospectionService.java            |  8 ++--
 .../config/environment/IsisSystemEnvironment.java  | 30 ++++++--------
 .../config/viewer/wicket/WebAppContextPath.java    |  8 ++--
 ...teractionAwareTransactionalBoundaryHandler.java | 10 ++---
 .../metamodel/facets/FacetFactoryAbstract.java     |  6 +--
 .../objectmanager/ObjectManagerDefault.java        |  8 ++--
 .../metamodel/services/ServiceInjectorDefault.java | 22 ++++------
 .../ApplicationFeatureRepositoryDefault.java       | 44 +++++++-------------
 .../classsubstitutor/ClassSubstitutorDefault.java  |  5 +--
 .../ClassSubstitutorForCollections.java            |  6 +--
 .../ClassSubstitutorForDomainObjects.java          |  5 +--
 .../classsubstitutor/ClassSubstitutorRegistry.java |  5 +--
 .../services/events/MetamodelEventService.java     |  8 ++--
 ...ExceptionRecognizerForRecoverableException.java |  8 ++--
 .../services/grid/GridLoaderServiceDefault.java    |  8 ++--
 .../services/grid/GridReaderUsingJaxb.java         | 26 +++++-------
 .../services/grid/GridServiceDefault.java          | 27 +++++-------
 .../bootstrap3/GridSystemServiceBootstrap.java     |  8 ++--
 .../services/layout/LayoutServiceDefault.java      | 25 +++++------
 .../metamodel/MetaModelServiceDefault.java         | 11 ++---
 .../services/registry/ServiceRegistryDefault.java  |  8 ++--
 .../tablecol/TableColumnOrderServiceDefault.java   |  8 ++--
 .../services/title/TitleServiceDefault.java        |  8 ++--
 .../specloader/ProgrammingModelServiceDefault.java |  8 ++--
 .../specloader/SpecificationLoaderDefault.java     |  8 ++--
 .../valuetypes/ValueTypeProviderDefault.java       |  5 +--
 .../valuetypes/ValueTypeProviderForBuiltin.java    |  5 +--
 .../ValueTypeProviderForCollections.java           |  5 +--
 .../metamodel/valuetypes/ValueTypeRegistry.java    |  5 +--
 .../core/runtime/events/MetamodelEventService.java |  8 ++--
 .../bookmarks/BookmarkServiceDefault.java          | 31 ++++++--------
 .../command/CommandDtoFactoryDefault.java          | 23 ++++-------
 .../command/CommandExecutorServiceDefault.java     | 44 ++++++++------------
 .../runtimeservices/email/EmailServiceDefault.java |  8 ++--
 .../eventbus/EventBusServiceSpring.java            | 15 +++----
 .../executor/MemberExecutorServiceDefault.java     |  8 ++--
 .../factory/FactoryServiceDefault.java             | 16 ++++----
 .../homepage/HomePageResolverServiceDefault.java   |  5 +--
 .../i18n/po/TranslationServicePo.java              | 10 ++---
 .../interaction/InteractionDtoFactoryDefault.java  |  8 ++--
 .../runtimeservices/jaxb/JaxbServiceDefault.java   | 39 ++++++++----------
 .../menubars/MenuBarsLoaderServiceDefault.java     | 10 ++---
 .../menubars/bootstrap3/MenuBarsServiceBS3.java    | 37 ++++++++---------
 .../message/MessageServiceDefault.java             | 26 +++++-------
 .../publish/CommandPublisherDefault.java           | 33 +++++++--------
 .../publish/EntityChangesPublisherDefault.java     | 36 +++++++---------
 .../EntityPropertyChangePublisherDefault.java      | 31 ++++++--------
 .../publish/ExecutionPublisherDefault.java         | 11 ++---
 .../ExceptionRecognizerServiceDefault.java         | 10 ++---
 .../ExceptionRecognizerForDataAccessException.java |  5 +--
 .../repository/RepositoryServiceDefault.java       |  8 ++--
 .../routing/RoutingServiceDefault.java             |  8 ++--
 .../scratchpad/ScratchpadDefault.java              |  8 ++--
 .../session/InteractionServiceDefault.java         | 10 ++---
 .../transaction/TransactionServiceSpring.java      | 10 ++---
 .../UrlEncodingServiceWithCompression.java         |  8 ++--
 .../user/ImpersonateMenuAdvisorDefault.java        |  5 +--
 .../user/ImpersonatedUserHolderDefault.java        |  5 +--
 .../userreg/EmailNotificationServiceDefault.java   |  8 ++--
 .../wrapper/WrapperFactoryDefault.java             |  9 ++--
 .../runtimeservices/xml/XmlServiceDefault.java     |  9 ++--
 .../xmlsnapshot/XmlSnapshotServiceDefault.java     |  8 ++--
 .../manager/AuthenticationManager.java             |  8 ++--
 .../standard/RandomCodeGeneratorDefault.java       |  8 ++--
 .../manager/AuthorizationManager.java              | 25 +++++------
 .../changetracking/EntityChangeTrackerDefault.java |  8 ++--
 .../changetracking/events/TimestampService.java    | 12 +++---
 .../confmenu/ConfigurationViewServiceDefault.java  |  8 ++--
 .../ImpersonatedUserHolderUsingHttpSession.java    |  5 +--
 .../logonlog/WebModuleLogOnExceptionLogger.java    |  5 +--
 .../templresources/WebModuleTemplateResources.java |  5 +--
 .../dom/_infra/seed/SeedServiceAbstract.java       |  6 +--
 .../UrlEncodingServiceNaiveInMemory.java           |  8 ++--
 .../domain/_commands/ExposePersistedCommands.java  |  5 +--
 .../strings/samples/JavaLangStringSamples.java     | 10 ++---
 .../ui/custom/WhereInTheWorldPanelFactory.java     |  5 +--
 .../commandlog/jdo/CommandSubscriberForJdo.java    |  5 +--
 .../commandlog/jdo/entities/CommandJdo.java        | 13 ++----
 .../jdo/entities/CommandJdoRepository.java         |  5 +--
 .../commandlog/jdo/ui/CommandServiceMenu.java      |  5 +--
 .../commandlog/jpa/entities/CommandJpa.java        |  5 +--
 .../jpa/entities/CommandJpaRepository.java         |  5 +--
 .../primary/config/PrimaryConfig.java              |  5 +--
 .../primary/restapi/CommandRetrievalService.java   | 12 ++----
 .../primary/spiimpl/CaptureResultOfCommand.java    |  5 +--
 .../primary/ui/CommandReplayOnPrimaryService.java  | 14 ++-----
 .../analyser/CommandReplayAnalyserException.java   |  5 +--
 .../analyser/CommandReplayAnalyserResult.java      |  5 +--
 .../analysis/CommandReplayAnalysisService.java     |  5 +--
 .../secondary/config/SecondaryConfig.java          |  5 +--
 .../secondary/fetch/CommandFetcher.java            |  5 +--
 .../ui/CommandReplayOnSecondaryService.java        | 13 ++----
 .../secman/applib/IsisModuleExtSecmanApplib.java   | 11 -----
 .../secman/applib/SecmanAutoConfiguration.java     |  4 +-
 .../applib/seed/SeedSecurityModuleService.java     | 18 ++++----
 .../PasswordEncryptionServiceUsingJBcrypt.java     |  5 +--
 .../AuthenticatorSecmanAutoConfiguration.java      |  4 +-
 .../integration/authorizor/AuthorizorSecman.java   |  5 +--
 .../spiimpl/ImpersonateMenuAdvisorForSecman.java   |  5 +--
 .../TableColumnVisibilityServiceForSecman.java     |  5 +--
 .../userreg/UserRegistrationServiceForSecman.java  |  5 +--
 ...thenticationConverterOfOAuth2UserPrincipal.java |  5 +--
 .../extensions/cors/impl/IsisModuleExtCors.java    |  4 +-
 .../ui/components/markup/MarkupFieldFactory.java   |  2 +-
 .../ui/components/number/NumberFieldFactory.java   |  2 +-
 .../objectref/ObjectReferenceFieldFactory.java     |  2 +-
 .../ui/components/other/FallbackFieldFactory.java  |  2 +-
 .../components/temporal/TemporalFieldFactory.java  |  2 +-
 .../ui/components/text/TextFieldFactory.java       |  2 +-
 .../ui/components/blob/BlobFieldFactory.java       |  6 +--
 .../ui/components/clob/ClobFieldFactory.java       |  6 +--
 .../ui/components/markup/MarkupFieldFactory.java   |  6 +--
 .../ui/components/other/FallbackFieldFactory.java  |  6 +--
 .../components/temporal/TemporalFieldFactory.java  |  6 +--
 .../ui/components/text/TextFieldFactory.java       |  6 +--
 .../ui/components/text/uuid/UuidFieldFactory.java  |  6 +--
 .../jdo/datanucleus/IsisModuleJdoDatanucleus.java  | 36 ++++++++--------
 .../jdo/datanucleus/config/DnSettings.java         |  6 ++-
 .../jdosupport/JdoSupportServiceDefault.java       |  8 ++--
 .../jpa/eclipselink/config/ElSettings.java         |  5 ++-
 .../SpringServiceInjectOrderTest.java              | 19 +++------
 .../testdomain/conf/Configuration_headless.java    |  5 +--
 .../bypass/authentication/AuthenticatorBypass.java |  5 +--
 .../bypass/authorization/AuthorizorBypass.java     |  5 +--
 .../authentication/AuthenticatorKeycloak.java      |  5 +--
 .../keycloak/webmodule/WebModuleKeycloak.java      |  5 +--
 .../shiro/authentication/AuthenticatorShiro.java   |  5 +--
 .../shiro/authorization/AuthorizorShiro.java       |  5 +--
 .../security/shiro/webmodule/WebModuleShiro.java   |  5 +--
 ...nticationConverterOfAuthenticatedPrincipal.java |  5 +--
 .../AuthenticationConverterOfStringPrincipal.java  |  5 +--
 ...henticationConverterOfUserDetailsPrincipal.java |  5 +--
 .../spring/authentication/AuthenticatorSpring.java |  5 +--
 .../spring/webmodule/WebModuleSpringSecurity.java  |  5 +--
 .../applib/services/calendar/CalendarService.java  | 23 ++++-------
 .../subdomains/excel/applib/dom/ExcelService.java  | 34 +++++++--------
 .../spring/applib/service/SpringBeansService.java  |  6 +--
 .../fakedata/applib/services/FakeDataService.java  |  8 ++--
 .../fixturescripts/ExecutionParametersService.java |  9 ----
 ...xecutionParametersServiceAutoConfiguration.java |  6 +--
 ...iptsSpecificationProviderAutoConfiguration.java |  4 +-
 .../applib/modules/ModuleWithFixturesService.java  |  8 ++--
 .../QueryResultsCacheControlForFixtures.java       |  8 ++--
 .../services/InitialFixtureScriptsInstaller.java   | 27 ++++++------
 .../h2console/ui/webmodule/WebModuleH2Console.java |  5 +--
 .../applib/IsisIntegrationTestAbstract.java        |  5 +--
 .../ui/vaa/components/AsciiDocFieldFactoryVaa.java |  6 +--
 .../sse/ui/wkt/services/SseServiceDefault.java     |  8 ++--
 .../wkt/webmodule/WebModuleServerSentEvents.java   |  5 +--
 .../UserProfileUiModelProviderDefault.java         | 10 ++---
 .../webmodule/WebModuleJaxrsResteasy4.java         |  5 +--
 .../rendering/domainobjects/JsonValueEncoder.java  |  8 ++--
 .../rendering/service/RepresentationService.java   |  8 ++--
 .../acceptheader/AcceptHeaderServiceForRest.java   | 30 ++++++--------
 ...entNegotiationServiceForRestfulObjectsV1_0.java |  8 ++--
 .../ContentNegotiationServiceOrgApacheIsisV1.java  |  5 +--
 .../ContentNegotiationServiceOrgApacheIsisV2.java  |  5 +--
 .../ContentNegotiationServiceXRoDomainType.java    |  5 +--
 .../service/swagger/SwaggerServiceDefault.java     | 20 ++++-----
 .../mappers/ExceptionMapperForObjectNotFound.java  |  5 +--
 ...xceptionMapperForRestfulObjectsApplication.java |  5 +--
 .../ExceptionMapperForRuntimeException.java        |  5 +--
 .../themepicker/IsisWicketThemeSupportDefault.java |  8 ++--
 .../ComponentFactoryRegistrarDefault.java          | 25 ++++-------
 .../ComponentFactoryRegistryDefault.java           |  8 ++--
 .../registries/pages/PageClassListDefault.java     | 19 ++++-----
 .../registries/pages/PageClassRegistryDefault.java | 26 +++++-------
 .../pages/PageNavigationServiceDefault.java        | 19 ++++-----
 .../viewer/services/BookmarkUiServiceWicket.java   |  5 +--
 .../viewer/services/DeepLinkServiceWicket.java     |  5 +--
 .../services/HintStoreUsingWicketSession.java      |  5 +--
 .../services/ImageResourceCacheClassPath.java      |  8 ++--
 .../viewer/services/LocaleProviderWicket.java      |  5 +--
 .../services/TranslationsResolverWicket.java       |  5 +--
 .../services/WicketViewerSettingsDefault.java      |  8 ++--
 .../mementos/ObjectMementoServiceWicket.java       |  5 +--
 .../wicket/viewer/webmodule/WebModuleWicket.java   |  5 +--
 192 files changed, 781 insertions(+), 1169 deletions(-)
 rename api/applib/src/main/java/org/apache/isis/applib/annotation/{OrderPrecedence.java => PriorityPrecedence.java} (60%)

[isis] 01/01: Merge pull request #617 from apache/ISIS-2750

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit ae695a67a07be96d8de91c643374e70ef209ea31
Merge: c003307 71ba561
Author: Dan Haywood <da...@apache.org>
AuthorDate: Fri Jun 18 17:25:48 2021 +0100

    Merge pull request #617 from apache/ISIS-2750
    
    Isis 2750: uses @Priority instead of @Order, and removes @Primary everywhere.

 .../replacing-default-service-implementations.adoc |  2 +-
 ...rderPrecedence.java => PriorityPrecedence.java} | 48 ++++++++++++++--------
 .../isis/applib/services/clock/ClockService.java   |  8 ++--
 .../conmap/ContentMappingServiceForCommandDto.java | 27 +++++-------
 .../ContentMappingServiceForCommandsDto.java       |  8 ++--
 .../spi/CommandDtoProcessorServiceIdentity.java    |  5 +--
 .../services/publishing/log/CommandLogger.java     |  8 ++--
 .../publishing/log/EntityChangesLogger.java        |  8 ++--
 .../publishing/log/EntityPropertyChangeLogger.java |  8 ++--
 .../services/publishing/log/ExecutionLogger.java   |  8 ++--
 .../queryresultscache/QueryResultsCache.java       |  8 ++--
 .../session/SessionLoggingServiceLogging.java      |  8 ++--
 .../isis/applib/services/sudo/SudoService.java     |  8 ++--
 .../isis/applib/services/user/UserService.java     |  8 ++--
 .../config/beans/IsisBeanTypeRegistryDefault.java  |  9 ++--
 .../DataSourceIntrospectionService.java            |  8 ++--
 .../config/environment/IsisSystemEnvironment.java  | 30 ++++++--------
 .../config/viewer/wicket/WebAppContextPath.java    |  8 ++--
 ...teractionAwareTransactionalBoundaryHandler.java | 10 ++---
 .../metamodel/facets/FacetFactoryAbstract.java     |  6 +--
 .../objectmanager/ObjectManagerDefault.java        |  8 ++--
 .../metamodel/services/ServiceInjectorDefault.java | 22 ++++------
 .../ApplicationFeatureRepositoryDefault.java       | 44 +++++++-------------
 .../classsubstitutor/ClassSubstitutorDefault.java  |  5 +--
 .../ClassSubstitutorForCollections.java            |  6 +--
 .../ClassSubstitutorForDomainObjects.java          |  5 +--
 .../classsubstitutor/ClassSubstitutorRegistry.java |  5 +--
 .../services/events/MetamodelEventService.java     |  8 ++--
 ...ExceptionRecognizerForRecoverableException.java |  8 ++--
 .../services/grid/GridLoaderServiceDefault.java    |  8 ++--
 .../services/grid/GridReaderUsingJaxb.java         | 26 +++++-------
 .../services/grid/GridServiceDefault.java          | 27 +++++-------
 .../bootstrap3/GridSystemServiceBootstrap.java     |  8 ++--
 .../services/layout/LayoutServiceDefault.java      | 25 +++++------
 .../metamodel/MetaModelServiceDefault.java         | 11 ++---
 .../services/registry/ServiceRegistryDefault.java  |  8 ++--
 .../tablecol/TableColumnOrderServiceDefault.java   |  8 ++--
 .../services/title/TitleServiceDefault.java        |  8 ++--
 .../specloader/ProgrammingModelServiceDefault.java |  8 ++--
 .../specloader/SpecificationLoaderDefault.java     |  8 ++--
 .../valuetypes/ValueTypeProviderDefault.java       |  5 +--
 .../valuetypes/ValueTypeProviderForBuiltin.java    |  5 +--
 .../ValueTypeProviderForCollections.java           |  5 +--
 .../metamodel/valuetypes/ValueTypeRegistry.java    |  5 +--
 .../core/runtime/events/MetamodelEventService.java |  8 ++--
 .../bookmarks/BookmarkServiceDefault.java          | 31 ++++++--------
 .../command/CommandDtoFactoryDefault.java          | 23 ++++-------
 .../command/CommandExecutorServiceDefault.java     | 44 ++++++++------------
 .../runtimeservices/email/EmailServiceDefault.java |  8 ++--
 .../eventbus/EventBusServiceSpring.java            | 15 +++----
 .../executor/MemberExecutorServiceDefault.java     |  8 ++--
 .../factory/FactoryServiceDefault.java             | 16 ++++----
 .../homepage/HomePageResolverServiceDefault.java   |  5 +--
 .../i18n/po/TranslationServicePo.java              | 10 ++---
 .../interaction/InteractionDtoFactoryDefault.java  |  8 ++--
 .../runtimeservices/jaxb/JaxbServiceDefault.java   | 39 ++++++++----------
 .../menubars/MenuBarsLoaderServiceDefault.java     | 10 ++---
 .../menubars/bootstrap3/MenuBarsServiceBS3.java    | 37 ++++++++---------
 .../message/MessageServiceDefault.java             | 26 +++++-------
 .../publish/CommandPublisherDefault.java           | 33 +++++++--------
 .../publish/EntityChangesPublisherDefault.java     | 36 +++++++---------
 .../EntityPropertyChangePublisherDefault.java      | 31 ++++++--------
 .../publish/ExecutionPublisherDefault.java         | 11 ++---
 .../ExceptionRecognizerServiceDefault.java         | 10 ++---
 .../ExceptionRecognizerForDataAccessException.java |  5 +--
 .../repository/RepositoryServiceDefault.java       |  8 ++--
 .../routing/RoutingServiceDefault.java             |  8 ++--
 .../scratchpad/ScratchpadDefault.java              |  8 ++--
 .../session/InteractionServiceDefault.java         | 10 ++---
 .../transaction/TransactionServiceSpring.java      | 10 ++---
 .../UrlEncodingServiceWithCompression.java         |  8 ++--
 .../user/ImpersonateMenuAdvisorDefault.java        |  5 +--
 .../user/ImpersonatedUserHolderDefault.java        |  5 +--
 .../userreg/EmailNotificationServiceDefault.java   |  8 ++--
 .../wrapper/WrapperFactoryDefault.java             |  9 ++--
 .../runtimeservices/xml/XmlServiceDefault.java     |  9 ++--
 .../xmlsnapshot/XmlSnapshotServiceDefault.java     |  8 ++--
 .../manager/AuthenticationManager.java             |  8 ++--
 .../standard/RandomCodeGeneratorDefault.java       |  8 ++--
 .../manager/AuthorizationManager.java              | 25 +++++------
 .../changetracking/EntityChangeTrackerDefault.java |  8 ++--
 .../changetracking/events/TimestampService.java    | 12 +++---
 .../confmenu/ConfigurationViewServiceDefault.java  |  8 ++--
 .../ImpersonatedUserHolderUsingHttpSession.java    |  5 +--
 .../logonlog/WebModuleLogOnExceptionLogger.java    |  5 +--
 .../templresources/WebModuleTemplateResources.java |  5 +--
 .../dom/_infra/seed/SeedServiceAbstract.java       |  6 +--
 .../UrlEncodingServiceNaiveInMemory.java           |  8 ++--
 .../domain/_commands/ExposePersistedCommands.java  |  5 +--
 .../strings/samples/JavaLangStringSamples.java     | 10 ++---
 .../ui/custom/WhereInTheWorldPanelFactory.java     |  5 +--
 .../commandlog/jdo/CommandSubscriberForJdo.java    |  5 +--
 .../commandlog/jdo/entities/CommandJdo.java        | 13 ++----
 .../jdo/entities/CommandJdoRepository.java         |  5 +--
 .../commandlog/jdo/ui/CommandServiceMenu.java      |  5 +--
 .../commandlog/jpa/entities/CommandJpa.java        |  5 +--
 .../jpa/entities/CommandJpaRepository.java         |  5 +--
 .../primary/config/PrimaryConfig.java              |  5 +--
 .../primary/restapi/CommandRetrievalService.java   | 12 ++----
 .../primary/spiimpl/CaptureResultOfCommand.java    |  5 +--
 .../primary/ui/CommandReplayOnPrimaryService.java  | 14 ++-----
 .../analyser/CommandReplayAnalyserException.java   |  5 +--
 .../analyser/CommandReplayAnalyserResult.java      |  5 +--
 .../analysis/CommandReplayAnalysisService.java     |  5 +--
 .../secondary/config/SecondaryConfig.java          |  5 +--
 .../secondary/fetch/CommandFetcher.java            |  5 +--
 .../ui/CommandReplayOnSecondaryService.java        | 13 ++----
 .../secman/applib/IsisModuleExtSecmanApplib.java   | 11 -----
 .../secman/applib/SecmanAutoConfiguration.java     |  4 +-
 .../applib/seed/SeedSecurityModuleService.java     | 18 ++++----
 .../PasswordEncryptionServiceUsingJBcrypt.java     |  5 +--
 .../AuthenticatorSecmanAutoConfiguration.java      |  4 +-
 .../integration/authorizor/AuthorizorSecman.java   |  5 +--
 .../spiimpl/ImpersonateMenuAdvisorForSecman.java   |  5 +--
 .../TableColumnVisibilityServiceForSecman.java     |  5 +--
 .../userreg/UserRegistrationServiceForSecman.java  |  5 +--
 ...thenticationConverterOfOAuth2UserPrincipal.java |  5 +--
 .../extensions/cors/impl/IsisModuleExtCors.java    |  4 +-
 .../ui/components/markup/MarkupFieldFactory.java   |  2 +-
 .../ui/components/number/NumberFieldFactory.java   |  2 +-
 .../objectref/ObjectReferenceFieldFactory.java     |  2 +-
 .../ui/components/other/FallbackFieldFactory.java  |  2 +-
 .../components/temporal/TemporalFieldFactory.java  |  2 +-
 .../ui/components/text/TextFieldFactory.java       |  2 +-
 .../ui/components/blob/BlobFieldFactory.java       |  6 +--
 .../ui/components/clob/ClobFieldFactory.java       |  6 +--
 .../ui/components/markup/MarkupFieldFactory.java   |  6 +--
 .../ui/components/other/FallbackFieldFactory.java  |  6 +--
 .../components/temporal/TemporalFieldFactory.java  |  6 +--
 .../ui/components/text/TextFieldFactory.java       |  6 +--
 .../ui/components/text/uuid/UuidFieldFactory.java  |  6 +--
 .../jdo/datanucleus/IsisModuleJdoDatanucleus.java  | 36 ++++++++--------
 .../jdo/datanucleus/config/DnSettings.java         |  6 ++-
 .../jdosupport/JdoSupportServiceDefault.java       |  8 ++--
 .../jpa/eclipselink/config/ElSettings.java         |  5 ++-
 .../SpringServiceInjectOrderTest.java              | 19 +++------
 .../testdomain/conf/Configuration_headless.java    |  5 +--
 .../bypass/authentication/AuthenticatorBypass.java |  5 +--
 .../bypass/authorization/AuthorizorBypass.java     |  5 +--
 .../authentication/AuthenticatorKeycloak.java      |  5 +--
 .../keycloak/webmodule/WebModuleKeycloak.java      |  5 +--
 .../shiro/authentication/AuthenticatorShiro.java   |  5 +--
 .../shiro/authorization/AuthorizorShiro.java       |  5 +--
 .../security/shiro/webmodule/WebModuleShiro.java   |  5 +--
 ...nticationConverterOfAuthenticatedPrincipal.java |  5 +--
 .../AuthenticationConverterOfStringPrincipal.java  |  5 +--
 ...henticationConverterOfUserDetailsPrincipal.java |  5 +--
 .../spring/authentication/AuthenticatorSpring.java |  5 +--
 .../spring/webmodule/WebModuleSpringSecurity.java  |  5 +--
 .../applib/services/calendar/CalendarService.java  | 23 ++++-------
 .../subdomains/excel/applib/dom/ExcelService.java  | 34 +++++++--------
 .../spring/applib/service/SpringBeansService.java  |  6 +--
 .../fakedata/applib/services/FakeDataService.java  |  8 ++--
 .../fixturescripts/ExecutionParametersService.java |  9 ----
 ...xecutionParametersServiceAutoConfiguration.java |  6 +--
 ...iptsSpecificationProviderAutoConfiguration.java |  4 +-
 .../applib/modules/ModuleWithFixturesService.java  |  8 ++--
 .../QueryResultsCacheControlForFixtures.java       |  8 ++--
 .../services/InitialFixtureScriptsInstaller.java   | 27 ++++++------
 .../h2console/ui/webmodule/WebModuleH2Console.java |  5 +--
 .../applib/IsisIntegrationTestAbstract.java        |  5 +--
 .../ui/vaa/components/AsciiDocFieldFactoryVaa.java |  6 +--
 .../sse/ui/wkt/services/SseServiceDefault.java     |  8 ++--
 .../wkt/webmodule/WebModuleServerSentEvents.java   |  5 +--
 .../UserProfileUiModelProviderDefault.java         | 10 ++---
 .../webmodule/WebModuleJaxrsResteasy4.java         |  5 +--
 .../rendering/domainobjects/JsonValueEncoder.java  |  8 ++--
 .../rendering/service/RepresentationService.java   |  8 ++--
 .../acceptheader/AcceptHeaderServiceForRest.java   | 30 ++++++--------
 ...entNegotiationServiceForRestfulObjectsV1_0.java |  8 ++--
 .../ContentNegotiationServiceOrgApacheIsisV1.java  |  5 +--
 .../ContentNegotiationServiceOrgApacheIsisV2.java  |  5 +--
 .../ContentNegotiationServiceXRoDomainType.java    |  5 +--
 .../service/swagger/SwaggerServiceDefault.java     | 20 ++++-----
 .../mappers/ExceptionMapperForObjectNotFound.java  |  5 +--
 ...xceptionMapperForRestfulObjectsApplication.java |  5 +--
 .../ExceptionMapperForRuntimeException.java        |  5 +--
 .../themepicker/IsisWicketThemeSupportDefault.java |  8 ++--
 .../ComponentFactoryRegistrarDefault.java          | 25 ++++-------
 .../ComponentFactoryRegistryDefault.java           |  8 ++--
 .../registries/pages/PageClassListDefault.java     | 19 ++++-----
 .../registries/pages/PageClassRegistryDefault.java | 26 +++++-------
 .../pages/PageNavigationServiceDefault.java        | 19 ++++-----
 .../viewer/services/BookmarkUiServiceWicket.java   |  5 +--
 .../viewer/services/DeepLinkServiceWicket.java     |  5 +--
 .../services/HintStoreUsingWicketSession.java      |  5 +--
 .../services/ImageResourceCacheClassPath.java      |  8 ++--
 .../viewer/services/LocaleProviderWicket.java      |  5 +--
 .../services/TranslationsResolverWicket.java       |  5 +--
 .../services/WicketViewerSettingsDefault.java      |  8 ++--
 .../mementos/ObjectMementoServiceWicket.java       |  5 +--
 .../wicket/viewer/webmodule/WebModuleWicket.java   |  5 +--
 192 files changed, 781 insertions(+), 1169 deletions(-)