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 17:25:02 UTC
[isis] branch master updated: ISIS-2502: remove use of
IsisException with in the framework
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
The following commit(s) were added to refs/heads/master by this push:
new 6d3d5b6 ISIS-2502: remove use of IsisException with in the framework
6d3d5b6 is described below
commit 6d3d5b608530532db70f86d824af60793f6fe111
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 27 18:24:42 2021 +0100
ISIS-2502: remove use of IsisException with in the framework
yet IsisException remains in 'commons' ... could be made the root of all
exceptions the framework offers
---
.../isis/applib/exceptions/DomainModelException.java | 8 ++------
.../apache/isis/applib/exceptions/MetaModelException.java | 8 ++------
.../isis/applib/exceptions/NoAuthenticatorException.java | 7 ++-----
.../isis/applib/exceptions/ObjectNotFoundException.java | 6 +++---
.../isis/applib/exceptions/ObjectPersistenceException.java | 8 ++------
.../applib/{ => exceptions}/PersistFailedException.java | 5 ++++-
.../isis/applib/exceptions/ReflectiveActionException.java | 8 ++------
.../isis/applib/{ => exceptions}/RepositoryException.java | 5 ++++-
.../isis/applib/exceptions/UnexpectedCallException.java | 4 ++--
.../isis/applib/exceptions/UnknownTypeException.java | 4 ++--
.../isis/applib/services/factory/FactoryService.java | 6 +++---
.../isis/core/metamodel/commons/ArrayExtensions.java | 14 +++++++-------
.../isis/core/metamodel/commons/ClassExtensions.java | 4 ++--
.../facets/object/facets/FacetsFacetAbstract.java | 7 +++++--
.../value/bigdecimal/BigDecimalValueSemanticsProvider.java | 4 ++--
.../booleans/BooleanValueSemanticsProviderAbstract.java | 8 ++++----
.../isis/core/metamodel/spec/ObjectSpecification.java | 6 +++---
.../specloader/specimpl/FacetedMethodsBuilder.java | 4 ++--
.../isis/core/metamodel/util/snapshot/XmlSnapshot.java | 4 ++--
.../repository/RepositoryServiceDefault.java | 4 ++--
.../isis/core/runtimeservices/xml/XmlServiceDefault.java | 6 +++---
21 files changed, 60 insertions(+), 70 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/exceptions/DomainModelException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/DomainModelException.java
index fa1478c..b6a535a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/exceptions/DomainModelException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/DomainModelException.java
@@ -19,19 +19,15 @@
package org.apache.isis.applib.exceptions;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.applib.UnrecoverableException;
/**
* Thrown when a problem is found with the domain model, and Isis cannot
* proceed.
*/
-public class DomainModelException extends IsisException {
+public class DomainModelException extends UnrecoverableException {
private static final long serialVersionUID = 1L;
- public DomainModelException() {
- super();
- }
-
public DomainModelException(final String message) {
super(message);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/exceptions/MetaModelException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/MetaModelException.java
index b80f9f4..cb0d723 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/exceptions/MetaModelException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/MetaModelException.java
@@ -19,15 +19,11 @@
package org.apache.isis.applib.exceptions;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.applib.UnrecoverableException;
-public class MetaModelException extends IsisException {
+public class MetaModelException extends UnrecoverableException {
private static final long serialVersionUID = 1L;
- public MetaModelException() {
- super();
- }
-
public MetaModelException(final String message) {
super(message);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/exceptions/NoAuthenticatorException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/NoAuthenticatorException.java
index d9fead6..4d5a4fa 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/exceptions/NoAuthenticatorException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/NoAuthenticatorException.java
@@ -19,18 +19,15 @@
package org.apache.isis.applib.exceptions;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.applib.UnrecoverableException;
/**
* Indicates that there is no Authenticator available to authenticate a user
* based on this request.
*/
-public class NoAuthenticatorException extends IsisException {
+public class NoAuthenticatorException extends UnrecoverableException {
private static final long serialVersionUID = 1L;
- public NoAuthenticatorException() {
- }
-
public NoAuthenticatorException(final String msg) {
super(msg);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/exceptions/ObjectNotFoundException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/ObjectNotFoundException.java
index 797cb8e..bf36227 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/exceptions/ObjectNotFoundException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/ObjectNotFoundException.java
@@ -19,13 +19,13 @@
package org.apache.isis.applib.exceptions;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.applib.UnrecoverableException;
/**
* Indicates that the persistence context was unable to get an instantiate
- * of for the specified object identifier.
+ * for the specified object identifier.
*/
-public class ObjectNotFoundException extends IsisException {
+public class ObjectNotFoundException extends UnrecoverableException {
private static final long serialVersionUID = 1L;
public ObjectNotFoundException(final String oid) {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/exceptions/ObjectPersistenceException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/ObjectPersistenceException.java
index 84627dc..3de3d0b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/exceptions/ObjectPersistenceException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/ObjectPersistenceException.java
@@ -19,15 +19,11 @@
package org.apache.isis.applib.exceptions;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.applib.UnrecoverableException;
-public class ObjectPersistenceException extends IsisException {
+public class ObjectPersistenceException extends UnrecoverableException {
private static final long serialVersionUID = 1L;
- public ObjectPersistenceException() {
- super();
- }
-
public ObjectPersistenceException(final String message) {
super(message);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/PersistFailedException.java
similarity index 91%
rename from api/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java
rename to api/applib/src/main/java/org/apache/isis/applib/exceptions/PersistFailedException.java
index 314d9a2..5068aed 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/PersistFailedException.java
@@ -17,7 +17,10 @@
* under the License.
*/
-package org.apache.isis.applib;
+package org.apache.isis.applib.exceptions;
+
+import org.apache.isis.applib.RecoverableException;
+import org.apache.isis.applib.UnrecoverableException;
/**
* Indicates that the persistence of an object failed.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/exceptions/ReflectiveActionException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/ReflectiveActionException.java
index 6f3b7fa..ae915df 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/exceptions/ReflectiveActionException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/ReflectiveActionException.java
@@ -19,15 +19,11 @@
package org.apache.isis.applib.exceptions;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.applib.UnrecoverableException;
-public class ReflectiveActionException extends IsisException {
+public class ReflectiveActionException extends UnrecoverableException {
private static final long serialVersionUID = 1L;
- public ReflectiveActionException() {
- super();
- }
-
public ReflectiveActionException(final String msg) {
super(msg);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/RepositoryException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/RepositoryException.java
similarity index 91%
rename from api/applib/src/main/java/org/apache/isis/applib/RepositoryException.java
rename to api/applib/src/main/java/org/apache/isis/applib/exceptions/RepositoryException.java
index 526ce9a..158424e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/RepositoryException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/RepositoryException.java
@@ -17,7 +17,10 @@
* under the License.
*/
-package org.apache.isis.applib;
+package org.apache.isis.applib.exceptions;
+
+import org.apache.isis.applib.RecoverableException;
+import org.apache.isis.applib.UnrecoverableException;
/**
* Indicates that a repository method has failed.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnexpectedCallException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnexpectedCallException.java
index dfccff6..11f798d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnexpectedCallException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnexpectedCallException.java
@@ -19,13 +19,13 @@
package org.apache.isis.applib.exceptions;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.applib.UnrecoverableException;
/**
* Indicates that a call was made to a method (normally an overridden one) that
* was not expected, and hence not coded for.
*/
-public class UnexpectedCallException extends IsisException {
+public class UnexpectedCallException extends UnrecoverableException {
private static final long serialVersionUID = 1L;
public UnexpectedCallException() {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnknownTypeException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnknownTypeException.java
index bd6e32c..03d4ad9 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnknownTypeException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnknownTypeException.java
@@ -19,9 +19,9 @@
package org.apache.isis.applib.exceptions;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.applib.UnrecoverableException;
-public class UnknownTypeException extends IsisException {
+public class UnknownTypeException extends UnrecoverableException {
private static final long serialVersionUID = 1L;
public UnknownTypeException(final String message) {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/factory/FactoryService.java b/api/applib/src/main/java/org/apache/isis/applib/services/factory/FactoryService.java
index 6fb3e92..812583e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/factory/FactoryService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/factory/FactoryService.java
@@ -23,8 +23,8 @@ import java.util.NoSuchElementException;
import javax.annotation.Nullable;
+import org.apache.isis.applib.UnrecoverableException;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.commons.exceptions.IsisException;
import lombok.NonNull;
@@ -48,7 +48,7 @@ public interface FactoryService {
* @param requiredType
* @return
* @throws NoSuchElementException if result is empty
- * @throws IsisException if instance creation failed
+ * @throws UnrecoverableException if instance creation failed
* @throws IllegalArgumentException if requiredType is not recognized by the meta-model
*
* @since 2.0
@@ -67,7 +67,7 @@ public interface FactoryService {
* (i.e. not multiple candidates found with none marked as primary)
*
* @throws NoSuchElementException if result is empty
- * @throws IsisException if instance creation failed
+ * @throws UnrecoverableException if instance creation failed
*
* @apiNote does not force the requiredType to be added to the meta-model
* @since 2.0
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ArrayExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ArrayExtensions.java
index 6ce5742..2b7042e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ArrayExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ArrayExtensions.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.applib.UnrecoverableException;
public final class ArrayExtensions {
@@ -41,17 +41,17 @@ public final class ArrayExtensions {
convertedArray[i] = constructor.newInstance(new Object[] { Array.get(extendee, i).toString() });
}
} catch (final NoSuchMethodException e) {
- throw new IsisException(e);
+ throw new UnrecoverableException(e);
} catch (final ArrayIndexOutOfBoundsException e) {
- throw new IsisException(e);
+ throw new UnrecoverableException(e);
} catch (final IllegalArgumentException e) {
- throw new IsisException(e);
+ throw new UnrecoverableException(e);
} catch (final InstantiationException e) {
- throw new IsisException(e);
+ throw new UnrecoverableException(e);
} catch (final IllegalAccessException e) {
- throw new IsisException(e);
+ throw new UnrecoverableException(e);
} catch (final InvocationTargetException e) {
- throw new IsisException(e);
+ throw new UnrecoverableException(e);
}
return convertedArray;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassExtensions.java
index 0db0490..170dc9e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassExtensions.java
@@ -27,7 +27,7 @@ import java.net.URL;
import java.util.Objects;
import java.util.Optional;
-import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.applib.UnrecoverableException;
import org.apache.isis.commons.internal._Constants;
import org.apache.isis.commons.internal.base._Reduction;
import org.apache.isis.commons.internal.collections._Lists;
@@ -75,7 +75,7 @@ public final class ClassExtensions {
}
}
} catch (final SecurityException | IllegalArgumentException | IllegalAccessException | InstantiationException | InvocationTargetException ex) {
- throw new IsisException(ex);
+ throw new UnrecoverableException(ex);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAbstract.java
index f4982fd..6ebde09 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAbstract.java
@@ -23,13 +23,15 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.factory._InstanceUtil;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.FacetFactory;
+import lombok.extern.log4j.Log4j2;
+
+@Log4j2
public abstract class FacetsFacetAbstract extends FacetAbstract implements FacetsFacet {
public static Class<? extends Facet> type() {
@@ -74,7 +76,8 @@ public abstract class FacetsFacetAbstract extends FacetAbstract implements Facet
try {
classCandidate = _InstanceUtil.loadClass(classCandidateName);
return facetFactoryOrNull(classCandidate);
- } catch (final IsisException ex) {
+ } catch (final Exception ex) {
+ log.warn("failed to load class by name {}", classCandidateName, ex);
return null;
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
index 38571c1..1b2cab8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
@@ -25,10 +25,10 @@ import java.text.NumberFormat;
import java.util.Locale;
import java.util.Map;
+import org.apache.isis.applib.UnrecoverableException;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.exceptions.TextEntryParseException;
-import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.commons.LocaleUtil;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -127,7 +127,7 @@ implements BigDecimalValueFacet {
return (String) type.getMethod("toString", (Class[]) null).invoke(object, (Object[]) null);
}
} catch (final Exception e) {
- throw new IsisException(e);
+ throw new UnrecoverableException(e);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
index 6f0d052..866015e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
@@ -19,8 +19,8 @@
package org.apache.isis.core.metamodel.facets.value.booleans;
+import org.apache.isis.applib.UnrecoverableException;
import org.apache.isis.applib.exceptions.TextEntryParseException;
-import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
@@ -87,7 +87,7 @@ extends ValueSemanticsProviderAndFacetAbstract<Boolean> implements BooleanValueF
case 'F':
return Boolean.FALSE;
default:
- throw new IsisException("Invalid data for logical, expected 'T', 'F' or 'N, but got " + data.charAt(0));
+ throw new UnrecoverableException("Invalid data for logical, expected 'T', 'F' or 'N, but got " + data.charAt(0));
}
} else if (dataLength == 4 || dataLength == 5) {
switch (data.charAt(0)) {
@@ -96,10 +96,10 @@ extends ValueSemanticsProviderAndFacetAbstract<Boolean> implements BooleanValueF
case 'f':
return Boolean.FALSE;
default:
- throw new IsisException("Invalid data for logical, expected 't' or 'f', but got " + data.charAt(0));
+ throw new UnrecoverableException("Invalid data for logical, expected 't' or 'f', but got " + data.charAt(0));
}
}
- throw new IsisException("Invalid data for logical, expected 1, 4 or 5 bytes, got " + dataLength + ": " + data);
+ throw new UnrecoverableException("Invalid data for logical, expected 1, 4 or 5 bytes, got " + dataLength + ": " + data);
}
private boolean isSet(final Object value) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index 059958a..efa34d5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -31,9 +31,9 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
+import org.apache.isis.applib.UnrecoverableException;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.metamodel.BeanSort;
-import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Streams;
import org.apache.isis.commons.internal.exceptions._Exceptions;
@@ -433,14 +433,14 @@ extends
final Class<?> cls = correspondingClass;
if (Modifier.isAbstract(cls.getModifiers())) {
- throw new IsisException("Cannot create an instance of an abstract class: " + cls);
+ throw new UnrecoverableException("Cannot create an instance of an abstract class: " + cls);
}
final Object newInstance;
try {
newInstance = cls.newInstance();
} catch (final IllegalAccessException | InstantiationException e) {
- throw new IsisException("Failed to create instance of type " + getFullIdentifier(), e);
+ throw new UnrecoverableException("Failed to create instance of type " + getFullIdentifier(), e);
}
return newInstance;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 3c61749..58fee7a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -30,11 +30,11 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.isis.applib.UnrecoverableException;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.exceptions.MetaModelException;
-import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.reflection._Annotations;
@@ -181,7 +181,7 @@ public class FacetedMethodsBuilder {
try {
facetFactory = facetFactorie.newInstance();
} catch (final InstantiationException | IllegalAccessException e) {
- throw new IsisException(e);
+ throw new UnrecoverableException(e);
}
getFacetProcessor().injectDependenciesInto(facetFactory);
facetFactory.process(new ProcessClassContext(introspectedClass, methodRemover, inspectedTypeSpec));
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
index c3bd5ee..5ee3970 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
@@ -38,10 +38,10 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.apache.isis.applib.UnrecoverableException;
import org.apache.isis.applib.ViewModel;
import org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService.Snapshot;
import org.apache.isis.applib.snapshot.SnapshottableWithInclusions;
-import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.codec._DocumentFactories;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -164,7 +164,7 @@ public class XmlSnapshot implements Snapshot {
} catch (final ParserConfigurationException e) {
log.error("unable to build snapshot", e);
- throw new IsisException(e);
+ throw new UnrecoverableException(e);
}
for (final String path : getPathsFor(rootAdapter.getPojo())) {
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
index bb43465..55640c8 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
@@ -35,9 +35,9 @@ import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Repository;
-import org.apache.isis.applib.PersistFailedException;
-import org.apache.isis.applib.RepositoryException;
import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.exceptions.PersistFailedException;
+import org.apache.isis.applib.exceptions.RepositoryException;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryRange;
import org.apache.isis.applib.services.factory.FactoryService;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xml/XmlServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xml/XmlServiceDefault.java
index eedfc57..c45082b 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xml/XmlServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xml/XmlServiceDefault.java
@@ -41,9 +41,9 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
+import org.apache.isis.applib.UnrecoverableException;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.xml.XmlService;
-import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.codec._DocumentFactories;
import org.apache.isis.commons.internal.exceptions._Exceptions;
@@ -98,9 +98,9 @@ public class XmlServiceDefault implements XmlService {
return writer.toString();
} catch (TransformerConfigurationException e) {
- throw new IsisException(e);
+ throw new UnrecoverableException(e);
} catch (TransformerException e) {
- throw new IsisException(e);
+ throw new UnrecoverableException(e);
}
}