You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/08/11 07:54:50 UTC
[13/18] cayenne git commit: CAY-2330 Field based data objects update
test classes to latest cgen templates
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java
index d184188..9da8fa5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java
@@ -40,7 +40,7 @@ public abstract class _Thing extends CayenneDataObject {
public Integer getVolume() {
beforePropertyRead("volume");
- return volume;
+ return this.volume;
}
public void setWeight(Integer weight) {
@@ -50,7 +50,7 @@ public abstract class _Thing extends CayenneDataObject {
public Integer getWeight() {
beforePropertyRead("weight");
- return weight;
+ return this.weight;
}
public void setBall(Ball ball) {
@@ -121,19 +121,19 @@ public abstract class _Thing extends CayenneDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(volume);
- out.writeObject(weight);
- out.writeObject(ball);
- out.writeObject(box);
+ out.writeObject(this.volume);
+ out.writeObject(this.weight);
+ out.writeObject(this.ball);
+ out.writeObject(this.box);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- volume = (Integer)in.readObject();
- weight = (Integer)in.readObject();
- ball = in.readObject();
- box = in.readObject();
+ this.volume = (Integer)in.readObject();
+ this.weight = (Integer)in.readObject();
+ this.ball = in.readObject();
+ this.box = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java
index aca4f32..9a33de6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java
@@ -73,13 +73,13 @@ public abstract class _TooneDep extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(toMaster);
+ out.writeObject(this.toMaster);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- toMaster = in.readObject();
+ this.toMaster = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java
index e77fca1..8d9858f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java
@@ -73,13 +73,13 @@ public abstract class _TooneMaster extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(toDependent);
+ out.writeObject(this.toDependent);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- toDependent = in.readObject();
+ this.toDependent = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Customer.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Customer.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Customer.java
index a63b36d..8b903d6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Customer.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Customer.java
@@ -35,7 +35,7 @@ public abstract class _Customer extends BaseDataObject {
public String getLongvarcharCol() {
beforePropertyRead("longvarcharCol");
- return longvarcharCol;
+ return this.longvarcharCol;
}
public void addToOrder(Product obj) {
@@ -96,15 +96,15 @@ public abstract class _Customer extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(longvarcharCol);
- out.writeObject(order);
+ out.writeObject(this.longvarcharCol);
+ out.writeObject(this.order);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- longvarcharCol = (String)in.readObject();
- order = in.readObject();
+ this.longvarcharCol = (String)in.readObject();
+ this.order = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Product.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Product.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Product.java
index d61e552..821705f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Product.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Product.java
@@ -40,7 +40,7 @@ public abstract class _Product extends BaseDataObject {
public String getLongvarcharCol() {
beforePropertyRead("longvarcharCol");
- return longvarcharCol;
+ return this.longvarcharCol;
}
public void addToBase(Product obj) {
@@ -137,19 +137,19 @@ public abstract class _Product extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(longvarcharCol);
- out.writeObject(base);
- out.writeObject(contained);
- out.writeObject(orderBy);
+ out.writeObject(this.longvarcharCol);
+ out.writeObject(this.base);
+ out.writeObject(this.contained);
+ out.writeObject(this.orderBy);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- longvarcharCol = (String)in.readObject();
- base = in.readObject();
- contained = in.readObject();
- orderBy = in.readObject();
+ this.longvarcharCol = (String)in.readObject();
+ this.base = in.readObject();
+ this.contained = in.readObject();
+ this.orderBy = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java
index 2f77d87..a3bd685 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java
@@ -32,7 +32,7 @@ public abstract class _UuidPkEntity extends BaseDataObject {
public UUID getId() {
beforePropertyRead("id");
- return id;
+ return this.id;
}
@Override
@@ -75,13 +75,13 @@ public abstract class _UuidPkEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(id);
+ out.writeObject(this.id);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- id = (UUID)in.readObject();
+ this.id = (UUID)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java
index 3342cb6..08da08c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java
@@ -32,7 +32,7 @@ public abstract class _UuidTestEntity extends BaseDataObject {
public UUID getUuid() {
beforePropertyRead("uuid");
- return uuid;
+ return this.uuid;
}
@Override
@@ -75,13 +75,13 @@ public abstract class _UuidTestEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(uuid);
+ out.writeObject(this.uuid);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- uuid = (UUID)in.readObject();
+ this.uuid = (UUID)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/weighted_sort/auto/_SortDep.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/weighted_sort/auto/_SortDep.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/weighted_sort/auto/_SortDep.java
index b4803c4..343544f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/weighted_sort/auto/_SortDep.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/weighted_sort/auto/_SortDep.java
@@ -73,13 +73,13 @@ public abstract class _SortDep extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(root);
+ out.writeObject(this.root);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- root = in.readObject();
+ this.root = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/weighted_sort/auto/_SortRoot.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/weighted_sort/auto/_SortRoot.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/weighted_sort/auto/_SortRoot.java
index 67b4d45..2fda8a5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/weighted_sort/auto/_SortRoot.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/weighted_sort/auto/_SortRoot.java
@@ -79,13 +79,13 @@ public abstract class _SortRoot extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(deps);
+ out.writeObject(this.deps);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- deps = in.readObject();
+ this.deps = in.readObject();
}
}