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:55 UTC
[isis] branch master updated (59b5871 -> 3dc9b57)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 59b5871 ISIS-2502: remove ApplicationException as adds no new semantics compared to the already existing RecoverableException
new 22cb1ae ISIS-2502: move TranslatableException
new 3dc9b57 ISIS-2502: rationalize 'subdomain' object type names
The 2 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:
.../relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc | 3 +++
.../main/java/org/apache/isis/applib/NonRecoverableException.java | 2 +-
.../src/main/java/org/apache/isis/applib/RecoverableException.java | 6 ++++--
.../{services/exceprecog => exceptions}/TranslatableException.java | 2 +-
.../applib/services/exceprecog/ExceptionRecognizerAbstract.java | 1 +
.../org/apache/isis/applib/services/i18n/TranslatableString.java | 2 +-
.../subdomains/base/applib/services/calendar/CalendarService.java | 2 +-
.../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 +++
10 files changed, 17 insertions(+), 8 deletions(-)
rename api/applib/src/main/java/org/apache/isis/applib/{services/exceprecog => exceptions}/TranslatableException.java (97%)
[isis] 02/02: ISIS-2502: rationalize 'subdomain' object type names
Posted by ah...@apache.org.
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("."));
}
[isis] 01/02: ISIS-2502: move TranslatableException
Posted by ah...@apache.org.
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 22cb1aed20815adec63a3d91605ff3a28c05b6f1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 27 17:06:50 2021 +0100
ISIS-2502: move TranslatableException
---
.../main/java/org/apache/isis/applib/NonRecoverableException.java | 2 +-
.../src/main/java/org/apache/isis/applib/RecoverableException.java | 6 ++++--
.../{services/exceprecog => exceptions}/TranslatableException.java | 2 +-
.../applib/services/exceprecog/ExceptionRecognizerAbstract.java | 1 +
.../org/apache/isis/applib/services/i18n/TranslatableString.java | 2 +-
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java b/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
index 6d1f6cf..54084f6 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
@@ -19,7 +19,7 @@
package org.apache.isis.applib;
-import org.apache.isis.applib.services.exceprecog.TranslatableException;
+import org.apache.isis.applib.exceptions.TranslatableException;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.functions._Functions;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java b/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
index 2f1deff..bda290e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
@@ -19,7 +19,7 @@
package org.apache.isis.applib;
-import org.apache.isis.applib.services.exceprecog.TranslatableException;
+import org.apache.isis.applib.exceptions.TranslatableException;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.exceptions._Exceptions;
@@ -49,7 +49,9 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
* @see FatalException
* @since 1.x {@index}
*/
-public class RecoverableException extends RuntimeException implements TranslatableException {
+public class RecoverableException
+extends RuntimeException
+implements TranslatableException {
private static final long serialVersionUID = 1L;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/TranslatableException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/TranslatableException.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/TranslatableException.java
rename to api/applib/src/main/java/org/apache/isis/applib/exceptions/TranslatableException.java
index 0cff16a..df24fb5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/TranslatableException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/TranslatableException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.exceprecog;
+package org.apache.isis.applib.exceptions;
import org.apache.isis.applib.services.i18n.TranslatableString;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
index 6d5140e..2377012 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
@@ -26,6 +26,7 @@ import java.util.function.UnaryOperator;
import javax.inject.Inject;
+import org.apache.isis.applib.exceptions.TranslatableException;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.base._NullSafe;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
index a6f560e..50f4a80 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
@@ -208,7 +208,7 @@ public final class TranslatableString {
*
* <p>
* NB: this method is exposed only so that implementations of
- * {@link org.apache.isis.applib.services.exceprecog.TranslatableException} can return a non-null
+ * {@link org.apache.isis.applib.exceptions.TranslatableException} can return a non-null
* {@link Exception#getMessage() message} when only a translatable message has been provided.
* </p>
*/