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 2015/10/22 16:56:47 UTC
[1/5] cayenne git commit: upgrading unit test project
Repository: cayenne
Updated Branches:
refs/heads/master 57eef9ecb -> b746d0671
upgrading unit test project
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/fdfd6385
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/fdfd6385
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/fdfd6385
Branch: refs/heads/master
Commit: fdfd6385195b96a79b1808844c0d9a7f2a73b5d6
Parents: 57eef9e
Author: aadamchik <aa...@apache.org>
Authored: Thu Oct 22 17:25:39 2015 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Thu Oct 22 17:25:39 2015 +0300
----------------------------------------------------------------------
cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml | 2 +-
cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fdfd6385/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml b/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
index b3c7d59..5bfd0a3 100644
--- a/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
+++ b/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
<map name="lifecycle-map"/>
<node name="lifecycle-db"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fdfd6385/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml b/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
index c65b26f..531aa15 100644
--- a/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
+++ b/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.lifecycle.db"/>
<db-entity name="AUDITABLE1">
<db-attribute name="CHAR_PROPERTY1" type="VARCHAR" length="200"/>
[5/5] cayenne git commit: CAY-2030 Capturing a stream of commit
changes
Posted by aa...@apache.org.
CAY-2030 Capturing a stream of commit changes
* flattened relationship test
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b746d067
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b746d067
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b746d067
Branch: refs/heads/master
Commit: b746d0671a7e33dcf20fef49152778be98fce1fa
Parents: cc1eea8
Author: aadamchik <aa...@apache.org>
Authored: Thu Oct 22 17:31:07 2015 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Thu Oct 22 17:52:59 2015 +0300
----------------------------------------------------------------------
.../lifecycle/audit/AuditableFilterIT.java | 4 +-
.../postcommit/PostCommitFilter_AllIT.java | 5 +-
.../PostCommitFilter_All_FlattenedIT.java | 140 +++++++++++++++++++
.../postcommit/PostCommitFilter_FilteredIT.java | 4 +-
.../lifecycle/unit/AuditableServerCase.java | 83 +++++++++++
.../lifecycle/unit/FlattenedServerCase.java | 62 ++++++++
.../lifecycle/unit/LifecycleServerCase.java | 83 -----------
.../src/test/resources/lifecycle-map.map.xml | 4 +-
8 files changed, 293 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b746d067/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilterIT.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilterIT.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilterIT.java
index 717bbca..7df6e27 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilterIT.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilterIT.java
@@ -40,10 +40,10 @@ import org.apache.cayenne.lifecycle.db.AuditableChild3;
import org.apache.cayenne.lifecycle.db.AuditableChildUuid;
import org.apache.cayenne.lifecycle.id.IdCoder;
import org.apache.cayenne.lifecycle.relationship.ObjectIdRelationshipHandler;
-import org.apache.cayenne.lifecycle.unit.LifecycleServerCase;
+import org.apache.cayenne.lifecycle.unit.AuditableServerCase;
import org.junit.Test;
-public class AuditableFilterIT extends LifecycleServerCase {
+public class AuditableFilterIT extends AuditableServerCase {
@Test
public void testAudit_IgnoreRuntimeRelationships() throws Exception {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b746d067/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_AllIT.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_AllIT.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_AllIT.java
index f2ba0ea..62e59a0 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_AllIT.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_AllIT.java
@@ -42,14 +42,14 @@ import org.apache.cayenne.lifecycle.changemap.ToManyRelationshipChange;
import org.apache.cayenne.lifecycle.changemap.ToOneRelationshipChange;
import org.apache.cayenne.lifecycle.db.Auditable1;
import org.apache.cayenne.lifecycle.db.AuditableChild1;
-import org.apache.cayenne.lifecycle.unit.LifecycleServerCase;
+import org.apache.cayenne.lifecycle.unit.AuditableServerCase;
import org.apache.cayenne.query.SelectById;
import org.junit.Before;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-public class PostCommitFilter_AllIT extends LifecycleServerCase {
+public class PostCommitFilter_AllIT extends AuditableServerCase {
protected ObjectContext context;
protected PostCommitListener mockListener;
@@ -294,5 +294,4 @@ public class PostCommitFilter_AllIT extends LifecycleServerCase {
verify(mockListener).onPostCommit(any(ObjectContext.class), any(ChangeMap.class));
}
-
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b746d067/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_All_FlattenedIT.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_All_FlattenedIT.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_All_FlattenedIT.java
new file mode 100644
index 0000000..c37991c
--- /dev/null
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_All_FlattenedIT.java
@@ -0,0 +1,140 @@
+/*****************************************************************
+ * 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.cayenne.lifecycle.postcommit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.sql.SQLException;
+
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.configuration.server.ServerRuntimeBuilder;
+import org.apache.cayenne.lifecycle.changemap.ChangeMap;
+import org.apache.cayenne.lifecycle.changemap.ObjectChange;
+import org.apache.cayenne.lifecycle.changemap.ObjectChangeType;
+import org.apache.cayenne.lifecycle.changemap.ToManyRelationshipChange;
+import org.apache.cayenne.lifecycle.db.E3;
+import org.apache.cayenne.lifecycle.db.E4;
+import org.apache.cayenne.lifecycle.unit.FlattenedServerCase;
+import org.apache.cayenne.query.SelectById;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+public class PostCommitFilter_All_FlattenedIT extends FlattenedServerCase {
+
+ protected ObjectContext context;
+ protected PostCommitListener mockListener;
+
+ @Override
+ protected ServerRuntimeBuilder configureCayenne() {
+ this.mockListener = mock(PostCommitListener.class);
+ return super.configureCayenne().addModule(PostCommitModuleBuilder.builder().listener(mockListener).build());
+ }
+
+ @Before
+ public void before() {
+ context = runtime.newContext();
+ }
+
+ @Test
+ public void testPostCommit_UpdateToMany() throws SQLException {
+ e3.insert(1);
+ e4.insert(11);
+ e4.insert(12);
+ e34.insert(1, 11);
+
+ final E3 e3 = SelectById.query(E3.class, 1).selectOne(context);
+ final E4 e4_1 = SelectById.query(E4.class, 11).selectOne(context);
+ final E4 e4_2 = SelectById.query(E4.class, 12).selectOne(context);
+
+ doAnswer(new Answer<Object>() {
+ @Override
+ public Object answer(InvocationOnMock invocation) throws Throwable {
+
+ assertSame(context, invocation.getArguments()[0]);
+
+ ChangeMap changes = (ChangeMap) invocation.getArguments()[1];
+ assertNotNull(changes);
+ assertEquals(3, changes.getUniqueChanges().size());
+
+ ObjectChange e3c = changes.getChanges().get(new ObjectId("E3", E3.ID_PK_COLUMN, 1));
+ assertNotNull(e3c);
+ assertEquals(ObjectChangeType.UPDATE, e3c.getType());
+ assertEquals(0, e3c.getAttributeChanges().size());
+ assertEquals(1, e3c.getToManyRelationshipChanges().size());
+
+ ToManyRelationshipChange e3c1 = e3c.getToManyRelationshipChanges().get(E3.E4S.getName());
+ assertNotNull(e3c1);
+
+ assertEquals(1, e3c1.getAdded().size());
+ assertTrue(e3c1.getAdded().contains(e4_2.getObjectId()));
+
+ assertEquals(1, e3c1.getRemoved().size());
+ assertTrue(e3c1.getRemoved().contains(e4_1.getObjectId()));
+
+ ObjectChange e41c = changes.getChanges().get(new ObjectId("E4", E4.ID_PK_COLUMN, 11));
+ assertNotNull(e41c);
+ assertEquals(ObjectChangeType.UPDATE, e41c.getType());
+ assertEquals(0, e41c.getAttributeChanges().size());
+ assertEquals(1, e41c.getToManyRelationshipChanges().size());
+
+ ToManyRelationshipChange e41c1 = e41c.getToManyRelationshipChanges().get(E4.E3S.getName());
+ assertNotNull(e41c);
+
+ assertEquals(0, e41c1.getAdded().size());
+
+ assertEquals(1, e41c1.getRemoved().size());
+ assertTrue(e41c1.getRemoved().contains(e3.getObjectId()));
+
+ ObjectChange e42c = changes.getChanges().get(new ObjectId("E4", E4.ID_PK_COLUMN, 12));
+ assertNotNull(e42c);
+ assertEquals(ObjectChangeType.UPDATE, e42c.getType());
+ assertEquals(0, e42c.getAttributeChanges().size());
+ assertEquals(1, e42c.getToManyRelationshipChanges().size());
+
+ ToManyRelationshipChange e42c1 = e42c.getToManyRelationshipChanges().get(E4.E3S.getName());
+ assertNotNull(e42c);
+
+ assertEquals(0, e42c1.getRemoved().size());
+
+ assertEquals(1, e42c1.getAdded().size());
+ assertTrue(e42c1.getAdded().contains(e3.getObjectId()));
+
+ return null;
+ }
+ }).when(mockListener).onPostCommit(any(ObjectContext.class), any(ChangeMap.class));
+
+ e3.removeFromE4s(e4_1);
+ e3.addToE4s(e4_2);
+
+ context.commitChanges();
+
+ verify(mockListener).onPostCommit(any(ObjectContext.class), any(ChangeMap.class));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b746d067/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_FilteredIT.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_FilteredIT.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_FilteredIT.java
index 23f1519..5297d2e 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_FilteredIT.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_FilteredIT.java
@@ -36,14 +36,14 @@ import org.apache.cayenne.lifecycle.changemap.ObjectChange;
import org.apache.cayenne.lifecycle.changemap.ObjectChangeType;
import org.apache.cayenne.lifecycle.changemap.AttributeChange;
import org.apache.cayenne.lifecycle.db.Auditable2;
-import org.apache.cayenne.lifecycle.unit.LifecycleServerCase;
+import org.apache.cayenne.lifecycle.unit.AuditableServerCase;
import org.apache.cayenne.query.SelectById;
import org.junit.Before;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-public class PostCommitFilter_FilteredIT extends LifecycleServerCase {
+public class PostCommitFilter_FilteredIT extends AuditableServerCase {
protected ObjectContext context;
protected PostCommitListener mockListener;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b746d067/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/AuditableServerCase.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/AuditableServerCase.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/AuditableServerCase.java
new file mode 100644
index 0000000..d47da11
--- /dev/null
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/AuditableServerCase.java
@@ -0,0 +1,83 @@
+/*****************************************************************
+ * 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.cayenne.lifecycle.unit;
+
+import org.apache.cayenne.configuration.server.ServerRuntime;
+import org.apache.cayenne.configuration.server.ServerRuntimeBuilder;
+import org.apache.cayenne.test.jdbc.DBHelper;
+import org.apache.cayenne.test.jdbc.TableHelper;
+import org.junit.After;
+import org.junit.Before;
+
+/**
+ * A superclass of integration tests for cayenne-lifecycle.
+ */
+public abstract class AuditableServerCase {
+
+ protected ServerRuntime runtime;
+
+ protected TableHelper auditable1;
+ protected TableHelper auditableChild1;
+ protected TableHelper auditableChild2;
+
+ protected TableHelper auditable2;
+ protected TableHelper auditableChild3;
+ protected TableHelper auditableChildUuid;
+
+ @Before
+ public void startCayenne() throws Exception {
+ this.runtime = configureCayenne().build();
+
+ DBHelper dbHelper = new DBHelper(runtime.getDataSource());
+
+ this.auditable1 = new TableHelper(dbHelper, "AUDITABLE1").setColumns("ID", "CHAR_PROPERTY1");
+
+ this.auditableChild1 = new TableHelper(dbHelper, "AUDITABLE_CHILD1").setColumns("ID", "AUDITABLE1_ID",
+ "CHAR_PROPERTY1");
+
+ this.auditableChild2 = new TableHelper(dbHelper, "AUDITABLE_CHILD2").setColumns("ID", "AUDITABLE1_ID",
+ "CHAR_PROPERTY1");
+
+ this.auditable2 = new TableHelper(dbHelper, "AUDITABLE2").setColumns("ID", "CHAR_PROPERTY1", "CHAR_PROPERTY2");
+
+ this.auditableChild3 = new TableHelper(dbHelper, "AUDITABLE_CHILD3").setColumns("ID", "AUDITABLE2_ID",
+ "CHAR_PROPERTY1", "CHAR_PROPERTY2");
+
+ this.auditableChildUuid = new TableHelper(dbHelper, "AUDITABLE_CHILD_UUID").setColumns("ID", "UUID",
+ "CHAR_PROPERTY1", "CHAR_PROPERTY2");
+
+ this.auditableChild1.deleteAll();
+ this.auditableChild2.deleteAll();
+ this.auditable1.deleteAll();
+ this.auditableChild3.deleteAll();
+ this.auditable2.deleteAll();
+ this.auditableChildUuid.deleteAll();
+ }
+
+ protected ServerRuntimeBuilder configureCayenne() {
+ return ServerRuntimeBuilder.builder().addConfig("cayenne-lifecycle.xml");
+ }
+
+ @After
+ public void shutdownCayenne() {
+ if (runtime != null) {
+ runtime.shutdown();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b746d067/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/FlattenedServerCase.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/FlattenedServerCase.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/FlattenedServerCase.java
new file mode 100644
index 0000000..42eaaa5
--- /dev/null
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/FlattenedServerCase.java
@@ -0,0 +1,62 @@
+/*****************************************************************
+ * 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.cayenne.lifecycle.unit;
+
+import org.apache.cayenne.configuration.server.ServerRuntime;
+import org.apache.cayenne.configuration.server.ServerRuntimeBuilder;
+import org.apache.cayenne.test.jdbc.DBHelper;
+import org.apache.cayenne.test.jdbc.TableHelper;
+import org.junit.After;
+import org.junit.Before;
+
+public class FlattenedServerCase {
+
+ protected ServerRuntime runtime;
+
+ protected TableHelper e3;
+ protected TableHelper e4;
+ protected TableHelper e34;
+
+ @Before
+ public void startCayenne() throws Exception {
+ this.runtime = configureCayenne().build();
+
+ DBHelper dbHelper = new DBHelper(runtime.getDataSource());
+
+ this.e3 = new TableHelper(dbHelper, "E3").setColumns("ID");
+ this.e4 = new TableHelper(dbHelper, "E4").setColumns("ID");
+ this.e34 = new TableHelper(dbHelper, "E34").setColumns("E3_ID", "E4_ID");
+
+ this.e34.deleteAll();
+ this.e3.deleteAll();
+
+ }
+
+ protected ServerRuntimeBuilder configureCayenne() {
+ return ServerRuntimeBuilder.builder().addConfig("cayenne-lifecycle.xml");
+ }
+
+ @After
+ public void shutdownCayenne() {
+ if (runtime != null) {
+ runtime.shutdown();
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b746d067/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/LifecycleServerCase.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/LifecycleServerCase.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/LifecycleServerCase.java
deleted file mode 100644
index 85db299..0000000
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/unit/LifecycleServerCase.java
+++ /dev/null
@@ -1,83 +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.cayenne.lifecycle.unit;
-
-import org.apache.cayenne.configuration.server.ServerRuntime;
-import org.apache.cayenne.configuration.server.ServerRuntimeBuilder;
-import org.apache.cayenne.test.jdbc.DBHelper;
-import org.apache.cayenne.test.jdbc.TableHelper;
-import org.junit.After;
-import org.junit.Before;
-
-/**
- * A superclass of integration tests for cayenne-lifecycle.
- */
-public abstract class LifecycleServerCase {
-
- protected ServerRuntime runtime;
-
- protected TableHelper auditable1;
- protected TableHelper auditableChild1;
- protected TableHelper auditableChild2;
-
- protected TableHelper auditable2;
- protected TableHelper auditableChild3;
- protected TableHelper auditableChildUuid;
-
- @Before
- public void startCayenne() throws Exception {
- this.runtime = configureCayenne().build();
-
- DBHelper dbHelper = new DBHelper(runtime.getDataSource());
-
- this.auditable1 = new TableHelper(dbHelper, "AUDITABLE1").setColumns("ID", "CHAR_PROPERTY1");
-
- this.auditableChild1 = new TableHelper(dbHelper, "AUDITABLE_CHILD1").setColumns("ID", "AUDITABLE1_ID",
- "CHAR_PROPERTY1");
-
- this.auditableChild2 = new TableHelper(dbHelper, "AUDITABLE_CHILD2").setColumns("ID", "AUDITABLE1_ID",
- "CHAR_PROPERTY1");
-
- this.auditable2 = new TableHelper(dbHelper, "AUDITABLE2").setColumns("ID", "CHAR_PROPERTY1", "CHAR_PROPERTY2");
-
- this.auditableChild3 = new TableHelper(dbHelper, "AUDITABLE_CHILD3").setColumns("ID", "AUDITABLE2_ID",
- "CHAR_PROPERTY1", "CHAR_PROPERTY2");
-
- this.auditableChildUuid = new TableHelper(dbHelper, "AUDITABLE_CHILD_UUID").setColumns("ID", "UUID",
- "CHAR_PROPERTY1", "CHAR_PROPERTY2");
-
- this.auditableChild1.deleteAll();
- this.auditableChild2.deleteAll();
- this.auditable1.deleteAll();
- this.auditableChild3.deleteAll();
- this.auditable2.deleteAll();
- this.auditableChildUuid.deleteAll();
- }
-
- protected ServerRuntimeBuilder configureCayenne() {
- return ServerRuntimeBuilder.builder().addConfig("cayenne-lifecycle.xml");
- }
-
- @After
- public void shutdownCayenne() {
- if (runtime != null) {
- runtime.shutdown();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b746d067/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml b/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
index 14ac628..f254cf7 100644
--- a/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
+++ b/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
@@ -45,8 +45,8 @@
<db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
</db-entity>
<db-entity name="E34">
- <db-attribute name="E3_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="E4_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ <db-attribute name="E3_ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
+ <db-attribute name="E4_ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
</db-entity>
<db-entity name="E4">
<db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
[2/5] cayenne git commit: rerunning cgen
Posted by aa...@apache.org.
rerunning cgen
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c14b3751
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c14b3751
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c14b3751
Branch: refs/heads/master
Commit: c14b3751588828d1195fd3f17346e4bee734e2a6
Parents: fdfd638
Author: aadamchik <aa...@apache.org>
Authored: Thu Oct 22 17:31:07 2015 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Thu Oct 22 17:31:07 2015 +0300
----------------------------------------------------------------------
.../cayenne/lifecycle/db/auto/_Auditable1.java | 17 +++++++++------
.../cayenne/lifecycle/db/auto/_Auditable2.java | 23 +++++++++++---------
.../lifecycle/db/auto/_AuditableChild1.java | 15 ++++++++-----
.../lifecycle/db/auto/_AuditableChild2.java | 15 ++++++++-----
.../lifecycle/db/auto/_AuditableChild3.java | 21 ++++++++++--------
.../lifecycle/db/auto/_AuditableChildUuid.java | 9 +++++---
.../apache/cayenne/lifecycle/db/auto/_E1.java | 2 ++
.../apache/cayenne/lifecycle/db/auto/_E2.java | 2 ++
.../cayenne/lifecycle/db/auto/_SortDep.java | 9 +++++---
.../cayenne/lifecycle/db/auto/_SortRoot.java | 11 ++++++----
.../cayenne/lifecycle/db/auto/_UuidRoot1.java | 9 +++++---
11 files changed, 82 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c14b3751/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_Auditable1.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_Auditable1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_Auditable1.java
index 3991679..f31b442 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_Auditable1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_Auditable1.java
@@ -3,6 +3,7 @@ package org.apache.cayenne.lifecycle.db.auto;
import java.util.List;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.lifecycle.db.AuditableChild1;
/**
@@ -13,27 +14,29 @@ import org.apache.cayenne.lifecycle.db.AuditableChild1;
*/
public abstract class _Auditable1 extends CayenneDataObject {
- public static final String CHAR_PROPERTY1_PROPERTY = "charProperty1";
- public static final String CHILDREN1_PROPERTY = "children1";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<String> CHAR_PROPERTY1 = new Property<String>("charProperty1");
+ public static final Property<List<AuditableChild1>> CHILDREN1 = new Property<List<AuditableChild1>>("children1");
+
public void setCharProperty1(String charProperty1) {
- writeProperty(CHAR_PROPERTY1_PROPERTY, charProperty1);
+ writeProperty("charProperty1", charProperty1);
}
public String getCharProperty1() {
- return (String)readProperty(CHAR_PROPERTY1_PROPERTY);
+ return (String)readProperty("charProperty1");
}
public void addToChildren1(AuditableChild1 obj) {
- addToManyTarget(CHILDREN1_PROPERTY, obj, true);
+ addToManyTarget("children1", obj, true);
}
public void removeFromChildren1(AuditableChild1 obj) {
- removeToManyTarget(CHILDREN1_PROPERTY, obj, true);
+ removeToManyTarget("children1", obj, true);
}
@SuppressWarnings("unchecked")
public List<AuditableChild1> getChildren1() {
- return (List<AuditableChild1>)readProperty(CHILDREN1_PROPERTY);
+ return (List<AuditableChild1>)readProperty("children1");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c14b3751/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_Auditable2.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_Auditable2.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_Auditable2.java
index 7a2ded7..94ff9c3 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_Auditable2.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_Auditable2.java
@@ -3,6 +3,7 @@ package org.apache.cayenne.lifecycle.db.auto;
import java.util.List;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.lifecycle.db.AuditableChild3;
/**
@@ -13,35 +14,37 @@ import org.apache.cayenne.lifecycle.db.AuditableChild3;
*/
public abstract class _Auditable2 extends CayenneDataObject {
- public static final String CHAR_PROPERTY1_PROPERTY = "charProperty1";
- public static final String CHAR_PROPERTY2_PROPERTY = "charProperty2";
- public static final String CHILDREN_PROPERTY = "children";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<String> CHAR_PROPERTY1 = new Property<String>("charProperty1");
+ public static final Property<String> CHAR_PROPERTY2 = new Property<String>("charProperty2");
+ public static final Property<List<AuditableChild3>> CHILDREN = new Property<List<AuditableChild3>>("children");
+
public void setCharProperty1(String charProperty1) {
- writeProperty(CHAR_PROPERTY1_PROPERTY, charProperty1);
+ writeProperty("charProperty1", charProperty1);
}
public String getCharProperty1() {
- return (String)readProperty(CHAR_PROPERTY1_PROPERTY);
+ return (String)readProperty("charProperty1");
}
public void setCharProperty2(String charProperty2) {
- writeProperty(CHAR_PROPERTY2_PROPERTY, charProperty2);
+ writeProperty("charProperty2", charProperty2);
}
public String getCharProperty2() {
- return (String)readProperty(CHAR_PROPERTY2_PROPERTY);
+ return (String)readProperty("charProperty2");
}
public void addToChildren(AuditableChild3 obj) {
- addToManyTarget(CHILDREN_PROPERTY, obj, true);
+ addToManyTarget("children", obj, true);
}
public void removeFromChildren(AuditableChild3 obj) {
- removeToManyTarget(CHILDREN_PROPERTY, obj, true);
+ removeToManyTarget("children", obj, true);
}
@SuppressWarnings("unchecked")
public List<AuditableChild3> getChildren() {
- return (List<AuditableChild3>)readProperty(CHILDREN_PROPERTY);
+ return (List<AuditableChild3>)readProperty("children");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c14b3751/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild1.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild1.java
index d7e9d4f..bcc8e8a 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild1.java
@@ -1,6 +1,7 @@
package org.apache.cayenne.lifecycle.db.auto;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.lifecycle.db.Auditable1;
/**
@@ -11,24 +12,26 @@ import org.apache.cayenne.lifecycle.db.Auditable1;
*/
public abstract class _AuditableChild1 extends CayenneDataObject {
- public static final String CHAR_PROPERTY1_PROPERTY = "charProperty1";
- public static final String PARENT_PROPERTY = "parent";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<String> CHAR_PROPERTY1 = new Property<String>("charProperty1");
+ public static final Property<Auditable1> PARENT = new Property<Auditable1>("parent");
+
public void setCharProperty1(String charProperty1) {
- writeProperty(CHAR_PROPERTY1_PROPERTY, charProperty1);
+ writeProperty("charProperty1", charProperty1);
}
public String getCharProperty1() {
- return (String)readProperty(CHAR_PROPERTY1_PROPERTY);
+ return (String)readProperty("charProperty1");
}
public void setParent(Auditable1 parent) {
- setToOneTarget(PARENT_PROPERTY, parent, true);
+ setToOneTarget("parent", parent, true);
}
public Auditable1 getParent() {
- return (Auditable1)readProperty(PARENT_PROPERTY);
+ return (Auditable1)readProperty("parent");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c14b3751/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild2.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild2.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild2.java
index 6b58506..b44d839 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild2.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild2.java
@@ -1,6 +1,7 @@
package org.apache.cayenne.lifecycle.db.auto;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.lifecycle.db.Auditable1;
/**
@@ -11,24 +12,26 @@ import org.apache.cayenne.lifecycle.db.Auditable1;
*/
public abstract class _AuditableChild2 extends CayenneDataObject {
- public static final String CHAR_PROPERTY1_PROPERTY = "charProperty1";
- public static final String PARENT_PROPERTY = "parent";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<String> CHAR_PROPERTY1 = new Property<String>("charProperty1");
+ public static final Property<Auditable1> PARENT = new Property<Auditable1>("parent");
+
public void setCharProperty1(String charProperty1) {
- writeProperty(CHAR_PROPERTY1_PROPERTY, charProperty1);
+ writeProperty("charProperty1", charProperty1);
}
public String getCharProperty1() {
- return (String)readProperty(CHAR_PROPERTY1_PROPERTY);
+ return (String)readProperty("charProperty1");
}
public void setParent(Auditable1 parent) {
- setToOneTarget(PARENT_PROPERTY, parent, true);
+ setToOneTarget("parent", parent, true);
}
public Auditable1 getParent() {
- return (Auditable1)readProperty(PARENT_PROPERTY);
+ return (Auditable1)readProperty("parent");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c14b3751/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild3.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild3.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild3.java
index 9d60a65..c122f9a 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild3.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChild3.java
@@ -1,6 +1,7 @@
package org.apache.cayenne.lifecycle.db.auto;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.lifecycle.db.Auditable2;
/**
@@ -11,32 +12,34 @@ import org.apache.cayenne.lifecycle.db.Auditable2;
*/
public abstract class _AuditableChild3 extends CayenneDataObject {
- public static final String CHAR_PROPERTY1_PROPERTY = "charProperty1";
- public static final String CHAR_PROPERTY2_PROPERTY = "charProperty2";
- public static final String PARENT_PROPERTY = "parent";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<String> CHAR_PROPERTY1 = new Property<String>("charProperty1");
+ public static final Property<String> CHAR_PROPERTY2 = new Property<String>("charProperty2");
+ public static final Property<Auditable2> PARENT = new Property<Auditable2>("parent");
+
public void setCharProperty1(String charProperty1) {
- writeProperty(CHAR_PROPERTY1_PROPERTY, charProperty1);
+ writeProperty("charProperty1", charProperty1);
}
public String getCharProperty1() {
- return (String)readProperty(CHAR_PROPERTY1_PROPERTY);
+ return (String)readProperty("charProperty1");
}
public void setCharProperty2(String charProperty2) {
- writeProperty(CHAR_PROPERTY2_PROPERTY, charProperty2);
+ writeProperty("charProperty2", charProperty2);
}
public String getCharProperty2() {
- return (String)readProperty(CHAR_PROPERTY2_PROPERTY);
+ return (String)readProperty("charProperty2");
}
public void setParent(Auditable2 parent) {
- setToOneTarget(PARENT_PROPERTY, parent, true);
+ setToOneTarget("parent", parent, true);
}
public Auditable2 getParent() {
- return (Auditable2)readProperty(PARENT_PROPERTY);
+ return (Auditable2)readProperty("parent");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c14b3751/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChildUuid.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChildUuid.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChildUuid.java
index e9d6b60..c4fca2d 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChildUuid.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_AuditableChildUuid.java
@@ -1,6 +1,7 @@
package org.apache.cayenne.lifecycle.db.auto;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
/**
* Class _AuditableChildUuid was generated by Cayenne.
@@ -10,12 +11,14 @@ import org.apache.cayenne.CayenneDataObject;
*/
public abstract class _AuditableChildUuid extends CayenneDataObject {
- public static final String CHAR_PROPERTY1_PROPERTY = "charProperty1";
- public static final String CHAR_PROPERTY2_PROPERTY = "charProperty2";
- public static final String UUID_PROPERTY = "uuid";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<String> CHAR_PROPERTY1 = new Property<String>("charProperty1");
+ public static final Property<String> CHAR_PROPERTY2 = new Property<String>("charProperty2");
+ public static final Property<String> UUID = new Property<String>("uuid");
+
public void setCharProperty1(String charProperty1) {
writeProperty("charProperty1", charProperty1);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c14b3751/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E1.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E1.java
index e2c07f9..ce307f3 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E1.java
@@ -10,7 +10,9 @@ import org.apache.cayenne.CayenneDataObject;
*/
public abstract class _E1 extends CayenneDataObject {
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c14b3751/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E2.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E2.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E2.java
index 69cf3d7..e333492 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E2.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E2.java
@@ -10,7 +10,9 @@ import org.apache.cayenne.CayenneDataObject;
*/
public abstract class _E2 extends CayenneDataObject {
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c14b3751/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortDep.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortDep.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortDep.java
index 5685a18..af4238a 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortDep.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortDep.java
@@ -1,6 +1,7 @@
package org.apache.cayenne.lifecycle.db.auto;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.lifecycle.db.SortRoot;
/**
@@ -11,16 +12,18 @@ import org.apache.cayenne.lifecycle.db.SortRoot;
*/
public abstract class _SortDep extends CayenneDataObject {
- public static final String ROOT_PROPERTY = "root";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<SortRoot> ROOT = new Property<SortRoot>("root");
+
public void setRoot(SortRoot root) {
- setToOneTarget(ROOT_PROPERTY, root, true);
+ setToOneTarget("root", root, true);
}
public SortRoot getRoot() {
- return (SortRoot)readProperty(ROOT_PROPERTY);
+ return (SortRoot)readProperty("root");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c14b3751/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortRoot.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortRoot.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortRoot.java
index 8cc9f4d..9a72da7 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortRoot.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_SortRoot.java
@@ -3,6 +3,7 @@ package org.apache.cayenne.lifecycle.db.auto;
import java.util.List;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.lifecycle.db.SortDep;
/**
@@ -13,19 +14,21 @@ import org.apache.cayenne.lifecycle.db.SortDep;
*/
public abstract class _SortRoot extends CayenneDataObject {
- public static final String DEPS_PROPERTY = "deps";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<List<SortDep>> DEPS = new Property<List<SortDep>>("deps");
+
public void addToDeps(SortDep obj) {
- addToManyTarget(DEPS_PROPERTY, obj, true);
+ addToManyTarget("deps", obj, true);
}
public void removeFromDeps(SortDep obj) {
- removeToManyTarget(DEPS_PROPERTY, obj, true);
+ removeToManyTarget("deps", obj, true);
}
@SuppressWarnings("unchecked")
public List<SortDep> getDeps() {
- return (List<SortDep>)readProperty(DEPS_PROPERTY);
+ return (List<SortDep>)readProperty("deps");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c14b3751/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_UuidRoot1.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_UuidRoot1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_UuidRoot1.java
index abc7081..cd491cd 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_UuidRoot1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_UuidRoot1.java
@@ -1,6 +1,7 @@
package org.apache.cayenne.lifecycle.db.auto;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
/**
* Class _UuidRoot1 was generated by Cayenne.
@@ -10,15 +11,17 @@ import org.apache.cayenne.CayenneDataObject;
*/
public abstract class _UuidRoot1 extends CayenneDataObject {
- public static final String UUID_PROPERTY = "uuid";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<String> UUID = new Property<String>("uuid");
+
public void setUuid(String uuid) {
- writeProperty(UUID_PROPERTY, uuid);
+ writeProperty("uuid", uuid);
}
public String getUuid() {
- return (String)readProperty(UUID_PROPERTY);
+ return (String)readProperty("uuid");
}
}
[4/5] cayenne git commit: rerunning cgen
Posted by aa...@apache.org.
rerunning cgen
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cc1eea87
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cc1eea87
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cc1eea87
Branch: refs/heads/master
Commit: cc1eea87870edc5ef46bd1e13dd1f3934f0e1853
Parents: ed28881
Author: aadamchik <aa...@apache.org>
Authored: Thu Oct 22 17:31:07 2015 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Thu Oct 22 17:37:27 2015 +0300
----------------------------------------------------------------------
.../apache/cayenne/lifecycle/db/Auditable1.java | 2 ++
.../apache/cayenne/lifecycle/db/Auditable2.java | 4 ++-
.../cayenne/lifecycle/db/AuditableChild1.java | 2 ++
.../cayenne/lifecycle/db/AuditableChild2.java | 2 +-
.../cayenne/lifecycle/db/AuditableChild3.java | 4 +--
.../lifecycle/db/AuditableChildUuid.java | 6 ++--
.../org/apache/cayenne/lifecycle/db/E1.java | 2 +-
.../org/apache/cayenne/lifecycle/db/E2.java | 2 +-
.../apache/cayenne/lifecycle/db/SortDep.java | 2 +-
.../apache/cayenne/lifecycle/db/SortRoot.java | 2 +-
.../apache/cayenne/lifecycle/db/UuidRoot1.java | 4 +--
.../postcommit/PostCommitFilter_AllIT.java | 35 +++++++++++---------
.../postcommit/PostCommitFilter_FilteredIT.java | 10 +++---
13 files changed, 44 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/Auditable1.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/Auditable1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/Auditable1.java
index ccd68ce..4cb7ff1 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/Auditable1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/Auditable1.java
@@ -24,4 +24,6 @@ import org.apache.cayenne.lifecycle.db.auto._Auditable1;
@Auditable
public class Auditable1 extends _Auditable1 {
+ private static final long serialVersionUID = 8458581370578140962L;
+
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/Auditable2.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/Auditable2.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/Auditable2.java
index 7cce5d8..854b0ac 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/Auditable2.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/Auditable2.java
@@ -21,7 +21,9 @@ package org.apache.cayenne.lifecycle.db;
import org.apache.cayenne.lifecycle.audit.Auditable;
import org.apache.cayenne.lifecycle.db.auto._Auditable2;
-@Auditable(ignoredProperties = _Auditable2.CHAR_PROPERTY1_PROPERTY, confidential=_Auditable2.CHAR_PROPERTY2_PROPERTY)
+@Auditable(ignoredProperties = "charProperty1", confidential = "charProperty2")
public class Auditable2 extends _Auditable2 {
+ private static final long serialVersionUID = 5203324250911707978L;
+
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild1.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild1.java
index d567f5f..9039a08 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild1.java
@@ -22,4 +22,6 @@ import org.apache.cayenne.lifecycle.db.auto._AuditableChild1;
public class AuditableChild1 extends _AuditableChild1 {
+ private static final long serialVersionUID = 7967782239405764614L;
+
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild2.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild2.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild2.java
index b9bae82..547f8fc 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild2.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild2.java
@@ -21,5 +21,5 @@ package org.apache.cayenne.lifecycle.db;
import org.apache.cayenne.lifecycle.db.auto._AuditableChild2;
public class AuditableChild2 extends _AuditableChild2 {
-
+ private static final long serialVersionUID = 1L;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild3.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild3.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild3.java
index a6bc631..556eaaa 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild3.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChild3.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.lifecycle.db;
import org.apache.cayenne.lifecycle.audit.AuditableChild;
import org.apache.cayenne.lifecycle.db.auto._AuditableChild3;
-@AuditableChild(value = _AuditableChild3.PARENT_PROPERTY, ignoredProperties = _AuditableChild3.CHAR_PROPERTY1_PROPERTY)
+@AuditableChild(value = "parent", ignoredProperties = "charProperty1")
public class AuditableChild3 extends _AuditableChild3 {
-
+ private static final long serialVersionUID = 1L;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChildUuid.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChildUuid.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChildUuid.java
index 873c64e..38becd8 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChildUuid.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/AuditableChildUuid.java
@@ -22,7 +22,9 @@ import org.apache.cayenne.lifecycle.audit.AuditableChild;
import org.apache.cayenne.lifecycle.db.auto._AuditableChildUuid;
import org.apache.cayenne.lifecycle.relationship.ObjectIdRelationship;
-@ObjectIdRelationship(_AuditableChildUuid.UUID_PROPERTY)
-@AuditableChild(objectIdRelationship = _AuditableChildUuid.UUID_PROPERTY)
+@ObjectIdRelationship("uuid")
+@AuditableChild(objectIdRelationship = "uuid")
public class AuditableChildUuid extends _AuditableChildUuid {
+
+ private static final long serialVersionUID = 1L;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E1.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E1.java
index 478fb45..d08294d 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E1.java
@@ -21,5 +21,5 @@ package org.apache.cayenne.lifecycle.db;
import org.apache.cayenne.lifecycle.db.auto._E1;
public class E1 extends _E1 {
-
+ private static final long serialVersionUID = 1L;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E2.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E2.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E2.java
index 43a9cc1..b58c371 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E2.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E2.java
@@ -21,5 +21,5 @@ package org.apache.cayenne.lifecycle.db;
import org.apache.cayenne.lifecycle.db.auto._E2;
public class E2 extends _E2 {
-
+ private static final long serialVersionUID = 1L;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortDep.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortDep.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortDep.java
index beedc7d..d7cb404 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortDep.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortDep.java
@@ -21,5 +21,5 @@ package org.apache.cayenne.lifecycle.db;
import org.apache.cayenne.lifecycle.db.auto._SortDep;
public class SortDep extends _SortDep {
-
+ private static final long serialVersionUID = 1L;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortRoot.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortRoot.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortRoot.java
index e97b509..c2e98fb 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortRoot.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/SortRoot.java
@@ -23,5 +23,5 @@ import org.apache.cayenne.lifecycle.sort.SortWeight;
@SortWeight(2)
public class SortRoot extends _SortRoot {
-
+ private static final long serialVersionUID = 1L;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/UuidRoot1.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/UuidRoot1.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/UuidRoot1.java
index c6bcb30..3ae2022 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/UuidRoot1.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/UuidRoot1.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.lifecycle.db;
import org.apache.cayenne.lifecycle.db.auto._UuidRoot1;
import org.apache.cayenne.lifecycle.relationship.ObjectIdRelationship;
-@ObjectIdRelationship(_UuidRoot1.UUID_PROPERTY)
+@ObjectIdRelationship("uuid")
public class UuidRoot1 extends _UuidRoot1 {
-
+ private static final long serialVersionUID = 1L;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_AllIT.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_AllIT.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_AllIT.java
index aef0176..f2ba0ea 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_AllIT.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_AllIT.java
@@ -87,7 +87,7 @@ public class PostCommitFilter_AllIT extends LifecycleServerCase {
assertNotNull(c);
assertEquals(ObjectChangeType.INSERT, c.getType());
assertEquals(1, c.getAttributeChanges().size());
- assertEquals("yy", c.getAttributeChanges().get(Auditable1.CHAR_PROPERTY1_PROPERTY).getNewValue());
+ assertEquals("yy", c.getAttributeChanges().get(Auditable1.CHAR_PROPERTY1.getName()).getNewValue());
assertNotEquals(preCommitId, a1.getObjectId());
assertEquals(preCommitId, c.getPreCommitId());
@@ -104,7 +104,7 @@ public class PostCommitFilter_AllIT extends LifecycleServerCase {
@Test
public void testPostCommit_Update() throws SQLException {
-
+
auditable1.insert(1, "xx");
final Auditable1 a1 = SelectById.query(Auditable1.class, 1).selectOne(context);
@@ -126,11 +126,11 @@ public class PostCommitFilter_AllIT extends LifecycleServerCase {
assertNotNull(c);
assertEquals(ObjectChangeType.UPDATE, c.getType());
assertEquals(1, c.getAttributeChanges().size());
- AttributeChange pc = c.getAttributeChanges().get(Auditable1.CHAR_PROPERTY1_PROPERTY);
+ AttributeChange pc = c.getAttributeChanges().get(Auditable1.CHAR_PROPERTY1.getName());
assertNotNull(pc);
assertEquals("xx", pc.getOldValue());
assertEquals("yy", pc.getNewValue());
-
+
assertEquals(preCommitId, a1.getObjectId());
assertEquals(preCommitId, c.getPreCommitId());
assertEquals(preCommitId, c.getPostCommitId());
@@ -162,8 +162,8 @@ public class PostCommitFilter_AllIT extends LifecycleServerCase {
assertNotNull(c);
assertEquals(ObjectChangeType.DELETE, c.getType());
assertEquals(1, c.getAttributeChanges().size());
- assertEquals("xx", c.getAttributeChanges().get(Auditable1.CHAR_PROPERTY1_PROPERTY).getOldValue());
- assertNull(c.getAttributeChanges().get(Auditable1.CHAR_PROPERTY1_PROPERTY).getNewValue());
+ assertEquals("xx", c.getAttributeChanges().get(Auditable1.CHAR_PROPERTY1.getName()).getOldValue());
+ assertNull(c.getAttributeChanges().get(Auditable1.CHAR_PROPERTY1.getName()).getNewValue());
return null;
}
@@ -202,27 +202,30 @@ public class PostCommitFilter_AllIT extends LifecycleServerCase {
assertNotNull(changes);
assertEquals(4, changes.getUniqueChanges().size());
- ObjectChange ac1c = changes.getChanges()
- .get(new ObjectId("AuditableChild1", AuditableChild1.ID_PK_COLUMN, 1));
+ ObjectChange ac1c = changes.getChanges().get(
+ new ObjectId("AuditableChild1", AuditableChild1.ID_PK_COLUMN, 1));
assertNotNull(ac1c);
assertEquals(ObjectChangeType.UPDATE, ac1c.getType());
- ToOneRelationshipChange ac1c1 = ac1c.getToOneRelationshipChanges().get(AuditableChild1.PARENT_PROPERTY);
+ ToOneRelationshipChange ac1c1 = ac1c.getToOneRelationshipChanges()
+ .get(AuditableChild1.PARENT.getName());
assertEquals(a1.getObjectId(), ac1c1.getOldValue());
assertEquals(null, ac1c1.getNewValue());
- ObjectChange ac2c = changes.getChanges()
- .get(new ObjectId("AuditableChild1", AuditableChild1.ID_PK_COLUMN, 2));
+ ObjectChange ac2c = changes.getChanges().get(
+ new ObjectId("AuditableChild1", AuditableChild1.ID_PK_COLUMN, 2));
assertNotNull(ac2c);
assertEquals(ObjectChangeType.UPDATE, ac2c.getType());
- ToOneRelationshipChange ac2c1 = ac2c.getToOneRelationshipChanges().get(AuditableChild1.PARENT_PROPERTY);
+ ToOneRelationshipChange ac2c1 = ac2c.getToOneRelationshipChanges()
+ .get(AuditableChild1.PARENT.getName());
assertEquals(a2.getObjectId(), ac2c1.getOldValue());
assertEquals(a1.getObjectId(), ac2c1.getNewValue());
- ObjectChange ac3c = changes.getChanges()
- .get(new ObjectId("AuditableChild1", AuditableChild1.ID_PK_COLUMN, 3));
+ ObjectChange ac3c = changes.getChanges().get(
+ new ObjectId("AuditableChild1", AuditableChild1.ID_PK_COLUMN, 3));
assertNotNull(ac3c);
assertEquals(ObjectChangeType.UPDATE, ac3c.getType());
- ToOneRelationshipChange ac3c1 = ac3c.getToOneRelationshipChanges().get(AuditableChild1.PARENT_PROPERTY);
+ ToOneRelationshipChange ac3c1 = ac3c.getToOneRelationshipChanges()
+ .get(AuditableChild1.PARENT.getName());
assertEquals(null, ac3c1.getOldValue());
assertEquals(a1.getObjectId(), ac3c1.getNewValue());
@@ -269,7 +272,7 @@ public class PostCommitFilter_AllIT extends LifecycleServerCase {
assertEquals(1, a1c.getToManyRelationshipChanges().size());
- ToManyRelationshipChange a1c1 = a1c.getToManyRelationshipChanges().get(Auditable1.CHILDREN1_PROPERTY);
+ ToManyRelationshipChange a1c1 = a1c.getToManyRelationshipChanges().get(Auditable1.CHILDREN1.getName());
assertNotNull(a1c1);
assertEquals(2, a1c1.getAdded().size());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc1eea87/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_FilteredIT.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_FilteredIT.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_FilteredIT.java
index d49b5ff..23f1519 100644
--- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_FilteredIT.java
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/postcommit/PostCommitFilter_FilteredIT.java
@@ -51,8 +51,8 @@ public class PostCommitFilter_FilteredIT extends LifecycleServerCase {
@Override
protected ServerRuntimeBuilder configureCayenne() {
this.mockListener = mock(PostCommitListener.class);
- return super.configureCayenne()
- .addModule(PostCommitModuleBuilder.builder().auditableEntitiesOnly().listener(mockListener).build());
+ return super.configureCayenne().addModule(
+ PostCommitModuleBuilder.builder().auditableEntitiesOnly().listener(mockListener).build());
}
@Before
@@ -80,7 +80,7 @@ public class PostCommitFilter_FilteredIT extends LifecycleServerCase {
assertEquals(1, c.getAttributeChanges().size());
assertEquals(Confidential.getInstance(),
- c.getAttributeChanges().get(Auditable2.CHAR_PROPERTY2_PROPERTY).getNewValue());
+ c.getAttributeChanges().get(Auditable2.CHAR_PROPERTY2.getName()).getNewValue());
return null;
}
@@ -112,7 +112,7 @@ public class PostCommitFilter_FilteredIT extends LifecycleServerCase {
assertNotNull(c);
assertEquals(ObjectChangeType.UPDATE, c.getType());
assertEquals(1, c.getAttributeChanges().size());
- AttributeChange pc = c.getAttributeChanges().get(Auditable2.CHAR_PROPERTY2_PROPERTY);
+ AttributeChange pc = c.getAttributeChanges().get(Auditable2.CHAR_PROPERTY2.getName());
assertNotNull(pc);
assertEquals(Confidential.getInstance(), pc.getOldValue());
assertEquals(Confidential.getInstance(), pc.getNewValue());
@@ -148,7 +148,7 @@ public class PostCommitFilter_FilteredIT extends LifecycleServerCase {
assertEquals(ObjectChangeType.DELETE, c.getType());
assertEquals(1, c.getAttributeChanges().size());
assertEquals(Confidential.getInstance(),
- c.getAttributeChanges().get(Auditable2.CHAR_PROPERTY2_PROPERTY).getOldValue());
+ c.getAttributeChanges().get(Auditable2.CHAR_PROPERTY2.getName()).getOldValue());
return null;
}
[3/5] cayenne git commit: CAY-2030 Capturing a stream of commit
changes
Posted by aa...@apache.org.
CAY-2030 Capturing a stream of commit changes
* flattened relationship test
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ed288811
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ed288811
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ed288811
Branch: refs/heads/master
Commit: ed288811f8fd645a3d17e5ecdebeefe843e4e8c3
Parents: c14b375
Author: aadamchik <aa...@apache.org>
Authored: Thu Oct 22 17:32:47 2015 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Thu Oct 22 17:32:47 2015 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/lifecycle/db/E3.java | 9 +++++
.../org/apache/cayenne/lifecycle/db/E4.java | 9 +++++
.../apache/cayenne/lifecycle/db/auto/_E3.java | 35 ++++++++++++++++++++
.../apache/cayenne/lifecycle/db/auto/_E4.java | 35 ++++++++++++++++++++
.../src/test/resources/lifecycle-map.map.xml | 28 ++++++++++++++++
5 files changed, 116 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ed288811/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E3.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E3.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E3.java
new file mode 100644
index 0000000..0efda10
--- /dev/null
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E3.java
@@ -0,0 +1,9 @@
+package org.apache.cayenne.lifecycle.db;
+
+import org.apache.cayenne.lifecycle.db.auto._E3;
+
+public class E3 extends _E3 {
+
+ private static final long serialVersionUID = 1L;
+
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ed288811/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E4.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E4.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E4.java
new file mode 100644
index 0000000..b2b0bca
--- /dev/null
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/E4.java
@@ -0,0 +1,9 @@
+package org.apache.cayenne.lifecycle.db;
+
+import org.apache.cayenne.lifecycle.db.auto._E4;
+
+public class E4 extends _E4 {
+
+ private static final long serialVersionUID = 1L;
+
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ed288811/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E3.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E3.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E3.java
new file mode 100644
index 0000000..d9004c0
--- /dev/null
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E3.java
@@ -0,0 +1,35 @@
+package org.apache.cayenne.lifecycle.db.auto;
+
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.lifecycle.db.E4;
+
+/**
+ * Class _E3 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 _E3 extends CayenneDataObject {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public static final Property<List<E4>> E4S = new Property<List<E4>>("e4s");
+
+ public void addToE4s(E4 obj) {
+ addToManyTarget("e4s", obj, true);
+ }
+ public void removeFromE4s(E4 obj) {
+ removeToManyTarget("e4s", obj, true);
+ }
+ @SuppressWarnings("unchecked")
+ public List<E4> getE4s() {
+ return (List<E4>)readProperty("e4s");
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ed288811/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E4.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E4.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E4.java
new file mode 100644
index 0000000..732e532
--- /dev/null
+++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/db/auto/_E4.java
@@ -0,0 +1,35 @@
+package org.apache.cayenne.lifecycle.db.auto;
+
+import java.util.List;
+
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.lifecycle.db.E3;
+
+/**
+ * Class _E4 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 _E4 extends CayenneDataObject {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public static final Property<List<E3>> E3S = new Property<List<E3>>("e3s");
+
+ public void addToE3s(E3 obj) {
+ addToManyTarget("e3s", obj, true);
+ }
+ public void removeFromE3s(E3 obj) {
+ removeToManyTarget("e3s", obj, true);
+ }
+ @SuppressWarnings("unchecked")
+ public List<E3> getE3s() {
+ return (List<E3>)readProperty("e3s");
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ed288811/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml b/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
index 531aa15..14ac628 100644
--- a/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
+++ b/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
@@ -41,6 +41,16 @@
<db-entity name="E2">
<db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
</db-entity>
+ <db-entity name="E3">
+ <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
+ </db-entity>
+ <db-entity name="E34">
+ <db-attribute name="E3_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ <db-attribute name="E4_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ </db-entity>
+ <db-entity name="E4">
+ <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
+ </db-entity>
<db-entity name="SORT_DEP">
<db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="ROOT_ID" type="BIGINT" isMandatory="true"/>
@@ -78,6 +88,10 @@
</obj-entity>
<obj-entity name="E2" className="org.apache.cayenne.lifecycle.db.E2" dbEntityName="E2">
</obj-entity>
+ <obj-entity name="E3" className="org.apache.cayenne.lifecycle.db.E3" dbEntityName="E3">
+ </obj-entity>
+ <obj-entity name="E4" className="org.apache.cayenne.lifecycle.db.E4" dbEntityName="E4">
+ </obj-entity>
<obj-entity name="SortDep" className="org.apache.cayenne.lifecycle.db.SortDep" dbEntityName="SORT_DEP">
</obj-entity>
<obj-entity name="SortRoot" className="org.apache.cayenne.lifecycle.db.SortRoot" dbEntityName="SORT_ROOT">
@@ -103,6 +117,18 @@
<db-relationship name="parent" source="AUDITABLE_CHILD3" target="AUDITABLE2" toMany="false">
<db-attribute-pair source="AUDITABLE2_ID" target="ID"/>
</db-relationship>
+ <db-relationship name="e34s" source="E3" target="E34" toDependentPK="true" toMany="true">
+ <db-attribute-pair source="ID" target="E3_ID"/>
+ </db-relationship>
+ <db-relationship name="e3" source="E34" target="E3" toMany="false">
+ <db-attribute-pair source="E3_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="e4" source="E34" target="E4" toMany="false">
+ <db-attribute-pair source="E4_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="e34s" source="E4" target="E34" toDependentPK="true" toMany="true">
+ <db-attribute-pair source="ID" target="E4_ID"/>
+ </db-relationship>
<db-relationship name="root" source="SORT_DEP" target="SORT_ROOT" toMany="false">
<db-attribute-pair source="ROOT_ID" target="ID"/>
</db-relationship>
@@ -114,6 +140,8 @@
<obj-relationship name="parent" source="AuditableChild1" target="Auditable1" deleteRule="Nullify" db-relationship-path="parent"/>
<obj-relationship name="parent" source="AuditableChild2" target="Auditable1" deleteRule="Nullify" db-relationship-path="parent"/>
<obj-relationship name="parent" source="AuditableChild3" target="Auditable2" deleteRule="Nullify" db-relationship-path="parent"/>
+ <obj-relationship name="e4s" source="E3" target="E4" deleteRule="Deny" db-relationship-path="e34s.e4"/>
+ <obj-relationship name="e3s" source="E4" target="E3" deleteRule="Deny" db-relationship-path="e34s.e3"/>
<obj-relationship name="root" source="SortDep" target="SortRoot" deleteRule="Nullify" db-relationship-path="root"/>
<obj-relationship name="deps" source="SortRoot" target="SortDep" deleteRule="Deny" db-relationship-path="deps"/>
</data-map>