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 2020/01/20 11:40:44 UTC
[isis] branch master updated: ISIS-2268: renames OrderPrecedence
literals
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
The following commit(s) were added to refs/heads/master by this push:
new 377ac7c ISIS-2268: renames OrderPrecedence literals
377ac7c is described below
commit 377ac7c993a582e0481e8a6a5401aa452bf7b247
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jan 20 11:10:51 2020 +0000
ISIS-2268: renames OrderPrecedence literals
---
.../java/org/apache/isis/applib/annotation/OrderPrecedence.java | 8 ++++----
.../apache/isis/applib/services/audit/AuditerServiceLogging.java | 2 +-
.../conmap/command/ContentMappingServiceForCommandDto.java | 4 ++--
.../conmap/command/ContentMappingServiceForCommandsDto.java | 2 +-
.../isis/applib/services/publish/PublisherServiceLogging.java | 2 +-
.../services/queryresultscache/QueryResultsCacheDefault.java | 2 +-
.../org/apache/isis/applib/services/scratchpad/Scratchpad.java | 2 +-
.../isis/applib/services/tablecol/TableColumnOrderService.java | 2 +-
.../isis/core/metamodel/objectmanager/ObjectManagerDefault.java | 2 +-
.../isis/core/metamodel/services/ServiceInjectorDefault.java | 2 +-
.../core/metamodel/specloader/InjectorMethodEvaluatorDefault.java | 2 +-
.../core/metamodel/specloader/SpecificationLoaderDefault.java | 2 +-
.../runtime/persistence/transaction/AuditerDispatchService.java | 2 +-
.../runtime/persistence/transaction/ChangedObjectsService.java | 2 +-
.../authentication/standard/RandomCodeGeneratorDefault.java | 2 +-
.../webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java | 2 +-
.../apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java | 2 +-
.../jdo/datanucleus5/datanucleus/DataNucleusSettings.java | 2 +-
.../isis/security/bypass/authentication/AuthenticatorBypass.java | 2 +-
.../isis/security/bypass/authorization/AuthorizorBypass.java | 2 +-
.../security/keycloak/authentication/AuthenticatorKeycloak.java | 2 +-
.../isis/security/keycloak/authorization/AuthorizorKeycloak.java | 2 +-
.../isis/security/keycloak/webmodule/WebModuleKeycloak.java | 2 +-
.../isis/security/shiro/authentication/AuthenticatorShiro.java | 2 +-
.../apache/isis/security/shiro/authorization/AuthorizorShiro.java | 4 +---
.../org/apache/isis/security/shiro/webmodule/WebModuleShiro.java | 2 +-
.../restfulobjects/rendering/domainobjects/JsonValueEncoder.java | 2 +-
.../rendering/service/RepresentationServiceContentNegotiator.java | 2 +-
.../viewer/wicket/viewer/services/BookmarkUiServiceWicket.java | 2 +-
.../isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java | 2 +-
.../wicket/viewer/services/HintStoreUsingWicketSession.java | 2 +-
31 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java
index 201061f..26b7791 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java
@@ -33,7 +33,7 @@ public class OrderPrecedence {
* @see java.lang.Integer#MIN_VALUE
* @see Ordered#HIGHEST_PRECEDENCE
*/
- public static final int HIGHEST = Ordered.HIGHEST_PRECEDENCE;
+ public static final int FIRST = Ordered.HIGHEST_PRECEDENCE;
/**
* Useful constant for the lowest precedence value.
@@ -41,12 +41,12 @@ public class OrderPrecedence {
* @see java.lang.Integer#MAX_VALUE
* @see Ordered#LOWEST_PRECEDENCE
*/
- public static final int LOWEST = Ordered.LOWEST_PRECEDENCE;
+ public static final int LAST = Ordered.LOWEST_PRECEDENCE;
/**
* Used by framework services that are unlikely to be overridden by application code.
*/
- public static final int HIGH = HIGHEST / 2;
+ public static final int EARLY = FIRST / 2;
/**
* Used by framework services that could be overridden by application code (though not commonly).
*/
@@ -54,7 +54,7 @@ public class OrderPrecedence {
/**
* Used by framework services that are expected to be overridden by application code, or that act as a fallback.
*/
- public static final int LOW = OrderPrecedence.LOWEST / 2;
+ public static final int LATE = OrderPrecedence.LAST / 2;
}
// end::refguide[]
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java b/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
index 8222b8a..adc9570 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
@@ -36,7 +36,7 @@ import lombok.extern.log4j.Log4j2;
@Service
@Named("isisApplib.AuditerServiceLogging")
-@Order(OrderPrecedence.LOW)
+@Order(OrderPrecedence.LATE)
@Primary
@Qualifier("logging")
@Log4j2
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
index ca64906..1ad9bc9 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
@@ -45,7 +45,7 @@ import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarA
@Service
@Named("isisApplib.ContentMappingServiceForCommandDto")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("CommandDto")
public class ContentMappingServiceForCommandDto implements ContentMappingService {
@@ -107,7 +107,7 @@ public class ContentMappingServiceForCommandDto implements ContentMappingService
@Named("isisApplib.ContentMappingServiceForCommandDto.CopyOverFromCommand")
// specify quite a high priority since custom processors will probably want to run after this one
// (but can choose to run before if they wish)
- @Order(OrderPrecedence.HIGH)
+ @Order(OrderPrecedence.EARLY)
@Qualifier("Command")
public static class CopyOverFromCommand implements CommandDtoProcessorService {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
index 6a7e793..ade5070 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
@@ -36,7 +36,7 @@ import org.apache.isis.schema.cmd.v2.CommandsDto;
@Service
@Named("isisApplib.ContentMappingServiceForCommandsDto")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("CommandsDto")
public class ContentMappingServiceForCommandsDto implements ContentMappingService {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java b/api/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
index 69fcb63..a8fb060 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
@@ -36,7 +36,7 @@ import lombok.extern.log4j.Log4j2;
@Service
@Named("isisApplib.PublisherServiceLogging")
-@Order(OrderPrecedence.LOW)
+@Order(OrderPrecedence.LATE)
@Primary
@Qualifier("Logging")
@Log4j2
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
index 869e486..6f3e79c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
@@ -50,7 +50,7 @@ import lombok.extern.log4j.Log4j2;
*/
@Service
@Named("isisApplib.QueryResultsCacheInternal")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@RequestScoped
@Qualifier("Default")
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java b/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
index 79f817b..56e4578 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.commons.internal.collections._Maps;
*/
@Service
@RequestScoped
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Named("isisApplib.Scratchpad")
@Qualifier("Default")
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java b/api/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
index 7308ed8..9ade648 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
@@ -46,7 +46,7 @@ public interface TableColumnOrderService {
*/
@Service
@Named("isisApplib.TableColumnOrderService.Default")
- @Order(OrderPrecedence.LOW)
+ @Order(OrderPrecedence.LATE)
@Primary
@Qualifier("Default")
public static class Default implements TableColumnOrderService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
index 97274f8..3e34df6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
@@ -44,7 +44,7 @@ import lombok.val;
*/
@Service
@Named("isisMetaModel.ObjectManagerDefault")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("DEFAULT")
public class ObjectManagerDefault implements ObjectManager {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
index b0f368a..005e300 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
@@ -40,7 +40,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
*/
@Service
@Named("isisMetaModel.ServiceInjectorDefault")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
public class ServiceInjectorDefault implements ServiceInjector {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java
index 73d58db..f0a7986 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/InjectorMethodEvaluatorDefault.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.spec.InjectorMethodEvaluator;
@Service
@Named("isisMetaModel.InjectorMethodEvaluatorDefault")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
public final class InjectorMethodEvaluatorDefault implements InjectorMethodEvaluator {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
index 214bcaa..843fb3d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
@@ -91,7 +91,7 @@ import lombok.extern.log4j.Log4j2;
*/
@Service
@Named("isisMetaModel.SpecificationLoaderDefault")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
@Log4j2
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AuditerDispatchService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AuditerDispatchService.java
index b03767d..de25b41 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AuditerDispatchService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AuditerDispatchService.java
@@ -48,7 +48,7 @@ import lombok.val;
*/
@Service
@Named("isisRuntime.AuditerDispatchService")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
public class AuditerDispatchService {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
index 6ff275d..a284ad4 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
@@ -49,7 +49,7 @@ import lombok.val;
@Service
@Named("isisRuntime.ChangedObjectsService")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
@RequestScoped
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
index 4854bc7..6b5e24e 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
@Component
@Named("isisSecurityApi.RandomCodeGenerator10Chars")
-@Order(OrderPrecedence.LOW)
+@Order(OrderPrecedence.LATE)
@Primary
@Qualifier("Default")
public class RandomCodeGeneratorDefault implements RandomCodeGenerator {
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
index e4c1eff..c42bcb4 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
@@ -43,7 +43,7 @@ import lombok.Getter;
*/
@Service
@Named("isisWebapp.WebModuleLogOnExceptionLogger")
-@Order(OrderPrecedence.HIGH - 100)
+@Order(OrderPrecedence.EARLY - 100)
@Qualifier("LogOnExceptionLogger")
public final class WebModuleLogOnExceptionLogger extends WebModuleAbstract {
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
index 01fdf15..9521691 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
@@ -49,7 +49,7 @@ import lombok.Getter;
@Service
@Named("isisMapCors.WebModuleServerCors")
@Qualifier("CORS")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
public final class WebModuleCors extends WebModuleAbstract {
private final static String CORS_FILTER_NAME = "CORS Filter";
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java
index 04bf323..552b405 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusSettings.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
*/
@Service
@Named("isisJdoDn5.DataNucleusSettings")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
public class DataNucleusSettings {
diff --git a/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
index 8ddf0c3..39f001e 100644
--- a/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
+++ b/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.security.authentication.standard.AuthenticatorAbstra
*/
@Service
@Named("isisSecurityBypass.AuthenticatorBypass")
-@Order(OrderPrecedence.LOW)
+@Order(OrderPrecedence.LATE)
@Qualifier("Bypass")
public class AuthenticatorBypass extends AuthenticatorAbstract {
diff --git a/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
index f71a56b..2aa21b2 100644
--- a/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
+++ b/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.security.authorization.standard.Authorizor;
@Service
@Named("isisSecurityBypass.AuthorizorBypass")
-@Order(OrderPrecedence.LOW)
+@Order(OrderPrecedence.LATE)
@Qualifier("Bypass")
public class AuthorizorBypass implements Authorizor {
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
index 92288ff..4436feb 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
@Service
@Named("isisSecurityKeycloak.AuthenticatorKeycloak")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Qualifier("Keycloak")
@Singleton
public class AuthenticatorKeycloak implements Authenticator {
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
index 17ab0da..df86cf4 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.security.authorization.standard.Authorizor;
@Service
@Named("isisSecurityKeycloak.AuthorizorKeycloak")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Qualifier("Keycloak")
public class AuthorizorKeycloak implements Authorizor {
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
index 181fb90..2bde721 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
@@ -40,7 +40,7 @@ import lombok.Getter;
*/
@Service
@Named("isisSecurityKeycloak.WebModuleKeycloak")
-@Order(OrderPrecedence.HIGHEST + 100)
+@Order(OrderPrecedence.FIRST + 100)
@Qualifier("Keycloak")
public final class WebModuleKeycloak extends WebModuleAbstract {
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
index e9f9e09..620c7f5 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
@@ -70,7 +70,7 @@ import lombok.extern.log4j.Log4j2;
*/
@Service
@Named("isisSecurityShiro.AuthenticatorShiro")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Qualifier("Shiro")
@Log4j2
public class AuthenticatorShiro implements Authenticator {
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
index 684305d..230712e 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
@@ -34,8 +34,6 @@ import org.apache.isis.core.security.authentication.standard.Authenticator;
import org.apache.isis.core.security.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.context.ShiroSecurityContext;
-import lombok.extern.log4j.Log4j2;
-
/**
* If Shiro is configured for both authentication and authorization (as recommended), then this class is
* in the role of {@link Authorizor}.
@@ -47,7 +45,7 @@ import lombok.extern.log4j.Log4j2;
*/
@Service
@Named("isisSecurityShiro.AuthorizorShiro")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Qualifier("Shiro")
public class AuthorizorShiro implements Authorizor {
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
index f6acb80..e76dc45 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
@@ -62,7 +62,7 @@ import lombok.val;
*/
@Service
@Named("isisSecurityKeycloak.WebModuleKeycloak")
-@Order(OrderPrecedence.HIGHEST + 200)
+@Order(OrderPrecedence.FIRST + 200)
@Qualifier("Shiro")
public class WebModuleShiro extends WebModuleAbstract {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index 27453df..120be11 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -57,7 +57,7 @@ import lombok.val;
*/
@Service
@Named("isisRoRendering.JsonValueEncoder")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
@Singleton
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
index 31e97c0..dd01e9f 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
@@ -47,7 +47,7 @@ import lombok.val;
@Service
@Named("isisRoRendering.RepresentationServiceContentNegotiator")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("ContentNegotiator")
public class RepresentationServiceContentNegotiator implements RepresentationService {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
index 6fed4dd..a5867ae 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
@@ -30,7 +30,7 @@ import org.apache.isis.viewer.wicket.viewer.integration.AuthenticatedWebSessionF
@Service
@Named("isisWicketViewer.BookmarkUiServiceWicket")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Qualifier("Wicket")
public class BookmarkUiServiceWicket implements BookmarkUiService {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index f43398d..b944a3b 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -46,7 +46,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
*/
@Service
@Named("isisWicketViewer.DeepLinkServiceWicket")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Qualifier("Wicket")
public class DeepLinkServiceWicket implements DeepLinkService {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
index 68765a3..4372c7f 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
@@ -40,7 +40,7 @@ import lombok.extern.log4j.Log4j2;
@Service
@Named("isisWicketViewer.HintStoreUsingWicketSession")
-@Order(OrderPrecedence.HIGH)
+@Order(OrderPrecedence.EARLY)
@Qualifier("Wicket")
@Log4j2
public class HintStoreUsingWicketSession implements HintStore {