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 2020/09/18 11:08:23 UTC
[isis] 02/03: ISIS-2435: Commons: move plugin specific exception
class
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 60afa22325a379d2f7744a815196a1ac30427137
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 18 12:10:21 2020 +0200
ISIS-2435: Commons: move plugin specific exception class
---
.../org/apache/isis/commons/internal/context/_Plugin.java | 11 +++++------
.../_PluginResolveException.java} | 10 +++++-----
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java b/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
index b957d4f..33354b7 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
@@ -35,7 +35,6 @@ import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.base._With;
import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.plugins.PluginResolveException;
/**
* <h1>- internal use only -</h1>
@@ -124,11 +123,11 @@ public final class _Plugin {
// -- CONVENIENT EXCEPTION FACTORIES
- public static <T> PluginResolveException ambiguityNonRecoverable(
+ public static <T> _PluginResolveException ambiguityNonRecoverable(
Class<T> pluginInterfaceClass,
Set<? extends T> ambiguousPlugins) {
- return new PluginResolveException(
+ return new _PluginResolveException(
String.format("Ambiguous plugins implementing %s found on class path.\n{%s}",
pluginInterfaceClass.getName(),
@@ -140,9 +139,9 @@ public final class _Plugin {
));
}
- public static PluginResolveException absenceNonRecoverable(Class<?> pluginInterfaceClass) {
+ public static _PluginResolveException absenceNonRecoverable(Class<?> pluginInterfaceClass) {
- return new PluginResolveException(
+ return new _PluginResolveException(
String.format("No plugin implementing %s found on class path.",
pluginInterfaceClass.getName() ));
}
@@ -174,7 +173,7 @@ public final class _Plugin {
}
} catch (Exception e) {
- throw new PluginResolveException(
+ throw new _PluginResolveException(
String.format("Failed to load plugin '%s' implementing '%s' from path '%s'.",
pluginFullyQualifiedClassName,
pluginInterfaceClass.getName(),
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java b/commons/src/main/java/org/apache/isis/commons/internal/context/_PluginResolveException.java
similarity index 76%
rename from commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java
rename to commons/src/main/java/org/apache/isis/commons/internal/context/_PluginResolveException.java
index 8363c03..f0b1cd6 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/context/_PluginResolveException.java
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.plugins;
+package org.apache.isis.commons.internal.context;
-public class PluginResolveException extends RuntimeException {
+public class _PluginResolveException extends RuntimeException {
private static final long serialVersionUID = 1L;
- public PluginResolveException(final String msg) {
+ public _PluginResolveException(final String msg) {
super(msg);
}
- public PluginResolveException(final Throwable cause) {
+ public _PluginResolveException(final Throwable cause) {
super(cause);
}
- public PluginResolveException(final String msg, final Throwable cause) {
+ public _PluginResolveException(final String msg, final Throwable cause) {
super(msg, cause);
}