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:48 UTC
[2/5] cayenne git commit: rerunning cgen
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");
}
}