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/12/22 14:09:47 UTC
[isis] branch master updated: ISIS-2033: 'jdo-datanucleus' align
moved packages
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 5c1fc88 ISIS-2033: 'jdo-datanucleus' align moved packages
5c1fc88 is described below
commit 5c1fc8833f2031f9d332c4cb96d73daa2d45e64e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 15:09:31 2020 +0100
ISIS-2033: 'jdo-datanucleus' align moved packages
---
.../jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java | 8 ++++----
.../recognizers}/ExceptionRecognizerForJDODataStoreException.java | 4 ++--
.../ExceptionRecognizerForJDODataStoreExceptionAbstract.java | 2 +-
...onIntegrityConstraintViolationForeignKeyNoActionException.java | 4 ++--
.../ExceptionRecognizerForJDOObjectNotFoundException.java | 2 +-
...rForSQLIntegrityConstraintViolationUniqueOrIndexException.java | 2 +-
.../exceptions/recognizers/_JdoNestedExceptionResolver.java} | 4 ++--
...RecognizerForSQLIntegrityConstraintViolationExceptionTest.java | 2 ++
8 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java
index 8bbd142..27f06d5 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java
@@ -29,14 +29,14 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.persistence.jdo.datanucleus.config.DnSettings;
import org.apache.isis.persistence.jdo.datanucleus.config.DnEntityDiscoveryListener;
import org.apache.isis.persistence.jdo.datanucleus.entities.DnEntityStateProvider;
+import org.apache.isis.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForJDODataStoreException;
+import org.apache.isis.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException;
+import org.apache.isis.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForJDOObjectNotFoundException;
+import org.apache.isis.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException;
import org.apache.isis.persistence.jdo.datanucleus.mixins.Persistable_datanucleusIdLong;
import org.apache.isis.persistence.jdo.datanucleus.mixins.Persistable_datanucleusVersionLong;
import org.apache.isis.persistence.jdo.datanucleus.mixins.Persistable_datanucleusVersionTimestamp;
import org.apache.isis.persistence.jdo.datanucleus.mixins.Persistable_downloadJdoMetadata;
-import org.apache.isis.persistence.jdo.integration.exceprecog.ExceptionRecognizerForJDODataStoreException;
-import org.apache.isis.persistence.jdo.integration.exceprecog.ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException;
-import org.apache.isis.persistence.jdo.integration.exceprecog.ExceptionRecognizerForJDOObjectNotFoundException;
-import org.apache.isis.persistence.jdo.integration.exceprecog.ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException;
@Configuration
@Import({
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreException.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDODataStoreException.java
similarity index 91%
rename from persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreException.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDODataStoreException.java
index 09984f5..dc87ef3 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreException.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDODataStoreException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.exceprecog;
+package org.apache.isis.persistence.jdo.datanucleus.exceptions.recognizers;
import javax.inject.Named;
@@ -37,7 +37,7 @@ extends ExceptionRecognizerForJDODataStoreExceptionAbstract {
super(Category.SERVER_ERROR,
ofTypeExcluding(
javax.jdo.JDODataStoreException.class,
- JdoNestedExceptionResolver::streamNestedExceptionsOf,
+ _JdoNestedExceptionResolver::streamNestedExceptionsOf,
"NOT NULL check constraint"),
prefix("Unable to save changes. " +
"Does similar data already exist, or has referenced data been deleted?"));
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionAbstract.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDODataStoreExceptionAbstract.java
similarity index 96%
rename from persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionAbstract.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDODataStoreExceptionAbstract.java
index b3c157c..c94d81d 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionAbstract.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDODataStoreExceptionAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.exceprecog;
+package org.apache.isis.persistence.jdo.datanucleus.exceptions.recognizers;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
similarity index 92%
rename from persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
index dabcbba..7e4d5ff 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.exceprecog;
+package org.apache.isis.persistence.jdo.datanucleus.exceptions.recognizers;
import javax.inject.Named;
import javax.jdo.JDODataStoreException;
@@ -38,7 +38,7 @@ extends ExceptionRecognizerForJDODataStoreExceptionAbstract {
super(Category.CONSTRAINT_VIOLATION,
ofTypeIncluding(
JDODataStoreException.class,
- JdoNestedExceptionResolver::streamNestedExceptionsOf,
+ _JdoNestedExceptionResolver::streamNestedExceptionsOf,
"integrity constraint violation: foreign key no action"),
prefix("Related data exists"));
}
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDOObjectNotFoundException.java
similarity index 95%
rename from persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDOObjectNotFoundException.java
index 498765a..1e6ac08 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForJDOObjectNotFoundException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.exceprecog;
+package org.apache.isis.persistence.jdo.datanucleus.exceptions.recognizers;
import javax.inject.Named;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
similarity index 96%
rename from persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
index 314d669..6914a11 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.exceprecog;
+package org.apache.isis.persistence.jdo.datanucleus.exceptions.recognizers;
import javax.inject.Named;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/JdoNestedExceptionResolver.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/_JdoNestedExceptionResolver.java
similarity index 92%
rename from persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/JdoNestedExceptionResolver.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/_JdoNestedExceptionResolver.java
index 7473187..96079f1 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/JdoNestedExceptionResolver.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/exceptions/recognizers/_JdoNestedExceptionResolver.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.exceprecog;
+package org.apache.isis.persistence.jdo.datanucleus.exceptions.recognizers;
import java.util.stream.Stream;
@@ -29,7 +29,7 @@ import lombok.val;
/**
* @since 2.0
*/
-final class JdoNestedExceptionResolver {
+final class _JdoNestedExceptionResolver {
static Stream<Throwable> streamNestedExceptionsOf(Throwable throwable) {
diff --git a/persistence/jdo/integration/src/test/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java b/persistence/jdo/integration/src/test/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
index 4df630e..d8c259c 100644
--- a/persistence/jdo/integration/src/test/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
+++ b/persistence/jdo/integration/src/test/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
@@ -28,6 +28,8 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.isis.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException;
+
import lombok.val;
public class ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest {