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 15:37:00 UTC
[isis] branch master updated: ISIS-2502: collect sub-classes of
IsisExceptions into 'applib' (3)
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 f54e0d6 ISIS-2502: collect sub-classes of IsisExceptions into 'applib' (3)
f54e0d6 is described below
commit f54e0d6f9635e65e69dc910931360d07fb729b4c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 27 16:36:47 2021 +0100
ISIS-2502: collect sub-classes of IsisExceptions into 'applib' (3)
remove UnsupportedFindException, NotPersistableException (not used)
---
.../exceptions}/NoAuthenticatorException.java | 2 +-
.../exceptions}/ReflectiveActionException.java | 2 +-
.../isis/applib/exceptions}/ServiceException.java | 2 +-
.../exceptions/UnexpectedCallException.java | 4 +-
.../applib}/exceptions/UnknownTypeException.java | 4 +-
.../metamodel/commons/ThrowableExtensions.java | 2 +-
.../ValueSemanticsProviderAndFacetAbstract.java | 2 +-
.../method/PropertyDefaultFacetViaMethod.java | 2 +-
.../image/ImageValueSemanticsProviderAbstract.java | 2 +-
.../specloader/specimpl/MemberSortingUtils.java | 2 +-
.../manager/AuthenticationManager.java | 2 +-
.../AuthenticationManager_authenticators_Test.java | 2 +-
.../applib/exceptions/NotPersistableException.java | 43 ----------------------
.../exceptions/UnsupportedFindException.java | 42 ---------------------
14 files changed, 16 insertions(+), 97 deletions(-)
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/NoAuthenticatorException.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
rename to api/applib/src/main/java/org/apache/isis/applib/exceptions/NoAuthenticatorException.java
index 01de904..d9fead6 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/NoAuthenticatorException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.applib.exceptions;
import org.apache.isis.commons.exceptions.IsisException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/ReflectiveActionException.java
similarity index 96%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java
rename to api/applib/src/main/java/org/apache/isis/applib/exceptions/ReflectiveActionException.java
index 075164f..6f3b7fa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectiveActionException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/ReflectiveActionException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.specloader;
+package org.apache.isis.applib.exceptions;
import org.apache.isis.commons.exceptions.IsisException;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ServiceException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/ServiceException.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ServiceException.java
rename to api/applib/src/main/java/org/apache/isis/applib/exceptions/ServiceException.java
index d12eed7..a32b026 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ServiceException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/ServiceException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtimeservices;
+package org.apache.isis.applib.exceptions;
import org.apache.isis.commons.exceptions.IsisException;
diff --git a/commons/src/main/java/org/apache/isis/commons/exceptions/UnexpectedCallException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnexpectedCallException.java
similarity index 92%
rename from commons/src/main/java/org/apache/isis/commons/exceptions/UnexpectedCallException.java
rename to api/applib/src/main/java/org/apache/isis/applib/exceptions/UnexpectedCallException.java
index 537bf42..dfccff6 100644
--- a/commons/src/main/java/org/apache/isis/commons/exceptions/UnexpectedCallException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnexpectedCallException.java
@@ -17,7 +17,9 @@
* under the License.
*/
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.applib.exceptions;
+
+import org.apache.isis.commons.exceptions.IsisException;
/**
* Indicates that a call was made to a method (normally an overridden one) that
diff --git a/commons/src/main/java/org/apache/isis/commons/exceptions/UnknownTypeException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnknownTypeException.java
similarity index 91%
rename from commons/src/main/java/org/apache/isis/commons/exceptions/UnknownTypeException.java
rename to api/applib/src/main/java/org/apache/isis/applib/exceptions/UnknownTypeException.java
index dc448d6..bd6e32c 100644
--- a/commons/src/main/java/org/apache/isis/commons/exceptions/UnknownTypeException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/UnknownTypeException.java
@@ -17,7 +17,9 @@
* under the License.
*/
-package org.apache.isis.commons.exceptions;
+package org.apache.isis.applib.exceptions;
+
+import org.apache.isis.commons.exceptions.IsisException;
public class UnknownTypeException extends IsisException {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ThrowableExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ThrowableExtensions.java
index 2f2eeb3..3aeb3e3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ThrowableExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ThrowableExtensions.java
@@ -26,7 +26,7 @@ import java.util.function.Consumer;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.exceptions.ApplicationException;
import org.apache.isis.applib.exceptions.MetaModelException;
-import org.apache.isis.core.metamodel.specloader.ReflectiveActionException;
+import org.apache.isis.applib.exceptions.ReflectiveActionException;
public final class ThrowableExtensions {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
index ef37a47..806893d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
import org.apache.isis.applib.exceptions.InvalidEntryException;
-import org.apache.isis.commons.exceptions.UnknownTypeException;
+import org.apache.isis.applib.exceptions.UnknownTypeException;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
index abf008d..33c19b1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.isis.commons.exceptions.UnknownTypeException;
+import org.apache.isis.applib.exceptions.UnknownTypeException;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
index 2c8f0e1..b1b2ffc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facets.value.image;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.commons.exceptions.UnexpectedCallException;
+import org.apache.isis.applib.exceptions.UnexpectedCallException;
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;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MemberSortingUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MemberSortingUtils.java
index 8997fdc..ef84acf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MemberSortingUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MemberSortingUtils.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.specloader.specimpl;
import java.util.List;
-import org.apache.isis.commons.exceptions.UnknownTypeException;
+import org.apache.isis.applib.exceptions.UnknownTypeException;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.layout.DeweyOrderSet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
index 77c8744..3488e76 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
@@ -32,6 +32,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.exceptions.NoAuthenticatorException;
import org.apache.isis.applib.util.ToString;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Timing;
@@ -39,7 +40,6 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.security.authentication.Authentication;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.standard.Authenticator;
-import org.apache.isis.core.security.authentication.standard.NoAuthenticatorException;
import org.apache.isis.core.security.authentication.standard.RandomCodeGenerator;
import org.apache.isis.core.security.authentication.standard.Registrar;
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
index 07ee2c1..19fb85f 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
@@ -27,9 +27,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.isis.applib.exceptions.NoAuthenticatorException;
import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authentication.standard.NoAuthenticatorException;
import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.security.AuthenticatorsForTesting;
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/NotPersistableException.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/NotPersistableException.java
deleted file mode 100644
index 2110f45..0000000
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/NotPersistableException.java
+++ /dev/null
@@ -1,43 +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.persistence.jdo.applib.exceptions;
-
-import org.apache.isis.commons.exceptions.IsisException;
-
-public class NotPersistableException extends IsisException {
- private static final long serialVersionUID = 1L;
-
- public NotPersistableException() {
- super();
- }
-
- public NotPersistableException(final String message) {
- super(message);
- }
-
- public NotPersistableException(final Throwable cause) {
- super(cause);
- }
-
- public NotPersistableException(final String message, final Throwable cause) {
- super(message, cause);
- }
-
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/UnsupportedFindException.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/UnsupportedFindException.java
deleted file mode 100644
index 98cd25f..0000000
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/exceptions/UnsupportedFindException.java
+++ /dev/null
@@ -1,42 +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.persistence.jdo.applib.exceptions;
-
-import org.apache.isis.commons.exceptions.IsisException;
-
-public class UnsupportedFindException extends IsisException {
- private static final long serialVersionUID = 1L;
-
- public UnsupportedFindException() {
- super();
- }
-
- public UnsupportedFindException(final String message) {
- super(message);
- }
-
- public UnsupportedFindException(final Throwable cause) {
- super(cause);
- }
-
- public UnsupportedFindException(final String message, final Throwable cause) {
- super(message, cause);
- }
-}