You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/27 16:10:57 UTC
[isis] 02/02: ISIS-2502: rationalize 'subdomain' object type names
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3dc9b576ba76d11cb19061ec5ebd6355b0972c7d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 27 17:10:43 2021 +0100
ISIS-2502: rationalize 'subdomain' object type names
---
.../components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc | 3 +++
.../isis/subdomains/base/applib/services/calendar/CalendarService.java | 2 +-
.../java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java | 2 +-
.../isis/subdomains/spring/applib/service/SpringBeansService.java | 2 +-
.../rendering/service/swagger/internal/TaggerDefault.java | 3 +++
5 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
index 2f845f4..4e6094b 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
@@ -310,6 +310,9 @@ WARNING: check menubars.layout.xml for any occurrences
| isisExt*
| isis.ext.*
+| isisSub*
+| isis.sub.*
+
|===
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
index 3dd0c01..6a4198d 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.clock.ClockService;
@Service
-@Named("isisSubBase.calendarService")
+@Named("isis.sub.base.CalendarService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
index cf869a2..0ecd5aa 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
@@ -43,7 +43,7 @@ import org.apache.isis.subdomains.excel.applib.dom.util.ExcelServiceImpl;
import org.apache.isis.subdomains.excel.applib.dom.util.Mode;
@Service
-@Named("isisSubExcel.ExcelService")
+@Named("isis.sub.excel.ExcelService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
index d3d6209..82ea761 100644
--- a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
@@ -38,7 +38,7 @@ import lombok.experimental.UtilityClass;
* Borrowed from BeansEndpoint.
*/
@Service
-@Named("isisSubSpring.SpringBeansService")
+@Named("isis.sub.spring.SpringBeansService")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
public class SpringBeansService {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
index 0a9e643..85492f3 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
@@ -57,6 +57,9 @@ public class TaggerDefault implements Tagger {
if (objType.startsWith("isis.ext.")) {
return ". apache isis extensions - " + partsOf(objType).skip(2).limit(1).collect(Collectors.joining("."));
}
+ if (objType.startsWith("isis.sub.")) {
+ return ". apache isis subdomains - " + partsOf(objType).skip(2).limit(1).collect(Collectors.joining("."));
+ }
if (objType.startsWith("org.springframework.")) {
return "> spring framework " + partsOf(objType).skip(2).limit(1).collect(Collectors.joining("."));
}