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/28 08:56:32 UTC
[isis] branch master updated: ISIS-2502: remove IsisException
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 ab449ed ISIS-2502: remove IsisException
ab449ed is described below
commit ab449edb223a4c724e1ab056776a333c83e303d9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jan 28 09:55:43 2021 +0100
ISIS-2502: remove IsisException
there are only 2 root exception left with the framework (in support of
i18n translation)
- RecoverableException
- UnrecoverableException
---
.../apache/isis/applib/UnrecoverableException.java | 37 ++--------------
.../isis/commons/exceptions/IsisException.java | 49 ----------------------
.../commons/internal/exceptions/_Exceptions.java | 17 ++++----
.../factory/_InstanceCreationClassException.java | 4 +-
.../factory/_InstanceCreationException.java | 4 +-
.../factory/_UnavailableClassException.java | 4 +-
.../isis/commons/internal/ioc/_IocContainer.java | 1 -
7 files changed, 14 insertions(+), 102 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/UnrecoverableException.java b/api/applib/src/main/java/org/apache/isis/applib/UnrecoverableException.java
index 3cb6a28..b6e39ab 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/UnrecoverableException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/UnrecoverableException.java
@@ -22,7 +22,6 @@ package org.apache.isis.applib;
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;
/**
* Indicates that an unexpected, non-recoverable (fatal) exception has occurred within
@@ -83,16 +82,16 @@ implements TranslatableException {
? (translationContextClass.getName() +
(!_Strings.isNullOrEmpty(translationContextMethod)
? "#" + translationContextMethod
- : "")
+ : "")
)
- : null;
+ : null;
}
@Override
public String getMessage() {
return getTranslatableMessage() != null
? getTranslatableMessage().getPattern()
- : super.getMessage();
+ : super.getMessage();
}
@Override
@@ -105,35 +104,5 @@ implements TranslatableException {
return translationContext;
}
- // -- SHORTCUTS
-
- /**
- * <p><pre>
- * Path path = ...
- *
- * ## OLD
- *
- * try {
- * Files.createDirectories(path);
- * } catch (IOException e) {
- * throw new NonRecoverableException(e);
- * }
- *
- * ## NEW
- *
- * NonRecoverableException.tryRun(()->Files.createDirectories(path));
- *
- * </pre></p>
- *
- * @param checkedRunnable
- */
- public static void tryRun(_Functions.CheckedRunnable checkedRunnable) {
- try {
- checkedRunnable.run();
- } catch (Exception cause) {
- throw new UnrecoverableException(cause);
- }
- }
-
}
diff --git a/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java b/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java
deleted file mode 100644
index 819d567..0000000
--- a/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.commons.exceptions;
-
-import java.text.MessageFormat;
-
-/**
- * General exception raised by the framework, typically a system exception.
- */
-public class IsisException extends RuntimeException {
-
- private static final long serialVersionUID = 1L;
-
- public IsisException() {
- }
-
- public IsisException(final String message) {
- super(message);
- }
-
- public IsisException(final String messageFormat, final Object... args) {
- super(MessageFormat.format(messageFormat, args));
- }
-
- public IsisException(final String message, final Throwable cause) {
- super(message, cause);
- }
-
- public IsisException(final Throwable cause) {
- super(cause);
- }
-}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java b/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
index 139a3ab..785a584 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
@@ -33,7 +33,6 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.base._With;
@@ -118,20 +117,20 @@ public final class _Exceptions {
// -- UNRECOVERABLE
- public static IsisException unrecoverable(Throwable cause) {
- return new IsisException("unrecoverable error: with cause ...", cause);
+ public static RuntimeException unrecoverable(Throwable cause) {
+ return new RuntimeException("unrecoverable error: with cause ...", cause);
}
- public static IsisException unrecoverable(String msg) {
- return new IsisException(String.format("unrecoverable error: '%s'", msg));
+ public static RuntimeException unrecoverable(String msg) {
+ return new RuntimeException(String.format("unrecoverable error: '%s'", msg));
}
- public static IsisException unrecoverable(String msg, Throwable cause) {
- return new IsisException(String.format("unrecoverable error: '%s' with cause ...", msg), cause);
+ public static RuntimeException unrecoverable(String msg, Throwable cause) {
+ return new RuntimeException(String.format("unrecoverable error: '%s' with cause ...", msg), cause);
}
- public static IsisException unrecoverableFormatted(String format, Object ...args) {
- return new IsisException(String.format("unrecoverable error: '%s'",
+ public static RuntimeException unrecoverableFormatted(String format, Object ...args) {
+ return new RuntimeException(String.format("unrecoverable error: '%s'",
String.format(format, args)));
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/factory/_InstanceCreationClassException.java b/commons/src/main/java/org/apache/isis/commons/internal/factory/_InstanceCreationClassException.java
index 7bbbb62..4bf7afe 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/factory/_InstanceCreationClassException.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/factory/_InstanceCreationClassException.java
@@ -19,9 +19,7 @@
package org.apache.isis.commons.internal.factory;
-import org.apache.isis.commons.exceptions.IsisException;
-
-public class _InstanceCreationClassException extends IsisException {
+public class _InstanceCreationClassException extends RuntimeException {
private static final long serialVersionUID = 1L;
public _InstanceCreationClassException(final String s) {
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/factory/_InstanceCreationException.java b/commons/src/main/java/org/apache/isis/commons/internal/factory/_InstanceCreationException.java
index efa8f70..53d4898 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/factory/_InstanceCreationException.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/factory/_InstanceCreationException.java
@@ -19,9 +19,7 @@
package org.apache.isis.commons.internal.factory;
-import org.apache.isis.commons.exceptions.IsisException;
-
-public class _InstanceCreationException extends IsisException {
+public class _InstanceCreationException extends RuntimeException {
private static final long serialVersionUID = 1L;
public _InstanceCreationException(final String s) {
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/factory/_UnavailableClassException.java b/commons/src/main/java/org/apache/isis/commons/internal/factory/_UnavailableClassException.java
index a410940..9f46101 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/factory/_UnavailableClassException.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/factory/_UnavailableClassException.java
@@ -19,9 +19,7 @@
package org.apache.isis.commons.internal.factory;
-import org.apache.isis.commons.exceptions.IsisException;
-
-public class _UnavailableClassException extends IsisException {
+public class _UnavailableClassException extends RuntimeException {
private static final long serialVersionUID = 1L;
public _UnavailableClassException() {
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer.java b/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer.java
index d73beb4..52e6980 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer.java
@@ -29,7 +29,6 @@ import javax.annotation.Nullable;
import org.springframework.context.ApplicationContext;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.base._With;
import org.apache.isis.commons.internal.exceptions._Exceptions;