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 17:59:47 UTC

[isis] 08/09: ISIS-2267: updates docs

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 d8650ef03efeec34c04c58845892d6887493ade0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jan 20 15:25:03 2020 +0000

    ISIS-2267: updates docs
---
 .../modules/applib-ant/examples/annotation/OrderPrecedence.java   | 8 ++++----
 .../applib-svc/examples/services/audit/AuditerServiceLogging.java | 2 +-
 .../conmap/command/ContentMappingServiceForCommandDto.java        | 4 ++--
 .../conmap/command/ContentMappingServiceForCommandsDto.java       | 2 +-
 .../examples/services/publish/PublisherServiceLogging.java        | 2 +-
 .../services/queryresultscache/QueryResultsCacheDefault.java      | 2 +-
 .../applib-svc/examples/services/scratchpad/Scratchpad.java       | 2 +-
 .../examples/services/tablecol/TableColumnOrderService.java       | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/OrderPrecedence.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/OrderPrecedence.java
index 201061f..26b7791 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/OrderPrecedence.java
+++ b/api/applib/src/main/adoc/modules/applib-ant/examples/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/adoc/modules/applib-svc/examples/services/audit/AuditerServiceLogging.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditerServiceLogging.java
index 8222b8a..adc9570 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditerServiceLogging.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/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/adoc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandDto.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandDto.java
index ca64906..1ad9bc9 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandDto.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/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/adoc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandsDto.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandsDto.java
index 6a7e793..ade5070 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandsDto.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/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/adoc/modules/applib-svc/examples/services/publish/PublisherServiceLogging.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/PublisherServiceLogging.java
index 69fcb63..a8fb060 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/PublisherServiceLogging.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/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/adoc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
index 869e486..6f3e79c 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/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/adoc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
index 79f817b..56e4578 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/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/adoc/modules/applib-svc/examples/services/tablecol/TableColumnOrderService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/tablecol/TableColumnOrderService.java
index 7308ed8..9ade648 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/tablecol/TableColumnOrderService.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/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 {