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/02/11 08:30:51 UTC
[isis] 09/15: ISIS-2284: (possibly unnecessary) - annotate all
ExceptionMapperFor...
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 e3319980b905d648f0b8b77057b168e3aba71f15
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 22:45:29 2020 +0000
ISIS-2284: (possibly unnecessary) - annotate all ExceptionMapperFor...
with @Singleton, and specify @Order precedence.
---
.../viewer/mappers/ExceptionMapperForObjectNotFound.java | 6 ++++++
.../mappers/ExceptionMapperForRestfulObjectsApplication.java | 7 ++++++-
.../viewer/mappers/ExceptionMapperForRuntimeException.java | 6 ++++++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
index 69b503f..e6f2ff7 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
@@ -18,15 +18,21 @@
*/
package org.apache.isis.viewer.restfulobjects.viewer.mappers;
+import javax.inject.Singleton;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.metamodel.adapter.oid.ObjectNotFoundException;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
@Component
@Provider
+@Singleton
+@Order(OrderPrecedence.MIDPOINT)
public class ExceptionMapperForObjectNotFound extends ExceptionMapperAbstract<ObjectNotFoundException> {
@Override
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
index de6eeea..d709b14 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
@@ -18,16 +18,21 @@
*/
package org.apache.isis.viewer.restfulobjects.viewer.mappers;
+import javax.inject.Singleton;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
@Component
@Provider
-public class ExceptionMapperForRestfulObjectsApplication
+@Singleton
+@Order(OrderPrecedence.MIDPOINT)
+public class ExceptionMapperForRestfulObjectsApplication
extends ExceptionMapperAbstract<RestfulObjectsApplicationException> {
@Override
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
index 7aff4b2..e565f70 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
@@ -18,13 +18,19 @@
*/
package org.apache.isis.viewer.restfulobjects.viewer.mappers;
+import javax.inject.Singleton;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+
@Component
@Provider
+@Singleton
+@Order(OrderPrecedence.LATE)
public class ExceptionMapperForRuntimeException extends ExceptionMapperAbstract<RuntimeException> {
@Override