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:33:04 UTC
[isis] branch master updated (5c1fc88 -> 391effc)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 5c1fc88 ISIS-2033: 'jdo-datanucleus' align moved packages
new 863cc8d ISIS-2033: also move exc. rec. tests
new 87d8f1f ISIS-2033: dn remove unused exceptions
new 391effc ISIS-2033: minor package renaming
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...LIntegrityConstraintViolationExceptionTest.java | 2 +-
.../exceptions/DataNucleusException.java | 43 ----------------------
.../exceptions/JdoRuntimeException.java | 34 -----------------
.../{util => }/JdoPrimaryKeyPropertyPredicate.java | 2 +-
.../integration/metamodel/JdoPropertyUtils.java | 1 -
5 files changed, 2 insertions(+), 80 deletions(-)
rename persistence/jdo/{integration/src/test/java/org/apache/isis/persistence/jdo/integration/exceprecog => datanucleus/src/test/java/org/apache/isis/persistence/jdo/datanucleus/test}/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java (97%)
delete mode 100644 persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceptions/DataNucleusException.java
delete mode 100644 persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceptions/JdoRuntimeException.java
rename persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/{util => }/JdoPrimaryKeyPropertyPredicate.java (96%)
[isis] 02/03: ISIS-2033: dn remove unused exceptions
Posted by ah...@apache.org.
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 87d8f1f82c733c86ac4efa54c79422ad7d157ec5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 15:18:15 2020 +0100
ISIS-2033: dn remove unused exceptions
---
.../exceptions/DataNucleusException.java | 43 ----------------------
.../exceptions/JdoRuntimeException.java | 34 -----------------
2 files changed, 77 deletions(-)
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceptions/DataNucleusException.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceptions/DataNucleusException.java
deleted file mode 100644
index f52addb..0000000
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceptions/DataNucleusException.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.integration.exceptions;
-
-import org.apache.isis.core.metamodel.adapter.oid.ObjectPersistenceException;
-
-public class DataNucleusException extends ObjectPersistenceException {
-
- private static final long serialVersionUID = 1L;
-
- public DataNucleusException() {
- super();
- }
-
- public DataNucleusException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public DataNucleusException(String message) {
- super(message);
- }
-
- public DataNucleusException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceptions/JdoRuntimeException.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceptions/JdoRuntimeException.java
deleted file mode 100644
index 0112a1b..0000000
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceptions/JdoRuntimeException.java
+++ /dev/null
@@ -1,34 +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.integration.exceptions;
-
-public class JdoRuntimeException extends RuntimeException {
-
- private static final long serialVersionUID = 1L;
-
- public JdoRuntimeException() {
- super();
- }
-
- public JdoRuntimeException(String arg0) {
- super(arg0);
- }
-
-
-}
[isis] 03/03: ISIS-2033: minor package renaming
Posted by ah...@apache.org.
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 391effc37595b3ac3e047468e0271536e0414d80
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 15:26:17 2020 +0100
ISIS-2033: minor package renaming
---
.../metamodel/{util => }/JdoPrimaryKeyPropertyPredicate.java | 2 +-
.../isis/persistence/jdo/integration/metamodel/JdoPropertyUtils.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/util/JdoPrimaryKeyPropertyPredicate.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/JdoPrimaryKeyPropertyPredicate.java
similarity index 96%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/util/JdoPrimaryKeyPropertyPredicate.java
rename to persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/JdoPrimaryKeyPropertyPredicate.java
index 69bbc8d..3c1122d 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/util/JdoPrimaryKeyPropertyPredicate.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/JdoPrimaryKeyPropertyPredicate.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.persistence.jdo.integration.metamodel.util;
+package org.apache.isis.persistence.jdo.integration.metamodel;
import java.util.function.Predicate;
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/JdoPropertyUtils.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/JdoPropertyUtils.java
index e4670e0..5de7a08 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/JdoPropertyUtils.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/JdoPropertyUtils.java
@@ -29,7 +29,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.persistence.jdo.integration.metamodel.util.JdoPrimaryKeyPropertyPredicate;
import org.apache.isis.persistence.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
public final class JdoPropertyUtils {
[isis] 01/03: ISIS-2033: also move exc. rec. tests
Posted by ah...@apache.org.
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 863cc8d65c03bab582dd7ff114a5d76e10d9bd63
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 15:16:10 2020 +0100
ISIS-2033: also move exc. rec. tests
---
...eptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/persistence/jdo/integration/src/test/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java b/persistence/jdo/datanucleus/src/test/java/org/apache/isis/persistence/jdo/datanucleus/test/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
similarity index 97%
rename from persistence/jdo/integration/src/test/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
rename to persistence/jdo/datanucleus/src/test/java/org/apache/isis/persistence/jdo/datanucleus/test/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
index d8c259c..2dbeef1 100644
--- a/persistence/jdo/integration/src/test/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/isis/persistence/jdo/datanucleus/test/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.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.test;
import java.sql.SQLIntegrityConstraintViolationException;