You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/05/16 20:34:40 UTC
(cayenne) 01/03: removing unused test mappings
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit d1f3d7c8e36d2306ec0fe32cd70192f0cd903d53
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat May 16 15:23:29 2026 -0400
removing unused test mappings
---
.../testdo/deleterules/ClientDeleteCascade.java | 28 ----
.../testdo/deleterules/ClientDeleteDeny.java | 28 ----
.../testdo/deleterules/ClientDeleteNullify.java | 28 ----
.../testdo/deleterules/ClientDeleteRule.java | 28 ----
.../cayenne/testdo/deleterules/DeleteCascade.java | 28 ----
.../cayenne/testdo/deleterules/DeleteDeny.java | 28 ----
.../cayenne/testdo/deleterules/DeleteNullify.java | 28 ----
.../cayenne/testdo/deleterules/DeleteRule.java | 28 ----
.../deleterules/auto/_ClientDeleteCascade.java | 56 -------
.../testdo/deleterules/auto/_ClientDeleteDeny.java | 56 -------
.../deleterules/auto/_ClientDeleteNullify.java | 56 -------
.../testdo/deleterules/auto/_ClientDeleteRule.java | 114 --------------
.../testdo/deleterules/auto/_DeleteCascade.java | 112 --------------
.../testdo/deleterules/auto/_DeleteDeny.java | 112 --------------
.../testdo/deleterules/auto/_DeleteNullify.java | 112 --------------
.../testdo/deleterules/auto/_DeleteRule.java | 164 ---------------------
.../testdo/lifecycles/ClientLifecycles.java | 28 ----
.../cayenne/testdo/lifecycles/Lifecycles.java | 25 ----
.../testdo/lifecycles/auto/_ClientLifecycles.java | 37 -----
.../testdo/lifecycles/auto/_Lifecycles.java | 93 ------------
.../cayenne/testdo/toone/ClientTooneDep.java | 28 ----
.../cayenne/testdo/toone/ClientTooneMaster.java | 28 ----
.../org/apache/cayenne/testdo/toone/TooneDep.java | 25 ----
.../apache/cayenne/testdo/toone/TooneMaster.java | 25 ----
.../cayenne/testdo/toone/auto/_ClientTooneDep.java | 33 -----
.../testdo/toone/auto/_ClientTooneMaster.java | 33 -----
.../cayenne/testdo/toone/auto/_TooneDep.java | 92 ------------
.../cayenne/testdo/toone/auto/_TooneMaster.java | 92 ------------
.../org/apache/cayenne/unit/CayenneTestsEnv.java | 2 -
.../org/apache/cayenne/unit/DbSchemaManager.java | 3 +-
.../cayenne/unit/runtime/CayenneProjects.java | 6 -
cayenne/src/test/resources/cayenne-ALL.xml | 3 -
.../src/test/resources/cayenne-delete-rules.xml | 7 -
cayenne/src/test/resources/cayenne-lifecycles.xml | 7 -
cayenne/src/test/resources/cayenne-toone.xml | 7 -
cayenne/src/test/resources/delete-rules.map.xml | 62 --------
cayenne/src/test/resources/lifecycles.map.xml | 14 --
cayenne/src/test/resources/toone.map.xml | 23 ---
38 files changed, 2 insertions(+), 1677 deletions(-)
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteCascade.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteCascade.java
deleted file mode 100644
index 11fb652da..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteCascade.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.testdo.deleterules;
-
-import org.apache.cayenne.testdo.deleterules.auto._ClientDeleteCascade;
-
-/**
- * A persistent class mapped as "DeleteCascade" Cayenne entity.
- */
-public class ClientDeleteCascade extends _ClientDeleteCascade {
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteDeny.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteDeny.java
deleted file mode 100644
index 407bb1b62..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteDeny.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.testdo.deleterules;
-
-import org.apache.cayenne.testdo.deleterules.auto._ClientDeleteDeny;
-
-/**
- * A persistent class mapped as "DeleteDeny" Cayenne entity.
- */
-public class ClientDeleteDeny extends _ClientDeleteDeny {
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteNullify.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteNullify.java
deleted file mode 100644
index 522f6b2b9..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteNullify.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.testdo.deleterules;
-
-import org.apache.cayenne.testdo.deleterules.auto._ClientDeleteNullify;
-
-/**
- * A persistent class mapped as "DeleteNullify" Cayenne entity.
- */
-public class ClientDeleteNullify extends _ClientDeleteNullify {
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteRule.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteRule.java
deleted file mode 100644
index 48f1ed779..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/ClientDeleteRule.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.testdo.deleterules;
-
-import org.apache.cayenne.testdo.deleterules.auto._ClientDeleteRule;
-
-/**
- * A persistent class mapped as "DeleteRule" Cayenne entity.
- */
-public class ClientDeleteRule extends _ClientDeleteRule {
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteCascade.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteCascade.java
deleted file mode 100644
index 48f6e0c61..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteCascade.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.testdo.deleterules;
-
-import org.apache.cayenne.testdo.deleterules.auto._DeleteCascade;
-
-public class DeleteCascade extends _DeleteCascade {
-
-}
-
-
-
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteDeny.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteDeny.java
deleted file mode 100644
index 180476826..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteDeny.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.testdo.deleterules;
-
-import org.apache.cayenne.testdo.deleterules.auto._DeleteDeny;
-
-public class DeleteDeny extends _DeleteDeny {
-
-}
-
-
-
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteNullify.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteNullify.java
deleted file mode 100644
index f4e8d1d8c..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteNullify.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.testdo.deleterules;
-
-import org.apache.cayenne.testdo.deleterules.auto._DeleteNullify;
-
-public class DeleteNullify extends _DeleteNullify {
-
-}
-
-
-
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteRule.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteRule.java
deleted file mode 100644
index 03931ccfa..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/DeleteRule.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.testdo.deleterules;
-
-import org.apache.cayenne.testdo.deleterules.auto._DeleteRule;
-
-public class DeleteRule extends _DeleteRule {
-
-}
-
-
-
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteCascade.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteCascade.java
deleted file mode 100644
index 4cc341e2a..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteCascade.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.apache.cayenne.testdo.deleterules.auto;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.ValueHolder;
-import org.apache.cayenne.testdo.deleterules.ClientDeleteRule;
-
-/**
- * A generated persistent class mapped as "DeleteCascade" Cayenne entity. It is a good idea to
- * avoid changing this class manually, since it will be overwritten next time code is
- * regenerated. If you need to make any customizations, put them in a subclass.
- */
-public abstract class _ClientDeleteCascade extends PersistentObject {
-
- public static final String NAME_PROPERTY = "name";
- public static final String CASCADE_PROPERTY = "cascade";
-
- protected String name;
- protected ValueHolder cascade;
-
- public String getName() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- return name;
- }
- public void setName(String name) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- Object oldValue = this.name;
- this.name = name;
-
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "name", oldValue, name);
- }
- }
-
- public ClientDeleteRule getCascade() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "cascade", true);
- }
-
- return (ClientDeleteRule) cascade.getValue();
- }
- public void setCascade(ClientDeleteRule cascade) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "cascade", true);
- }
-
- this.cascade.setValue(cascade);
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteDeny.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteDeny.java
deleted file mode 100644
index f16dded9d..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteDeny.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.apache.cayenne.testdo.deleterules.auto;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.ValueHolder;
-import org.apache.cayenne.testdo.deleterules.ClientDeleteRule;
-
-/**
- * A generated persistent class mapped as "DeleteDeny" Cayenne entity. It is a good idea to
- * avoid changing this class manually, since it will be overwritten next time code is
- * regenerated. If you need to make any customizations, put them in a subclass.
- */
-public abstract class _ClientDeleteDeny extends PersistentObject {
-
- public static final String NAME_PROPERTY = "name";
- public static final String DENY_PROPERTY = "deny";
-
- protected String name;
- protected ValueHolder deny;
-
- public String getName() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- return name;
- }
- public void setName(String name) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- Object oldValue = this.name;
- this.name = name;
-
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "name", oldValue, name);
- }
- }
-
- public ClientDeleteRule getDeny() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "deny", true);
- }
-
- return (ClientDeleteRule) deny.getValue();
- }
- public void setDeny(ClientDeleteRule deny) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "deny", true);
- }
-
- this.deny.setValue(deny);
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteNullify.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteNullify.java
deleted file mode 100644
index 3abc65e27..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteNullify.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.apache.cayenne.testdo.deleterules.auto;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.ValueHolder;
-import org.apache.cayenne.testdo.deleterules.ClientDeleteRule;
-
-/**
- * A generated persistent class mapped as "DeleteNullify" Cayenne entity. It is a good idea to
- * avoid changing this class manually, since it will be overwritten next time code is
- * regenerated. If you need to make any customizations, put them in a subclass.
- */
-public abstract class _ClientDeleteNullify extends PersistentObject {
-
- public static final String NAME_PROPERTY = "name";
- public static final String NULLIFY_PROPERTY = "nullify";
-
- protected String name;
- protected ValueHolder nullify;
-
- public String getName() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- return name;
- }
- public void setName(String name) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- Object oldValue = this.name;
- this.name = name;
-
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "name", oldValue, name);
- }
- }
-
- public ClientDeleteRule getNullify() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "nullify", true);
- }
-
- return (ClientDeleteRule) nullify.getValue();
- }
- public void setNullify(ClientDeleteRule nullify) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "nullify", true);
- }
-
- this.nullify.setValue(nullify);
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteRule.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteRule.java
deleted file mode 100644
index e42946b46..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_ClientDeleteRule.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.apache.cayenne.testdo.deleterules.auto;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.testdo.deleterules.ClientDeleteCascade;
-import org.apache.cayenne.testdo.deleterules.ClientDeleteDeny;
-import org.apache.cayenne.testdo.deleterules.ClientDeleteNullify;
-
-import java.util.List;
-
-/**
- * A generated persistent class mapped as "DeleteRule" Cayenne entity. It is a good idea to
- * avoid changing this class manually, since it will be overwritten next time code is
- * regenerated. If you need to make any customizations, put them in a subclass.
- */
-public abstract class _ClientDeleteRule extends PersistentObject {
-
- public static final String NAME_PROPERTY = "name";
- public static final String FROM_CASCADE_PROPERTY = "fromCascade";
- public static final String FROM_DENY_PROPERTY = "fromDeny";
- public static final String FROM_NULLIFY_PROPERTY = "fromNullify";
-
- protected String name;
- protected List<ClientDeleteCascade> fromCascade;
- protected List<ClientDeleteDeny> fromDeny;
- protected List<ClientDeleteNullify> fromNullify;
-
- public String getName() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- return name;
- }
- public void setName(String name) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- Object oldValue = this.name;
- this.name = name;
-
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "name", oldValue, name);
- }
- }
-
- public List<ClientDeleteCascade> getFromCascade() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromCascade", true);
- }
-
- return fromCascade;
- }
- public void addToFromCascade(ClientDeleteCascade object) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromCascade", true);
- }
-
- this.fromCascade.add(object);
- }
- public void removeFromFromCascade(ClientDeleteCascade object) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromCascade", true);
- }
-
- this.fromCascade.remove(object);
- }
-
- public List<ClientDeleteDeny> getFromDeny() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromDeny", true);
- }
-
- return fromDeny;
- }
- public void addToFromDeny(ClientDeleteDeny object) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromDeny", true);
- }
-
- this.fromDeny.add(object);
- }
- public void removeFromFromDeny(ClientDeleteDeny object) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromDeny", true);
- }
-
- this.fromDeny.remove(object);
- }
-
- public List<ClientDeleteNullify> getFromNullify() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromNullify", true);
- }
-
- return fromNullify;
- }
- public void addToFromNullify(ClientDeleteNullify object) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromNullify", true);
- }
-
- this.fromNullify.add(object);
- }
- public void removeFromFromNullify(ClientDeleteNullify object) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromNullify", true);
- }
-
- this.fromNullify.remove(object);
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteCascade.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteCascade.java
deleted file mode 100644
index fc3b2ca53..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteCascade.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.apache.cayenne.testdo.deleterules.auto;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.exp.property.EntityProperty;
-import org.apache.cayenne.exp.property.NumericIdProperty;
-import org.apache.cayenne.exp.property.PropertyFactory;
-import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.exp.property.StringProperty;
-import org.apache.cayenne.testdo.deleterules.DeleteCascade;
-import org.apache.cayenne.testdo.deleterules.DeleteRule;
-
-/**
- * Class _DeleteCascade was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _DeleteCascade extends PersistentObject {
-
- private static final long serialVersionUID = 1L;
-
- public static final SelfProperty<DeleteCascade> SELF = PropertyFactory.createSelf(DeleteCascade.class);
-
- public static final NumericIdProperty<Integer> DELETE_CASCADE_ID_PK_PROPERTY = PropertyFactory.createNumericId("DELETE_CASCADE_ID", "DeleteCascade", Integer.class);
- public static final String DELETE_CASCADE_ID_PK_COLUMN = "DELETE_CASCADE_ID";
-
- public static final StringProperty<String> NAME = PropertyFactory.createString("name", String.class);
- public static final EntityProperty<DeleteRule> CASCADE = PropertyFactory.createEntity("cascade", DeleteRule.class);
-
- protected String name;
-
- protected Object cascade;
-
- public void setName(String name) {
- beforePropertyWrite("name", this.name, name);
- this.name = name;
- }
-
- public String getName() {
- beforePropertyRead("name");
- return this.name;
- }
-
- public void setCascade(DeleteRule cascade) {
- setToOneTarget("cascade", cascade, true);
- }
-
- public DeleteRule getCascade() {
- return (DeleteRule)readProperty("cascade");
- }
-
- @Override
- public Object readPropertyDirectly(String propName) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch(propName) {
- case "name":
- return this.name;
- case "cascade":
- return this.cascade;
- default:
- return super.readPropertyDirectly(propName);
- }
- }
-
- @Override
- public void writePropertyDirectly(String propName, Object val) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch (propName) {
- case "name":
- this.name = (String)val;
- break;
- case "cascade":
- this.cascade = val;
- break;
- default:
- super.writePropertyDirectly(propName, val);
- }
- }
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.cascade);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.cascade = in.readObject();
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteDeny.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteDeny.java
deleted file mode 100644
index 128ee01c7..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteDeny.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.apache.cayenne.testdo.deleterules.auto;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.exp.property.EntityProperty;
-import org.apache.cayenne.exp.property.NumericIdProperty;
-import org.apache.cayenne.exp.property.PropertyFactory;
-import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.exp.property.StringProperty;
-import org.apache.cayenne.testdo.deleterules.DeleteDeny;
-import org.apache.cayenne.testdo.deleterules.DeleteRule;
-
-/**
- * Class _DeleteDeny was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _DeleteDeny extends PersistentObject {
-
- private static final long serialVersionUID = 1L;
-
- public static final SelfProperty<DeleteDeny> SELF = PropertyFactory.createSelf(DeleteDeny.class);
-
- public static final NumericIdProperty<Integer> DELETE_DENY_ID_PK_PROPERTY = PropertyFactory.createNumericId("DELETE_DENY_ID", "DeleteDeny", Integer.class);
- public static final String DELETE_DENY_ID_PK_COLUMN = "DELETE_DENY_ID";
-
- public static final StringProperty<String> NAME = PropertyFactory.createString("name", String.class);
- public static final EntityProperty<DeleteRule> DENY = PropertyFactory.createEntity("deny", DeleteRule.class);
-
- protected String name;
-
- protected Object deny;
-
- public void setName(String name) {
- beforePropertyWrite("name", this.name, name);
- this.name = name;
- }
-
- public String getName() {
- beforePropertyRead("name");
- return this.name;
- }
-
- public void setDeny(DeleteRule deny) {
- setToOneTarget("deny", deny, true);
- }
-
- public DeleteRule getDeny() {
- return (DeleteRule)readProperty("deny");
- }
-
- @Override
- public Object readPropertyDirectly(String propName) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch(propName) {
- case "name":
- return this.name;
- case "deny":
- return this.deny;
- default:
- return super.readPropertyDirectly(propName);
- }
- }
-
- @Override
- public void writePropertyDirectly(String propName, Object val) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch (propName) {
- case "name":
- this.name = (String)val;
- break;
- case "deny":
- this.deny = val;
- break;
- default:
- super.writePropertyDirectly(propName, val);
- }
- }
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.deny);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.deny = in.readObject();
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteNullify.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteNullify.java
deleted file mode 100644
index 8f4324e94..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteNullify.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.apache.cayenne.testdo.deleterules.auto;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.exp.property.EntityProperty;
-import org.apache.cayenne.exp.property.NumericIdProperty;
-import org.apache.cayenne.exp.property.PropertyFactory;
-import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.exp.property.StringProperty;
-import org.apache.cayenne.testdo.deleterules.DeleteNullify;
-import org.apache.cayenne.testdo.deleterules.DeleteRule;
-
-/**
- * Class _DeleteNullify was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _DeleteNullify extends PersistentObject {
-
- private static final long serialVersionUID = 1L;
-
- public static final SelfProperty<DeleteNullify> SELF = PropertyFactory.createSelf(DeleteNullify.class);
-
- public static final NumericIdProperty<Integer> DELETE_NULLIFY_ID_PK_PROPERTY = PropertyFactory.createNumericId("DELETE_NULLIFY_ID", "DeleteNullify", Integer.class);
- public static final String DELETE_NULLIFY_ID_PK_COLUMN = "DELETE_NULLIFY_ID";
-
- public static final StringProperty<String> NAME = PropertyFactory.createString("name", String.class);
- public static final EntityProperty<DeleteRule> NULLIFY = PropertyFactory.createEntity("nullify", DeleteRule.class);
-
- protected String name;
-
- protected Object nullify;
-
- public void setName(String name) {
- beforePropertyWrite("name", this.name, name);
- this.name = name;
- }
-
- public String getName() {
- beforePropertyRead("name");
- return this.name;
- }
-
- public void setNullify(DeleteRule nullify) {
- setToOneTarget("nullify", nullify, true);
- }
-
- public DeleteRule getNullify() {
- return (DeleteRule)readProperty("nullify");
- }
-
- @Override
- public Object readPropertyDirectly(String propName) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch(propName) {
- case "name":
- return this.name;
- case "nullify":
- return this.nullify;
- default:
- return super.readPropertyDirectly(propName);
- }
- }
-
- @Override
- public void writePropertyDirectly(String propName, Object val) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch (propName) {
- case "name":
- this.name = (String)val;
- break;
- case "nullify":
- this.nullify = val;
- break;
- default:
- super.writePropertyDirectly(propName, val);
- }
- }
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.nullify);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.nullify = in.readObject();
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteRule.java b/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteRule.java
deleted file mode 100644
index 77c485ea8..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteRule.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package org.apache.cayenne.testdo.deleterules.auto;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.List;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.exp.property.ListProperty;
-import org.apache.cayenne.exp.property.NumericIdProperty;
-import org.apache.cayenne.exp.property.PropertyFactory;
-import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.exp.property.StringProperty;
-import org.apache.cayenne.testdo.deleterules.DeleteCascade;
-import org.apache.cayenne.testdo.deleterules.DeleteDeny;
-import org.apache.cayenne.testdo.deleterules.DeleteNullify;
-import org.apache.cayenne.testdo.deleterules.DeleteRule;
-
-/**
- * Class _DeleteRule was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _DeleteRule extends PersistentObject {
-
- private static final long serialVersionUID = 1L;
-
- public static final SelfProperty<DeleteRule> SELF = PropertyFactory.createSelf(DeleteRule.class);
-
- public static final NumericIdProperty<Integer> DELETE_RULE_ID_PK_PROPERTY = PropertyFactory.createNumericId("DELETE_RULE_ID", "DeleteRule", Integer.class);
- public static final String DELETE_RULE_ID_PK_COLUMN = "DELETE_RULE_ID";
-
- public static final StringProperty<String> NAME = PropertyFactory.createString("name", String.class);
- public static final ListProperty<DeleteCascade> FROM_CASCADE = PropertyFactory.createList("fromCascade", DeleteCascade.class);
- public static final ListProperty<DeleteDeny> FROM_DENY = PropertyFactory.createList("fromDeny", DeleteDeny.class);
- public static final ListProperty<DeleteNullify> FROM_NULLIFY = PropertyFactory.createList("fromNullify", DeleteNullify.class);
-
- protected String name;
-
- protected Object fromCascade;
- protected Object fromDeny;
- protected Object fromNullify;
-
- public void setName(String name) {
- beforePropertyWrite("name", this.name, name);
- this.name = name;
- }
-
- public String getName() {
- beforePropertyRead("name");
- return this.name;
- }
-
- public void addToFromCascade(DeleteCascade obj) {
- addToManyTarget("fromCascade", obj, true);
- }
-
- public void removeFromFromCascade(DeleteCascade obj) {
- removeToManyTarget("fromCascade", obj, true);
- }
-
- @SuppressWarnings("unchecked")
- public List<DeleteCascade> getFromCascade() {
- return (List<DeleteCascade>)readProperty("fromCascade");
- }
-
- public void addToFromDeny(DeleteDeny obj) {
- addToManyTarget("fromDeny", obj, true);
- }
-
- public void removeFromFromDeny(DeleteDeny obj) {
- removeToManyTarget("fromDeny", obj, true);
- }
-
- @SuppressWarnings("unchecked")
- public List<DeleteDeny> getFromDeny() {
- return (List<DeleteDeny>)readProperty("fromDeny");
- }
-
- public void addToFromNullify(DeleteNullify obj) {
- addToManyTarget("fromNullify", obj, true);
- }
-
- public void removeFromFromNullify(DeleteNullify obj) {
- removeToManyTarget("fromNullify", obj, true);
- }
-
- @SuppressWarnings("unchecked")
- public List<DeleteNullify> getFromNullify() {
- return (List<DeleteNullify>)readProperty("fromNullify");
- }
-
- @Override
- public Object readPropertyDirectly(String propName) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch(propName) {
- case "name":
- return this.name;
- case "fromCascade":
- return this.fromCascade;
- case "fromDeny":
- return this.fromDeny;
- case "fromNullify":
- return this.fromNullify;
- default:
- return super.readPropertyDirectly(propName);
- }
- }
-
- @Override
- public void writePropertyDirectly(String propName, Object val) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch (propName) {
- case "name":
- this.name = (String)val;
- break;
- case "fromCascade":
- this.fromCascade = val;
- break;
- case "fromDeny":
- this.fromDeny = val;
- break;
- case "fromNullify":
- this.fromNullify = val;
- break;
- default:
- super.writePropertyDirectly(propName, val);
- }
- }
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- out.writeObject(this.fromCascade);
- out.writeObject(this.fromDeny);
- out.writeObject(this.fromNullify);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- this.fromCascade = in.readObject();
- this.fromDeny = in.readObject();
- this.fromNullify = in.readObject();
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/ClientLifecycles.java b/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/ClientLifecycles.java
deleted file mode 100644
index af89b66f9..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/ClientLifecycles.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.testdo.lifecycles;
-
-import org.apache.cayenne.testdo.lifecycles.auto._ClientLifecycles;
-
-/**
- * A persistent class mapped as "Lifecycles" Cayenne entity.
- */
-public class ClientLifecycles extends _ClientLifecycles {
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/Lifecycles.java b/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/Lifecycles.java
deleted file mode 100644
index c1f8344ae..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/Lifecycles.java
+++ /dev/null
@@ -1,25 +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
- *
- * https://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.cayenne.testdo.lifecycles;
-
-import org.apache.cayenne.testdo.lifecycles.auto._Lifecycles;
-
-public class Lifecycles extends _Lifecycles {
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/auto/_ClientLifecycles.java b/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/auto/_ClientLifecycles.java
deleted file mode 100644
index fa9ccd29b..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/auto/_ClientLifecycles.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.cayenne.testdo.lifecycles.auto;
-
-import org.apache.cayenne.PersistentObject;
-
-/**
- * A generated persistent class mapped as "Lifecycles" Cayenne entity. It is a good idea to
- * avoid changing this class manually, since it will be overwritten next time code is
- * regenerated. If you need to make any customizations, put them in a subclass.
- */
-public abstract class _ClientLifecycles extends PersistentObject {
-
- public static final String NAME_PROPERTY = "name";
-
- protected String name;
-
- public String getName() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- return name;
- }
- public void setName(String name) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- Object oldValue = this.name;
- this.name = name;
-
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "name", oldValue, name);
- }
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/auto/_Lifecycles.java b/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/auto/_Lifecycles.java
deleted file mode 100644
index 327845dfb..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/lifecycles/auto/_Lifecycles.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.apache.cayenne.testdo.lifecycles.auto;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.exp.property.NumericIdProperty;
-import org.apache.cayenne.exp.property.PropertyFactory;
-import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.exp.property.StringProperty;
-import org.apache.cayenne.testdo.lifecycles.Lifecycles;
-
-/**
- * Class _Lifecycles was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _Lifecycles extends PersistentObject {
-
- private static final long serialVersionUID = 1L;
-
- public static final SelfProperty<Lifecycles> SELF = PropertyFactory.createSelf(Lifecycles.class);
-
- public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Lifecycles", Integer.class);
- public static final String ID_PK_COLUMN = "ID";
-
- public static final StringProperty<String> NAME = PropertyFactory.createString("name", String.class);
-
- protected String name;
-
-
- public void setName(String name) {
- beforePropertyWrite("name", this.name, name);
- this.name = name;
- }
-
- public String getName() {
- beforePropertyRead("name");
- return this.name;
- }
-
- @Override
- public Object readPropertyDirectly(String propName) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch(propName) {
- case "name":
- return this.name;
- default:
- return super.readPropertyDirectly(propName);
- }
- }
-
- @Override
- public void writePropertyDirectly(String propName, Object val) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch (propName) {
- case "name":
- this.name = (String)val;
- break;
- default:
- super.writePropertyDirectly(propName, val);
- }
- }
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.name);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.name = (String)in.readObject();
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/ClientTooneDep.java b/cayenne/src/test/java/org/apache/cayenne/testdo/toone/ClientTooneDep.java
deleted file mode 100644
index 08310dcae..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/ClientTooneDep.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.testdo.toone;
-
-import org.apache.cayenne.testdo.toone.auto._ClientTooneDep;
-
-/**
- * A persistent class mapped as "TooneDep" Cayenne entity.
- */
-public class ClientTooneDep extends _ClientTooneDep {
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/ClientTooneMaster.java b/cayenne/src/test/java/org/apache/cayenne/testdo/toone/ClientTooneMaster.java
deleted file mode 100644
index 860ac763a..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/ClientTooneMaster.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.testdo.toone;
-
-import org.apache.cayenne.testdo.toone.auto._ClientTooneMaster;
-
-/**
- * A persistent class mapped as "TooneMaster" Cayenne entity.
- */
-public class ClientTooneMaster extends _ClientTooneMaster {
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/TooneDep.java b/cayenne/src/test/java/org/apache/cayenne/testdo/toone/TooneDep.java
deleted file mode 100644
index 763f3cb85..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/TooneDep.java
+++ /dev/null
@@ -1,25 +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
- *
- * https://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.cayenne.testdo.toone;
-
-import org.apache.cayenne.testdo.toone.auto._TooneDep;
-
-public class TooneDep extends _TooneDep {
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/TooneMaster.java b/cayenne/src/test/java/org/apache/cayenne/testdo/toone/TooneMaster.java
deleted file mode 100644
index 3be45c1f7..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/TooneMaster.java
+++ /dev/null
@@ -1,25 +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
- *
- * https://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.cayenne.testdo.toone;
-
-import org.apache.cayenne.testdo.toone.auto._TooneMaster;
-
-public class TooneMaster extends _TooneMaster {
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_ClientTooneDep.java b/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_ClientTooneDep.java
deleted file mode 100644
index f70c43e4a..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_ClientTooneDep.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.cayenne.testdo.toone.auto;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.ValueHolder;
-import org.apache.cayenne.testdo.toone.ClientTooneMaster;
-
-/**
- * A generated persistent class mapped as "TooneDep" Cayenne entity. It is a good idea to
- * avoid changing this class manually, since it will be overwritten next time code is
- * regenerated. If you need to make any customizations, put them in a subclass.
- */
-public abstract class _ClientTooneDep extends PersistentObject {
-
- public static final String TO_MASTER_PROPERTY = "toMaster";
-
- protected ValueHolder toMaster;
-
- public ClientTooneMaster getToMaster() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "toMaster", true);
- }
-
- return (ClientTooneMaster) toMaster.getValue();
- }
- public void setToMaster(ClientTooneMaster toMaster) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "toMaster", true);
- }
-
- this.toMaster.setValue(toMaster);
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_ClientTooneMaster.java b/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_ClientTooneMaster.java
deleted file mode 100644
index 95cf1617e..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_ClientTooneMaster.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.cayenne.testdo.toone.auto;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.ValueHolder;
-import org.apache.cayenne.testdo.toone.ClientTooneDep;
-
-/**
- * A generated persistent class mapped as "TooneMaster" Cayenne entity. It is a good idea to
- * avoid changing this class manually, since it will be overwritten next time code is
- * regenerated. If you need to make any customizations, put them in a subclass.
- */
-public abstract class _ClientTooneMaster extends PersistentObject {
-
- public static final String TO_DEPENDENT_PROPERTY = "toDependent";
-
- protected ValueHolder toDependent;
-
- public ClientTooneDep getToDependent() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "toDependent", true);
- }
-
- return (ClientTooneDep) toDependent.getValue();
- }
- public void setToDependent(ClientTooneDep toDependent) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "toDependent", true);
- }
-
- this.toDependent.setValue(toDependent);
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java b/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java
deleted file mode 100644
index 10badc341..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.apache.cayenne.testdo.toone.auto;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.exp.property.EntityProperty;
-import org.apache.cayenne.exp.property.NumericIdProperty;
-import org.apache.cayenne.exp.property.PropertyFactory;
-import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.testdo.toone.TooneDep;
-import org.apache.cayenne.testdo.toone.TooneMaster;
-
-/**
- * Class _TooneDep was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _TooneDep extends PersistentObject {
-
- private static final long serialVersionUID = 1L;
-
- public static final SelfProperty<TooneDep> SELF = PropertyFactory.createSelf(TooneDep.class);
-
- public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "TooneDep", Integer.class);
- public static final String ID_PK_COLUMN = "ID";
-
- public static final EntityProperty<TooneMaster> TO_MASTER = PropertyFactory.createEntity("toMaster", TooneMaster.class);
-
-
- protected Object toMaster;
-
- public void setToMaster(TooneMaster toMaster) {
- setToOneTarget("toMaster", toMaster, true);
- }
-
- public TooneMaster getToMaster() {
- return (TooneMaster)readProperty("toMaster");
- }
-
- @Override
- public Object readPropertyDirectly(String propName) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch(propName) {
- case "toMaster":
- return this.toMaster;
- default:
- return super.readPropertyDirectly(propName);
- }
- }
-
- @Override
- public void writePropertyDirectly(String propName, Object val) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch (propName) {
- case "toMaster":
- this.toMaster = val;
- break;
- default:
- super.writePropertyDirectly(propName, val);
- }
- }
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.toMaster);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.toMaster = in.readObject();
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java b/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java
deleted file mode 100644
index 5975078a7..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.apache.cayenne.testdo.toone.auto;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.exp.property.EntityProperty;
-import org.apache.cayenne.exp.property.NumericIdProperty;
-import org.apache.cayenne.exp.property.PropertyFactory;
-import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.testdo.toone.TooneDep;
-import org.apache.cayenne.testdo.toone.TooneMaster;
-
-/**
- * Class _TooneMaster was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public abstract class _TooneMaster extends PersistentObject {
-
- private static final long serialVersionUID = 1L;
-
- public static final SelfProperty<TooneMaster> SELF = PropertyFactory.createSelf(TooneMaster.class);
-
- public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "TooneMaster", Integer.class);
- public static final String ID_PK_COLUMN = "ID";
-
- public static final EntityProperty<TooneDep> TO_DEPENDENT = PropertyFactory.createEntity("toDependent", TooneDep.class);
-
-
- protected Object toDependent;
-
- public void setToDependent(TooneDep toDependent) {
- setToOneTarget("toDependent", toDependent, true);
- }
-
- public TooneDep getToDependent() {
- return (TooneDep)readProperty("toDependent");
- }
-
- @Override
- public Object readPropertyDirectly(String propName) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch(propName) {
- case "toDependent":
- return this.toDependent;
- default:
- return super.readPropertyDirectly(propName);
- }
- }
-
- @Override
- public void writePropertyDirectly(String propName, Object val) {
- if(propName == null) {
- throw new IllegalArgumentException();
- }
-
- switch (propName) {
- case "toDependent":
- this.toDependent = val;
- break;
- default:
- super.writePropertyDirectly(propName, val);
- }
- }
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- writeSerialized(out);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- readSerialized(in);
- }
-
- @Override
- protected void writeState(ObjectOutputStream out) throws IOException {
- super.writeState(out);
- out.writeObject(this.toDependent);
- }
-
- @Override
- protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
- super.readState(in);
- this.toDependent = in.readObject();
- }
-
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
index a91bae33a..a20cac8f3 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
@@ -82,8 +82,6 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
.build();
// "cayenne-ALL.xml" is a special synthetic project file that includes all test DataMaps
- // TODO: support for multiple schemas, so that DDL operation scope (such as dropping PK)
- // can be isolated from the wider test environment
COMMON_SCHEMA = new DbSchemaManager("cayenne-ALL.xml", dataSource);
COMMON_SCHEMA.rebuildSchema();
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java b/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java
index 300c6a1ae..592573fb6 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java
@@ -50,7 +50,8 @@ import java.util.Map;
import java.util.Set;
/**
- * Maps a full physical DB namespace (schema or database) that can be shared between many test DataMaps.
+ * Maps a full physical DB namespace (schema or database) that can be shared between many test DataMaps. Holds its
+ * DataSource.
*/
public class DbSchemaManager {
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/CayenneProjects.java b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/CayenneProjects.java
index 84abc159d..968dfd3aa 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/CayenneProjects.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/CayenneProjects.java
@@ -21,15 +21,11 @@ package org.apache.cayenne.unit.runtime;
public class CayenneProjects {
- // known runtimes... unit tests may reuse these with @UseCayenneRuntime
- // annotation or can define their own on the fly
- // (TODO: how would that work with the global schema setup?)
public static final String ARRAY_TYPE_PROJECT = "cayenne-array-type.xml";
public static final String BINARY_PK_PROJECT = "cayenne-binary-pk.xml";
public static final String CAY_2032 = "cayenne-cay-2032.xml";
public static final String COMPOUND_PROJECT = "cayenne-compound.xml";
public static final String DATE_TIME_PROJECT = "cayenne-date-time.xml";
- public static final String DELETE_RULES_PROJECT = "cayenne-delete-rules.xml";
public static final String EMBEDDABLE_PROJECT = "cayenne-embeddable.xml";
public static final String EMPTY_PROJECT = "cayenne-empty.xml";
public static final String ENUM_PROJECT = "cayenne-enum.xml";
@@ -42,7 +38,6 @@ public class CayenneProjects {
public static final String JSON_PROJECT = "cayenne-json.xml";
public static final String LEGACY_DATE_TIME_PROJECT = "cayenne-legacy-date-time.xml";
public static final String LIFECYCLE_CALLBACKS_ORDER_PROJECT = "cayenne-lifecycle-callbacks-order.xml";
- public static final String LIFECYCLES_PROJECT = "cayenne-lifecycles.xml";
public static final String LOB_PROJECT = "cayenne-lob.xml";
public static final String LOCKING_PROJECT = "cayenne-locking.xml";
public static final String MAP_TO_MANY_PROJECT = "cayenne-map-to-many.xml";
@@ -76,7 +71,6 @@ public class CayenneProjects {
public static final String TABLE_PRIMITIVES_PROJECT = "cayenne-table-primitives.xml";
public static final String TESTMAP_PROJECT = "cayenne-testmap.xml";
public static final String THINGS_PROJECT = "cayenne-things.xml";
- public static final String TOONE_PROJECT = "cayenne-toone.xml";
public static final String UNSUPPORTED_DISTINCT_TYPES_PROJECT = "cayenne-unsupported-distinct-types.xml";
public static final String UUID_PROJECT = "cayenne-uuid.xml";
public static final String CUSTOM_NAME_PROJECT = "custom-name-file.xml";
diff --git a/cayenne/src/test/resources/cayenne-ALL.xml b/cayenne/src/test/resources/cayenne-ALL.xml
index b3035d0f0..15488c70e 100644
--- a/cayenne/src/test/resources/cayenne-ALL.xml
+++ b/cayenne/src/test/resources/cayenne-ALL.xml
@@ -38,11 +38,8 @@
<map name="uuid"/>
<map name="multi-tier"/>
<map name="reflexive"/>
- <map name="delete-rules"/>
<map name="lifecycle-callbacks-order"/>
- <map name="lifecycles"/>
<map name="map-to-many"/>
- <map name="toone"/>
<map name="meaningful-pk"/>
<map name="table-primitives"/>
<map name="generic"/>
diff --git a/cayenne/src/test/resources/cayenne-delete-rules.xml b/cayenne/src/test/resources/cayenne-delete-rules.xml
deleted file mode 100644
index a89f73d20..000000000
--- a/cayenne/src/test/resources/cayenne-delete-rules.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/12/domain"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/12/domain https://cayenne.apache.org/schema/12/domain.xsd"
- project-version="12">
- <map name="delete-rules"/>
-</domain>
diff --git a/cayenne/src/test/resources/cayenne-lifecycles.xml b/cayenne/src/test/resources/cayenne-lifecycles.xml
deleted file mode 100644
index d23ecf682..000000000
--- a/cayenne/src/test/resources/cayenne-lifecycles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/12/domain"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/12/domain https://cayenne.apache.org/schema/12/domain.xsd"
- project-version="12">
- <map name="lifecycles"/>
-</domain>
diff --git a/cayenne/src/test/resources/cayenne-toone.xml b/cayenne/src/test/resources/cayenne-toone.xml
deleted file mode 100644
index e337d16f2..000000000
--- a/cayenne/src/test/resources/cayenne-toone.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<domain xmlns="http://cayenne.apache.org/schema/12/domain"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/12/domain https://cayenne.apache.org/schema/12/domain.xsd"
- project-version="12">
- <map name="toone"/>
-</domain>
diff --git a/cayenne/src/test/resources/delete-rules.map.xml b/cayenne/src/test/resources/delete-rules.map.xml
deleted file mode 100644
index 78405d4f4..000000000
--- a/cayenne/src/test/resources/delete-rules.map.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap https://cayenne.apache.org/schema/12/modelMap.xsd"
- project-version="12">
- <property name="defaultPackage" value="org.apache.cayenne.testdo.deleterules"/>
- <db-entity name="DELETE_CASCADE">
- <db-attribute name="DELETE_CASCADE_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="DELETE_RULE_ID" type="INTEGER"/>
- <db-attribute name="NAME" type="VARCHAR" length="200"/>
- </db-entity>
- <db-entity name="DELETE_DENY">
- <db-attribute name="DELETE_DENY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="DELETE_RULE_ID" type="INTEGER"/>
- <db-attribute name="NAME" type="VARCHAR" length="200"/>
- </db-entity>
- <db-entity name="DELETE_NULLIFY">
- <db-attribute name="DELETE_NULLIFY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="DELETE_RULE_ID" type="INTEGER"/>
- <db-attribute name="NAME" type="VARCHAR" length="200"/>
- </db-entity>
- <db-entity name="DELETE_RULE">
- <db-attribute name="DELETE_RULE_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="NAME" type="VARCHAR" length="200"/>
- </db-entity>
- <obj-entity name="DeleteCascade" className="org.apache.cayenne.testdo.deleterules.DeleteCascade" dbEntityName="DELETE_CASCADE">
- <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
- </obj-entity>
- <obj-entity name="DeleteDeny" className="org.apache.cayenne.testdo.deleterules.DeleteDeny" dbEntityName="DELETE_DENY">
- <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
- </obj-entity>
- <obj-entity name="DeleteNullify" className="org.apache.cayenne.testdo.deleterules.DeleteNullify" dbEntityName="DELETE_NULLIFY">
- <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
- </obj-entity>
- <obj-entity name="DeleteRule" className="org.apache.cayenne.testdo.deleterules.DeleteRule" dbEntityName="DELETE_RULE">
- <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
- </obj-entity>
- <db-relationship name="cascade" source="DELETE_CASCADE" target="DELETE_RULE">
- <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/>
- </db-relationship>
- <db-relationship name="deny" source="DELETE_DENY" target="DELETE_RULE">
- <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/>
- </db-relationship>
- <db-relationship name="nullify" source="DELETE_NULLIFY" target="DELETE_RULE">
- <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/>
- </db-relationship>
- <db-relationship name="fromCascade" source="DELETE_RULE" target="DELETE_CASCADE" toMany="true">
- <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/>
- </db-relationship>
- <db-relationship name="fromDeny" source="DELETE_RULE" target="DELETE_DENY" toMany="true">
- <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/>
- </db-relationship>
- <db-relationship name="fromNullify" source="DELETE_RULE" target="DELETE_NULLIFY" toMany="true">
- <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/>
- </db-relationship>
- <obj-relationship name="cascade" source="DeleteCascade" target="DeleteRule" deleteRule="Cascade" db-relationship-path="cascade"/>
- <obj-relationship name="deny" source="DeleteDeny" target="DeleteRule" deleteRule="Deny" db-relationship-path="deny"/>
- <obj-relationship name="nullify" source="DeleteNullify" target="DeleteRule" deleteRule="Nullify" db-relationship-path="nullify"/>
- <obj-relationship name="fromCascade" source="DeleteRule" target="DeleteCascade" db-relationship-path="fromCascade"/>
- <obj-relationship name="fromDeny" source="DeleteRule" target="DeleteDeny" db-relationship-path="fromDeny"/>
- <obj-relationship name="fromNullify" source="DeleteRule" target="DeleteNullify" db-relationship-path="fromNullify"/>
-</data-map>
diff --git a/cayenne/src/test/resources/lifecycles.map.xml b/cayenne/src/test/resources/lifecycles.map.xml
deleted file mode 100644
index 9b7ab5bc6..000000000
--- a/cayenne/src/test/resources/lifecycles.map.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap https://cayenne.apache.org/schema/12/modelMap.xsd"
- project-version="12">
- <property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycles"/>
- <db-entity name="LIFECYCLES">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="NAME" type="VARCHAR" isMandatory="true" length="100"/>
- </db-entity>
- <obj-entity name="Lifecycles" className="org.apache.cayenne.testdo.lifecycles.Lifecycles" dbEntityName="LIFECYCLES">
- <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
- </obj-entity>
-</data-map>
diff --git a/cayenne/src/test/resources/toone.map.xml b/cayenne/src/test/resources/toone.map.xml
deleted file mode 100644
index 1d4003c10..000000000
--- a/cayenne/src/test/resources/toone.map.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap https://cayenne.apache.org/schema/12/modelMap.xsd"
- project-version="12">
- <property name="defaultPackage" value="org.apache.cayenne.testdo.toone"/>
- <db-entity name="TOONE_DEP">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- </db-entity>
- <db-entity name="TOONE_MASTER">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- </db-entity>
- <obj-entity name="TooneDep" className="org.apache.cayenne.testdo.toone.TooneDep" dbEntityName="TOONE_DEP"/>
- <obj-entity name="TooneMaster" className="org.apache.cayenne.testdo.toone.TooneMaster" dbEntityName="TOONE_MASTER"/>
- <db-relationship name="toMaster" source="TOONE_DEP" target="TOONE_MASTER">
- <db-attribute-pair source="ID" target="ID"/>
- </db-relationship>
- <db-relationship name="toDependent" source="TOONE_MASTER" target="TOONE_DEP" toDependentPK="true">
- <db-attribute-pair source="ID" target="ID"/>
- </db-relationship>
- <obj-relationship name="toMaster" source="TooneDep" target="TooneMaster" deleteRule="Nullify" db-relationship-path="toMaster"/>
- <obj-relationship name="toDependent" source="TooneMaster" target="TooneDep" deleteRule="Cascade" db-relationship-path="toDependent"/>
-</data-map>