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:53 UTC
[16/18] cayenne git commit: CAY-2330 Field based data objects update
test classes to latest cgen templates
CAY-2330 Field based data objects
update test classes to latest cgen templates
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f3a350e1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f3a350e1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f3a350e1
Branch: refs/heads/master
Commit: f3a350e1b380cbda8d51e8d468989b8af1dc5ead
Parents: 4d315fb
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Jul 6 14:05:49 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Jul 6 14:05:50 2017 +0300
----------------------------------------------------------------------
.../array_type/auto/_ArrayTestEntity.java | 6 +-
.../testdo/binary_pk/auto/_BinaryPKTest1.java | 10 +-
.../testdo/binary_pk/auto/_BinaryPKTest2.java | 10 +-
.../cayenne/testdo/cay_2032/auto/_Team.java | 4 +-
.../cayenne/testdo/cay_2032/auto/_User.java | 10 +-
.../testdo/compound/auto/_CharFkTestEntity.java | 10 +-
.../testdo/compound/auto/_CharPkTestEntity.java | 16 +--
.../compound/auto/_CompoundFkTestEntity.java | 10 +-
.../compound/auto/_CompoundPkTestEntity.java | 22 ++--
.../testdo/date_time/auto/_CalendarEntity.java | 6 +-
.../testdo/date_time/auto/_DateTestEntity.java | 18 +--
.../cayenne/testdo/db1/auto/_CrossdbM1E1.java | 14 +--
.../cayenne/testdo/db2/auto/_CrossdbM2E1.java | 10 +-
.../cayenne/testdo/db2/auto/_CrossdbM2E2.java | 14 +--
.../testdo/deleterules/auto/_DeleteCascade.java | 10 +-
.../testdo/deleterules/auto/_DeleteDeny.java | 10 +-
.../testdo/deleterules/auto/_DeleteNullify.java | 10 +-
.../testdo/deleterules/auto/_DeleteRule.java | 18 +--
.../testdo/embeddable/auto/_EmbedEntity1.java | 18 +--
.../testdo/enum_test/auto/_EnumEntity.java | 6 +-
.../extended_type/auto/_ExtendedTypeEntity.java | 6 +-
.../generated/auto/_GeneratedColumnCompKey.java | 10 +-
.../auto/_GeneratedColumnCompMaster.java | 10 +-
.../generated/auto/_GeneratedColumnDep.java | 10 +-
.../generated/auto/_GeneratedColumnTest2.java | 6 +-
.../auto/_GeneratedColumnTestEntity.java | 10 +-
.../testdo/generated/auto/_GeneratedF1.java | 4 +-
.../testdo/generated/auto/_GeneratedF2.java | 4 +-
.../testdo/inheritance/auto/_BaseEntity.java | 14 +--
.../inheritance/auto/_DirectToSubEntity.java | 4 +-
.../testdo/inheritance/auto/_RelatedEntity.java | 8 +-
.../testdo/inheritance_flat/auto/_Group.java | 8 +-
.../inheritance_flat/auto/_GroupProperties.java | 16 +--
.../testdo/inheritance_flat/auto/_Role.java | 30 ++---
.../testdo/inheritance_flat/auto/_User.java | 4 +-
.../inheritance_flat/auto/_UserProperties.java | 16 +--
.../auto/_AbstractPerson.java | 16 +--
.../inheritance_people/auto/_Address.java | 10 +-
.../inheritance_people/auto/_ClientCompany.java | 10 +-
.../auto/_CustomerRepresentative.java | 10 +-
.../inheritance_people/auto/_Department.java | 14 +--
.../inheritance_people/auto/_Employee.java | 14 +--
.../inheritance_people/auto/_Manager.java | 4 +-
.../inheritance_people/auto/_PersonNotes.java | 10 +-
.../inheritance_vertical/auto/_Iv1Root.java | 12 +-
.../inheritance_vertical/auto/_Iv1Sub1.java | 6 +-
.../inheritance_vertical/auto/_Iv2Root.java | 6 +-
.../inheritance_vertical/auto/_Iv2Sub1.java | 4 +-
.../inheritance_vertical/auto/_IvAbstract.java | 6 +-
.../inheritance_vertical/auto/_IvBase.java | 12 +-
.../auto/_IvBaseWithLock.java | 12 +-
.../inheritance_vertical/auto/_IvConcrete.java | 14 +--
.../inheritance_vertical/auto/_IvImpl.java | 20 ++--
.../auto/_IvImplWithLock.java | 10 +-
.../inheritance_vertical/auto/_IvOther.java | 14 +--
.../inheritance_vertical/auto/_IvRoot.java | 12 +-
.../inheritance_vertical/auto/_IvSub1.java | 6 +-
.../inheritance_vertical/auto/_IvSub1Sub1.java | 6 +-
.../inheritance_vertical/auto/_IvSub2.java | 12 +-
.../inheritance_vertical/auto/_IvSub3.java | 6 +-
.../auto/_Lifecycle.java | 6 +-
.../testdo/lifecycles/auto/_Lifecycles.java | 6 +-
.../testdo/lob/auto/_BlobTestEntity.java | 6 +-
.../testdo/lob/auto/_ClobTestEntity.java | 10 +-
.../testdo/lob/auto/_ClobTestRelation.java | 16 +--
.../testdo/lob/auto/_NClobTestEntity.java | 6 +-
.../testdo/locking/auto/_LockingHelper.java | 10 +-
.../locking/auto/_RelLockingTestEntity.java | 14 +--
.../locking/auto/_SimpleLockingTestEntity.java | 12 +-
.../testdo/map_to_many/auto/_IdMapToMany.java | 4 +-
.../map_to_many/auto/_IdMapToManyTarget.java | 4 +-
.../testdo/map_to_many/auto/_MapToMany.java | 4 +-
.../map_to_many/auto/_MapToManyTarget.java | 10 +-
.../meaningful_pk/auto/_MeaningfulPKDep.java | 10 +-
.../meaningful_pk/auto/_MeaningfulPKTest1.java | 16 +--
.../meaningful_pk/auto/_MeaningfulPk.java | 6 +-
.../testdo/misc_types/auto/_ArraysEntity.java | 24 ++--
.../misc_types/auto/_CharacterEntity.java | 6 +-
.../misc_types/auto/_SerializableEntity.java | 6 +-
.../auto/_MixedPersistenceStrategy.java | 16 +--
.../auto/_MixedPersistenceStrategy2.java | 10 +-
.../cayenne/testdo/mt/auto/_MtTable1.java | 16 +--
.../testdo/mt/auto/_MtTable1Subclass1.java | 6 +-
.../testdo/mt/auto/_MtTable1Subclass2.java | 6 +-
.../cayenne/testdo/mt/auto/_MtTable2.java | 14 +--
.../cayenne/testdo/mt/auto/_MtTable3.java | 22 ++--
.../cayenne/testdo/mt/auto/_MtTable4.java | 4 +-
.../cayenne/testdo/mt/auto/_MtTable5.java | 4 +-
.../testdo/no_pk/auto/_NoPkTestEntity.java | 6 +-
.../numeric_types/auto/_BigDecimalEntity.java | 6 +-
.../numeric_types/auto/_BigIntegerEntity.java | 6 +-
.../auto/_BitNumberTestEntity.java | 6 +-
.../numeric_types/auto/_BitTestEntity.java | 6 +-
.../numeric_types/auto/_BooleanTestEntity.java | 6 +-
.../numeric_types/auto/_DecimalPKTest1.java | 12 +-
.../auto/_DecimalPKTestEntity.java | 12 +-
.../testdo/numeric_types/auto/_LongEntity.java | 6 +-
.../numeric_types/auto/_SmallintTestEntity.java | 6 +-
.../numeric_types/auto/_TinyintTestEntity.java | 6 +-
.../testdo/oneway/auto/_OnewayTable2.java | 10 +-
.../testdo/oneway/auto/_OnewayTable3.java | 4 +-
.../primitive/auto/_PrimitivesTestEntity.java | 16 +--
.../testdo/qualified/auto/_Qualified1.java | 16 +--
.../testdo/qualified/auto/_Qualified2.java | 16 +--
.../testdo/quotemap/auto/_QuoteAdress.java | 16 +--
.../testdo/quotemap/auto/_Quote_Person.java | 34 +++---
.../testdo/reflexive/auto/_Reflexive.java | 14 +--
.../relationships/auto/_FkOfDifferentType.java | 4 +-
.../relationships/auto/_MeaningfulFK.java | 10 +-
.../relationships/auto/_ReflexiveAndToOne.java | 18 +--
.../relationships/auto/_RelationshipHelper.java | 18 +--
.../relationships_activity/auto/_Activity.java | 18 +--
.../auto/_ActivityResult.java | 20 ++--
.../relationships_child_master/auto/_Child.java | 4 +-
.../auto/_Master.java | 10 +-
.../relationships_clob/auto/_ClobDetail.java | 10 +-
.../relationships_clob/auto/_ClobMaster.java | 16 +--
.../auto/_CollectionToMany.java | 4 +-
.../auto/_CollectionToManyTarget.java | 4 +-
.../auto/_DeleteRuleFlatA.java | 4 +-
.../auto/_DeleteRuleFlatB.java | 4 +-
.../auto/_DeleteRuleTest1.java | 4 +-
.../auto/_DeleteRuleTest2.java | 8 +-
.../auto/_DeleteRuleTest3.java | 4 +-
.../auto/_FlattenedCircular.java | 8 +-
.../auto/_FlattenedTest1.java | 26 ++--
.../auto/_FlattenedTest2.java | 14 +--
.../auto/_FlattenedTest3.java | 18 +--
.../auto/_FlattenedTest4.java | 10 +-
.../auto/_FlattenedTest5.java | 10 +-
.../auto/_SetToMany.java | 4 +-
.../auto/_SetToManyTarget.java | 4 +-
.../auto/_ToManyFkDep.java | 20 ++--
.../auto/_ToManyFkRoot.java | 16 +--
.../auto/_ToManyRoot2.java | 10 +-
.../relationships_to_one_fk/auto/_ToOneFK1.java | 4 +-
.../relationships_to_one_fk/auto/_ToOneFK2.java | 4 +-
.../return_types/auto/_ReturnTypesMap1.java | 120 +++++++++----------
.../return_types/auto/_ReturnTypesMap2.java | 24 ++--
.../return_types/auto/_ReturnTypesMapLobs1.java | 12 +-
.../testdo/soft_delete/auto/_SoftDelete.java | 14 +--
.../table_primitives/auto/_TablePrimitives.java | 12 +-
.../testdo/testmap/auto/_ArtistCallback.java | 14 +--
.../apache/cayenne/testdo/things/auto/_Bag.java | 18 +--
.../cayenne/testdo/things/auto/_Ball.java | 20 ++--
.../apache/cayenne/testdo/things/auto/_Box.java | 22 ++--
.../cayenne/testdo/things/auto/_BoxInfo.java | 10 +-
.../cayenne/testdo/things/auto/_Thing.java | 20 ++--
.../cayenne/testdo/toone/auto/_TooneDep.java | 4 +-
.../cayenne/testdo/toone/auto/_TooneMaster.java | 4 +-
.../auto/_Customer.java | 10 +-
.../auto/_Product.java | 18 +--
.../cayenne/testdo/uuid/auto/_UuidPkEntity.java | 6 +-
.../testdo/uuid/auto/_UuidTestEntity.java | 6 +-
.../testdo/weighted_sort/auto/_SortDep.java | 4 +-
.../testdo/weighted_sort/auto/_SortRoot.java | 4 +-
156 files changed, 883 insertions(+), 883 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/array_type/auto/_ArrayTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/array_type/auto/_ArrayTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/array_type/auto/_ArrayTestEntity.java
index a85ab78..a124735 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/array_type/auto/_ArrayTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/array_type/auto/_ArrayTestEntity.java
@@ -31,7 +31,7 @@ public abstract class _ArrayTestEntity extends BaseDataObject {
public Double[] getDoubleArray() {
beforePropertyRead("doubleArray");
- return doubleArray;
+ return this.doubleArray;
}
@Override
@@ -74,13 +74,13 @@ public abstract class _ArrayTestEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(doubleArray);
+ out.writeObject(this.doubleArray);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- doubleArray = (Double[])in.readObject();
+ this.doubleArray = (Double[])in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest1.java
index 3b48e02..4871638 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest1.java
@@ -35,7 +35,7 @@ public abstract class _BinaryPKTest1 extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void addToBinaryPKDetails(BinaryPKTest2 obj) {
@@ -96,15 +96,15 @@ public abstract class _BinaryPKTest1 extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(binaryPKDetails);
+ out.writeObject(this.name);
+ out.writeObject(this.binaryPKDetails);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- binaryPKDetails = in.readObject();
+ this.name = (String)in.readObject();
+ this.binaryPKDetails = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest2.java
index 37083e0..8165599 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/binary_pk/auto/_BinaryPKTest2.java
@@ -34,7 +34,7 @@ public abstract class _BinaryPKTest2 extends BaseDataObject {
public String getDetailName() {
beforePropertyRead("detailName");
- return detailName;
+ return this.detailName;
}
public void setToBinaryPKMaster(BinaryPKTest1 toBinaryPKMaster) {
@@ -90,15 +90,15 @@ public abstract class _BinaryPKTest2 extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(detailName);
- out.writeObject(toBinaryPKMaster);
+ out.writeObject(this.detailName);
+ out.writeObject(this.toBinaryPKMaster);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- detailName = (String)in.readObject();
- toBinaryPKMaster = in.readObject();
+ this.detailName = (String)in.readObject();
+ this.toBinaryPKMaster = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java
index 0dc3d02..6361a69 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java
@@ -79,13 +79,13 @@ public abstract class _Team extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(teamUsers);
+ out.writeObject(this.teamUsers);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- teamUsers = in.readObject();
+ this.teamUsers = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_User.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_User.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_User.java
index e385c03..fcf1dab 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_User.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_User.java
@@ -35,7 +35,7 @@ public abstract class _User extends BaseDataObject {
public byte[] getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void addToUserTeams(Team obj) {
@@ -96,15 +96,15 @@ public abstract class _User extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(userTeams);
+ out.writeObject(this.name);
+ out.writeObject(this.userTeams);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (byte[])in.readObject();
- userTeams = in.readObject();
+ this.name = (byte[])in.readObject();
+ this.userTeams = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharFkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharFkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharFkTestEntity.java
index 08ce9b3..4d93574 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharFkTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharFkTestEntity.java
@@ -34,7 +34,7 @@ public abstract class _CharFkTestEntity extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void setToCharPK(CharPkTestEntity toCharPK) {
@@ -90,15 +90,15 @@ public abstract class _CharFkTestEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(toCharPK);
+ out.writeObject(this.name);
+ out.writeObject(this.toCharPK);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- toCharPK = in.readObject();
+ this.name = (String)in.readObject();
+ this.toCharPK = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharPkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharPkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharPkTestEntity.java
index 63c967e..d14d598 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharPkTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CharPkTestEntity.java
@@ -37,7 +37,7 @@ public abstract class _CharPkTestEntity extends BaseDataObject {
public String getOtherCol() {
beforePropertyRead("otherCol");
- return otherCol;
+ return this.otherCol;
}
public void setPkCol(String pkCol) {
@@ -47,7 +47,7 @@ public abstract class _CharPkTestEntity extends BaseDataObject {
public String getPkCol() {
beforePropertyRead("pkCol");
- return pkCol;
+ return this.pkCol;
}
public void addToCharFKs(CharFkTestEntity obj) {
@@ -113,17 +113,17 @@ public abstract class _CharPkTestEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(otherCol);
- out.writeObject(pkCol);
- out.writeObject(charFKs);
+ out.writeObject(this.otherCol);
+ out.writeObject(this.pkCol);
+ out.writeObject(this.charFKs);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- otherCol = (String)in.readObject();
- pkCol = (String)in.readObject();
- charFKs = in.readObject();
+ this.otherCol = (String)in.readObject();
+ this.pkCol = (String)in.readObject();
+ this.charFKs = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundFkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundFkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundFkTestEntity.java
index 4ea2475..cf2f6f3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundFkTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundFkTestEntity.java
@@ -34,7 +34,7 @@ public abstract class _CompoundFkTestEntity extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void setToCompoundPk(CompoundPkTestEntity toCompoundPk) {
@@ -90,15 +90,15 @@ public abstract class _CompoundFkTestEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(toCompoundPk);
+ out.writeObject(this.name);
+ out.writeObject(this.toCompoundPk);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- toCompoundPk = in.readObject();
+ this.name = (String)in.readObject();
+ this.toCompoundPk = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundPkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundPkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundPkTestEntity.java
index 54dfcce..f067bf9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundPkTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/compound/auto/_CompoundPkTestEntity.java
@@ -40,7 +40,7 @@ public abstract class _CompoundPkTestEntity extends BaseDataObject {
public String getKey1() {
beforePropertyRead("key1");
- return key1;
+ return this.key1;
}
public void setKey2(String key2) {
@@ -50,7 +50,7 @@ public abstract class _CompoundPkTestEntity extends BaseDataObject {
public String getKey2() {
beforePropertyRead("key2");
- return key2;
+ return this.key2;
}
public void setName(String name) {
@@ -60,7 +60,7 @@ public abstract class _CompoundPkTestEntity extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void addToCompoundFkArray(CompoundFkTestEntity obj) {
@@ -131,19 +131,19 @@ public abstract class _CompoundPkTestEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(key1);
- out.writeObject(key2);
- out.writeObject(name);
- out.writeObject(compoundFkArray);
+ out.writeObject(this.key1);
+ out.writeObject(this.key2);
+ out.writeObject(this.name);
+ out.writeObject(this.compoundFkArray);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- key1 = (String)in.readObject();
- key2 = (String)in.readObject();
- name = (String)in.readObject();
- compoundFkArray = in.readObject();
+ this.key1 = (String)in.readObject();
+ this.key2 = (String)in.readObject();
+ this.name = (String)in.readObject();
+ this.compoundFkArray = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/date_time/auto/_CalendarEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/date_time/auto/_CalendarEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/date_time/auto/_CalendarEntity.java
index 2cd2fcc..fe87795 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/date_time/auto/_CalendarEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/date_time/auto/_CalendarEntity.java
@@ -32,7 +32,7 @@ public abstract class _CalendarEntity extends BaseDataObject {
public Calendar getCalendarField() {
beforePropertyRead("calendarField");
- return calendarField;
+ return this.calendarField;
}
@Override
@@ -75,13 +75,13 @@ public abstract class _CalendarEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(calendarField);
+ out.writeObject(this.calendarField);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- calendarField = (Calendar)in.readObject();
+ this.calendarField = (Calendar)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/date_time/auto/_DateTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/date_time/auto/_DateTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/date_time/auto/_DateTestEntity.java
index 976108a..222211f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/date_time/auto/_DateTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/date_time/auto/_DateTestEntity.java
@@ -36,7 +36,7 @@ public abstract class _DateTestEntity extends BaseDataObject {
public Date getDateColumn() {
beforePropertyRead("dateColumn");
- return dateColumn;
+ return this.dateColumn;
}
public void setTimeColumn(Date timeColumn) {
@@ -46,7 +46,7 @@ public abstract class _DateTestEntity extends BaseDataObject {
public Date getTimeColumn() {
beforePropertyRead("timeColumn");
- return timeColumn;
+ return this.timeColumn;
}
public void setTimestampColumn(Date timestampColumn) {
@@ -56,7 +56,7 @@ public abstract class _DateTestEntity extends BaseDataObject {
public Date getTimestampColumn() {
beforePropertyRead("timestampColumn");
- return timestampColumn;
+ return this.timestampColumn;
}
@Override
@@ -109,17 +109,17 @@ public abstract class _DateTestEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(dateColumn);
- out.writeObject(timeColumn);
- out.writeObject(timestampColumn);
+ out.writeObject(this.dateColumn);
+ out.writeObject(this.timeColumn);
+ out.writeObject(this.timestampColumn);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- dateColumn = (Date)in.readObject();
- timeColumn = (Date)in.readObject();
- timestampColumn = (Date)in.readObject();
+ this.dateColumn = (Date)in.readObject();
+ this.timeColumn = (Date)in.readObject();
+ this.timestampColumn = (Date)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java
index ad8fe6b..3117203 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/db1/auto/_CrossdbM1E1.java
@@ -38,7 +38,7 @@ public abstract class _CrossdbM1E1 extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void addToFlattened(CrossdbM2E1 obj) {
@@ -117,17 +117,17 @@ public abstract class _CrossdbM1E1 extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(flattened);
- out.writeObject(listOfM2E2);
+ out.writeObject(this.name);
+ out.writeObject(this.flattened);
+ out.writeObject(this.listOfM2E2);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- flattened = in.readObject();
- listOfM2E2 = in.readObject();
+ this.name = (String)in.readObject();
+ this.flattened = in.readObject();
+ this.listOfM2E2 = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java
index 57031a7..c090fac 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E1.java
@@ -35,7 +35,7 @@ public abstract class _CrossdbM2E1 extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void addToListOfM2E2(CrossdbM2E2 obj) {
@@ -96,15 +96,15 @@ public abstract class _CrossdbM2E1 extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(listOfM2E2);
+ out.writeObject(this.name);
+ out.writeObject(this.listOfM2E2);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- listOfM2E2 = in.readObject();
+ this.name = (String)in.readObject();
+ this.listOfM2E2 = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java
index d1b020c..53762db 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/db2/auto/_CrossdbM2E2.java
@@ -37,7 +37,7 @@ public abstract class _CrossdbM2E2 extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void setToM1E1(CrossdbM1E1 toM1E1) {
@@ -106,17 +106,17 @@ public abstract class _CrossdbM2E2 extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(toM1E1);
- out.writeObject(toM2E1);
+ out.writeObject(this.name);
+ out.writeObject(this.toM1E1);
+ out.writeObject(this.toM2E1);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- toM1E1 = in.readObject();
- toM2E1 = in.readObject();
+ this.name = (String)in.readObject();
+ this.toM1E1 = in.readObject();
+ this.toM2E1 = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteCascade.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteCascade.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteCascade.java
index 8a5e586..3435644 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteCascade.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteCascade.java
@@ -34,7 +34,7 @@ public abstract class _DeleteCascade extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void setCascade(DeleteRule cascade) {
@@ -90,15 +90,15 @@ public abstract class _DeleteCascade extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(cascade);
+ out.writeObject(this.name);
+ out.writeObject(this.cascade);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- cascade = in.readObject();
+ this.name = (String)in.readObject();
+ this.cascade = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteDeny.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteDeny.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteDeny.java
index 20a733e..c7906c7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteDeny.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteDeny.java
@@ -34,7 +34,7 @@ public abstract class _DeleteDeny extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void setDeny(DeleteRule deny) {
@@ -90,15 +90,15 @@ public abstract class _DeleteDeny extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(deny);
+ out.writeObject(this.name);
+ out.writeObject(this.deny);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- deny = in.readObject();
+ this.name = (String)in.readObject();
+ this.deny = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteNullify.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteNullify.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteNullify.java
index 8695107..f5dbfd5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteNullify.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteNullify.java
@@ -34,7 +34,7 @@ public abstract class _DeleteNullify extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void setNullify(DeleteRule nullify) {
@@ -90,15 +90,15 @@ public abstract class _DeleteNullify extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(nullify);
+ out.writeObject(this.name);
+ out.writeObject(this.nullify);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- nullify = in.readObject();
+ this.name = (String)in.readObject();
+ this.nullify = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteRule.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteRule.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteRule.java
index 9ede774..0c1429b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteRule.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/deleterules/auto/_DeleteRule.java
@@ -41,7 +41,7 @@ public abstract class _DeleteRule extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void addToFromCascade(DeleteCascade obj) {
@@ -138,19 +138,19 @@ public abstract class _DeleteRule extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(fromCascade);
- out.writeObject(fromDeny);
- out.writeObject(fromNullify);
+ out.writeObject(this.name);
+ out.writeObject(this.fromCascade);
+ out.writeObject(this.fromDeny);
+ out.writeObject(this.fromNullify);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- fromCascade = in.readObject();
- fromDeny = in.readObject();
- fromNullify = in.readObject();
+ this.name = (String)in.readObject();
+ this.fromCascade = in.readObject();
+ this.fromDeny = in.readObject();
+ this.fromNullify = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java
index 272c4f0..2634b64 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/embeddable/auto/_EmbedEntity1.java
@@ -36,7 +36,7 @@ public abstract class _EmbedEntity1 extends BaseDataObject {
public Embeddable1 getEmbedded1() {
beforePropertyRead("embedded1");
- return embedded1;
+ return this.embedded1;
}
public void setEmbedded2(Embeddable1 embedded2) {
@@ -46,7 +46,7 @@ public abstract class _EmbedEntity1 extends BaseDataObject {
public Embeddable1 getEmbedded2() {
beforePropertyRead("embedded2");
- return embedded2;
+ return this.embedded2;
}
public void setName(String name) {
@@ -56,7 +56,7 @@ public abstract class _EmbedEntity1 extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
@Override
@@ -109,17 +109,17 @@ public abstract class _EmbedEntity1 extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(embedded1);
- out.writeObject(embedded2);
- out.writeObject(name);
+ out.writeObject(this.embedded1);
+ out.writeObject(this.embedded2);
+ out.writeObject(this.name);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- embedded1 = (Embeddable1)in.readObject();
- embedded2 = (Embeddable1)in.readObject();
- name = (String)in.readObject();
+ this.embedded1 = (Embeddable1)in.readObject();
+ this.embedded2 = (Embeddable1)in.readObject();
+ this.name = (String)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity.java
index 7b99a25..f8bd14f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/enum_test/auto/_EnumEntity.java
@@ -32,7 +32,7 @@ public abstract class _EnumEntity extends BaseDataObject {
public Enum1 getEnumAttribute() {
beforePropertyRead("enumAttribute");
- return enumAttribute;
+ return this.enumAttribute;
}
@Override
@@ -75,13 +75,13 @@ public abstract class _EnumEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(enumAttribute);
+ out.writeObject(this.enumAttribute);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- enumAttribute = (Enum1)in.readObject();
+ this.enumAttribute = (Enum1)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/extended_type/auto/_ExtendedTypeEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/extended_type/auto/_ExtendedTypeEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/extended_type/auto/_ExtendedTypeEntity.java
index 9f12732..a93919c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/extended_type/auto/_ExtendedTypeEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/extended_type/auto/_ExtendedTypeEntity.java
@@ -32,7 +32,7 @@ public abstract class _ExtendedTypeEntity extends BaseDataObject {
public StringET1 getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
@Override
@@ -75,13 +75,13 @@ public abstract class _ExtendedTypeEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
+ out.writeObject(this.name);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (StringET1)in.readObject();
+ this.name = (StringET1)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompKey.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompKey.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompKey.java
index 9eaad43..5c1aef0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompKey.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompKey.java
@@ -36,7 +36,7 @@ public abstract class _GeneratedColumnCompKey extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void setToMaster(GeneratedColumnCompMaster toMaster) {
@@ -92,15 +92,15 @@ public abstract class _GeneratedColumnCompKey extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(toMaster);
+ out.writeObject(this.name);
+ out.writeObject(this.toMaster);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- toMaster = in.readObject();
+ this.name = (String)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/generated/auto/_GeneratedColumnCompMaster.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompMaster.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompMaster.java
index f0bb5c8..4fea41e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompMaster.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnCompMaster.java
@@ -35,7 +35,7 @@ public abstract class _GeneratedColumnCompMaster extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void addToToDetail(GeneratedColumnCompKey obj) {
@@ -96,15 +96,15 @@ public abstract class _GeneratedColumnCompMaster extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(toDetail);
+ out.writeObject(this.name);
+ out.writeObject(this.toDetail);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- toDetail = in.readObject();
+ this.name = (String)in.readObject();
+ this.toDetail = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnDep.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnDep.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnDep.java
index fb8b70d..ee7850f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnDep.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnDep.java
@@ -34,7 +34,7 @@ public abstract class _GeneratedColumnDep extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void setToMaster(GeneratedColumnTestEntity toMaster) {
@@ -90,15 +90,15 @@ public abstract class _GeneratedColumnDep extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(toMaster);
+ out.writeObject(this.name);
+ out.writeObject(this.toMaster);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- toMaster = in.readObject();
+ this.name = (String)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/generated/auto/_GeneratedColumnTest2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTest2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTest2.java
index 10b1a1a..234e117 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTest2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTest2.java
@@ -31,7 +31,7 @@ public abstract class _GeneratedColumnTest2 extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
@Override
@@ -74,13 +74,13 @@ public abstract class _GeneratedColumnTest2 extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
+ out.writeObject(this.name);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
+ this.name = (String)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTestEntity.java
index 7888c4c..22afbcb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedColumnTestEntity.java
@@ -34,7 +34,7 @@ public abstract class _GeneratedColumnTestEntity extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void setToDep(GeneratedColumnDep toDep) {
@@ -90,15 +90,15 @@ public abstract class _GeneratedColumnTestEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(toDep);
+ out.writeObject(this.name);
+ out.writeObject(this.toDep);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- toDep = in.readObject();
+ this.name = (String)in.readObject();
+ this.toDep = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF1.java
index 1a80442..7992e7a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF1.java
@@ -79,13 +79,13 @@ public abstract class _GeneratedF1 extends CayenneDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(f2);
+ out.writeObject(this.f2);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- f2 = in.readObject();
+ this.f2 = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF2.java
index 0b33d82..bacfdbe 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/generated/auto/_GeneratedF2.java
@@ -79,13 +79,13 @@ public abstract class _GeneratedF2 extends CayenneDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(f1);
+ out.writeObject(this.f1);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- f1 = in.readObject();
+ this.f1 = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java
index 3bbedab..a70dd14 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java
@@ -37,7 +37,7 @@ public abstract class _BaseEntity extends BaseDataObject {
public String getEntityType() {
beforePropertyRead("entityType");
- return entityType;
+ return this.entityType;
}
public void setToDirectToSubEntity(DirectToSubEntity toDirectToSubEntity) {
@@ -106,17 +106,17 @@ public abstract class _BaseEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(entityType);
- out.writeObject(toDirectToSubEntity);
- out.writeObject(toRelatedEntity);
+ out.writeObject(this.entityType);
+ out.writeObject(this.toDirectToSubEntity);
+ out.writeObject(this.toRelatedEntity);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- entityType = (String)in.readObject();
- toDirectToSubEntity = in.readObject();
- toRelatedEntity = in.readObject();
+ this.entityType = (String)in.readObject();
+ this.toDirectToSubEntity = in.readObject();
+ this.toRelatedEntity = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java
index 999e686..1ba3c89 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java
@@ -79,13 +79,13 @@ public abstract class _DirectToSubEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(subEntities);
+ out.writeObject(this.subEntities);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- subEntities = in.readObject();
+ this.subEntities = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java
index 47f0dea..0d6788b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java
@@ -100,15 +100,15 @@ public abstract class _RelatedEntity extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(baseEntities);
- out.writeObject(subEntities);
+ out.writeObject(this.baseEntities);
+ out.writeObject(this.subEntities);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- baseEntities = in.readObject();
- subEntities = in.readObject();
+ this.baseEntities = in.readObject();
+ this.subEntities = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java
index 61a2296..72ce986 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Group.java
@@ -95,15 +95,15 @@ public abstract class _Group extends User {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(groupMembers);
- out.writeObject(groupProperties);
+ out.writeObject(this.groupMembers);
+ out.writeObject(this.groupProperties);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- groupMembers = in.readObject();
- groupProperties = in.readObject();
+ this.groupMembers = in.readObject();
+ this.groupProperties = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java
index 8542516..2d4eece 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_GroupProperties.java
@@ -36,7 +36,7 @@ public abstract class _GroupProperties extends BaseDataObject {
public String getDescription() {
beforePropertyRead("description");
- return description;
+ return this.description;
}
public void setId(Long id) {
@@ -46,7 +46,7 @@ public abstract class _GroupProperties extends BaseDataObject {
public Long getId() {
beforePropertyRead("id");
- return id;
+ return this.id;
}
public void setGroup(Group group) {
@@ -107,17 +107,17 @@ public abstract class _GroupProperties extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(description);
- out.writeObject(id);
- out.writeObject(group);
+ out.writeObject(this.description);
+ out.writeObject(this.id);
+ out.writeObject(this.group);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- description = (String)in.readObject();
- id = (Long)in.readObject();
- group = in.readObject();
+ this.description = (String)in.readObject();
+ this.id = (Long)in.readObject();
+ this.group = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java
index 772d63c..c973436 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_Role.java
@@ -39,7 +39,7 @@ public abstract class _Role extends BaseDataObject {
public long getId() {
beforePropertyRead("id");
- return id;
+ return this.id;
}
public void setName(String name) {
@@ -49,7 +49,7 @@ public abstract class _Role extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void setType(int type) {
@@ -59,7 +59,7 @@ public abstract class _Role extends BaseDataObject {
public int getType() {
beforePropertyRead("type");
- return type;
+ return this.type;
}
public void addToRoleGroups(Group obj) {
@@ -75,9 +75,9 @@ public abstract class _Role extends BaseDataObject {
return (List<Group>)readProperty("roleGroups");
}
-protected abstract void onPostPersist();
+ protected abstract void onPostPersist();
-protected abstract void onPostUpdate();
+ protected abstract void onPostUpdate();
@Override
public Object readPropertyDirectly(String propName) {
@@ -107,13 +107,13 @@ protected abstract void onPostUpdate();
switch (propName) {
case "id":
- this.id = (Long)val;
+ this.id = val == null ? 0 : (Long)val;
break;
case "name":
this.name = (String)val;
break;
case "type":
- this.type = (Integer)val;
+ this.type = val == null ? 0 : (Integer)val;
break;
case "roleGroups":
this.roleGroups = val;
@@ -134,19 +134,19 @@ protected abstract void onPostUpdate();
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeLong(id);
- out.writeObject(name);
- out.writeInt(type);
- out.writeObject(roleGroups);
+ out.writeLong(this.id);
+ out.writeObject(this.name);
+ out.writeInt(this.type);
+ out.writeObject(this.roleGroups);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- id = in.readLong();
- name = (String)in.readObject();
- type = in.readInt();
- roleGroups = in.readObject();
+ this.id = in.readLong();
+ this.name = (String)in.readObject();
+ this.type = in.readInt();
+ this.roleGroups = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java
index 6a0b8d2..94772b7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_User.java
@@ -73,13 +73,13 @@ public abstract class _User extends Role {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(userProperties);
+ out.writeObject(this.userProperties);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- userProperties = in.readObject();
+ this.userProperties = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java
index 61777ba..c1963bc 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_flat/auto/_UserProperties.java
@@ -36,7 +36,7 @@ public abstract class _UserProperties extends BaseDataObject {
public Long getId() {
beforePropertyRead("id");
- return id;
+ return this.id;
}
public void setNickname(String nickname) {
@@ -46,7 +46,7 @@ public abstract class _UserProperties extends BaseDataObject {
public String getNickname() {
beforePropertyRead("nickname");
- return nickname;
+ return this.nickname;
}
public void setUser(User user) {
@@ -107,17 +107,17 @@ public abstract class _UserProperties extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(id);
- out.writeObject(nickname);
- out.writeObject(user);
+ out.writeObject(this.id);
+ out.writeObject(this.nickname);
+ out.writeObject(this.user);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- id = (Long)in.readObject();
- nickname = (String)in.readObject();
- user = in.readObject();
+ this.id = (Long)in.readObject();
+ this.nickname = (String)in.readObject();
+ this.user = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_AbstractPerson.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_AbstractPerson.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_AbstractPerson.java
index e7dba28..01c4534 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_AbstractPerson.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_AbstractPerson.java
@@ -37,7 +37,7 @@ public abstract class _AbstractPerson extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void setPersonType(String personType) {
@@ -47,7 +47,7 @@ public abstract class _AbstractPerson extends BaseDataObject {
public String getPersonType() {
beforePropertyRead("personType");
- return personType;
+ return this.personType;
}
public void addToNotes(PersonNotes obj) {
@@ -113,17 +113,17 @@ public abstract class _AbstractPerson extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(personType);
- out.writeObject(notes);
+ out.writeObject(this.name);
+ out.writeObject(this.personType);
+ out.writeObject(this.notes);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- personType = (String)in.readObject();
- notes = in.readObject();
+ this.name = (String)in.readObject();
+ this.personType = (String)in.readObject();
+ this.notes = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Address.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Address.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Address.java
index a8e18db..a322e28 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Address.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Address.java
@@ -34,7 +34,7 @@ public abstract class _Address extends BaseDataObject {
public String getCity() {
beforePropertyRead("city");
- return city;
+ return this.city;
}
public void setToEmployee(Employee toEmployee) {
@@ -90,15 +90,15 @@ public abstract class _Address extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(city);
- out.writeObject(toEmployee);
+ out.writeObject(this.city);
+ out.writeObject(this.toEmployee);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- city = (String)in.readObject();
- toEmployee = in.readObject();
+ this.city = (String)in.readObject();
+ this.toEmployee = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_ClientCompany.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_ClientCompany.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_ClientCompany.java
index 856cfa9..ac6fee3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_ClientCompany.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_ClientCompany.java
@@ -35,7 +35,7 @@ public abstract class _ClientCompany extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void addToRepresentatives(CustomerRepresentative obj) {
@@ -96,15 +96,15 @@ public abstract class _ClientCompany extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(representatives);
+ out.writeObject(this.name);
+ out.writeObject(this.representatives);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- representatives = in.readObject();
+ this.name = (String)in.readObject();
+ this.representatives = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_CustomerRepresentative.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_CustomerRepresentative.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_CustomerRepresentative.java
index a2e0f3b..eb62f6d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_CustomerRepresentative.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_CustomerRepresentative.java
@@ -34,7 +34,7 @@ public abstract class _CustomerRepresentative extends AbstractPerson {
public String getClientContactType() {
beforePropertyRead("clientContactType");
- return clientContactType;
+ return this.clientContactType;
}
public void setToClientCompany(ClientCompany toClientCompany) {
@@ -90,15 +90,15 @@ public abstract class _CustomerRepresentative extends AbstractPerson {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(clientContactType);
- out.writeObject(toClientCompany);
+ out.writeObject(this.clientContactType);
+ out.writeObject(this.toClientCompany);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- clientContactType = (String)in.readObject();
- toClientCompany = in.readObject();
+ this.clientContactType = (String)in.readObject();
+ this.toClientCompany = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Department.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Department.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Department.java
index b379e04..4794ff3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Department.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Department.java
@@ -38,7 +38,7 @@ public abstract class _Department extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
public void addToEmployees(Employee obj) {
@@ -112,17 +112,17 @@ public abstract class _Department extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
- out.writeObject(employees);
- out.writeObject(toManager);
+ out.writeObject(this.name);
+ out.writeObject(this.employees);
+ out.writeObject(this.toManager);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
- employees = in.readObject();
- toManager = in.readObject();
+ this.name = (String)in.readObject();
+ this.employees = in.readObject();
+ this.toManager = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Employee.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Employee.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Employee.java
index 81c6d93..871a2bf 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Employee.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Employee.java
@@ -38,7 +38,7 @@ public abstract class _Employee extends AbstractPerson {
public Float getSalary() {
beforePropertyRead("salary");
- return salary;
+ return this.salary;
}
public void addToAddresses(Address obj) {
@@ -112,17 +112,17 @@ public abstract class _Employee extends AbstractPerson {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(salary);
- out.writeObject(addresses);
- out.writeObject(toDepartment);
+ out.writeObject(this.salary);
+ out.writeObject(this.addresses);
+ out.writeObject(this.toDepartment);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- salary = (Float)in.readObject();
- addresses = in.readObject();
- toDepartment = in.readObject();
+ this.salary = (Float)in.readObject();
+ this.addresses = in.readObject();
+ this.toDepartment = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Manager.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Manager.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Manager.java
index cad5dbf..e87f87a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Manager.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_Manager.java
@@ -79,13 +79,13 @@ public abstract class _Manager extends Employee {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(managedDepartments);
+ out.writeObject(this.managedDepartments);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- managedDepartments = in.readObject();
+ this.managedDepartments = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_PersonNotes.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_PersonNotes.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_PersonNotes.java
index 951773f..a4d02fe 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_PersonNotes.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_people/auto/_PersonNotes.java
@@ -34,7 +34,7 @@ public abstract class _PersonNotes extends BaseDataObject {
public String getNotes() {
beforePropertyRead("notes");
- return notes;
+ return this.notes;
}
public void setPerson(AbstractPerson person) {
@@ -90,15 +90,15 @@ public abstract class _PersonNotes extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(notes);
- out.writeObject(person);
+ out.writeObject(this.notes);
+ out.writeObject(this.person);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- notes = (String)in.readObject();
- person = in.readObject();
+ this.notes = (String)in.readObject();
+ this.person = in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv1Root.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv1Root.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv1Root.java
index 9a2c384..49ead06 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv1Root.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv1Root.java
@@ -33,7 +33,7 @@ public abstract class _Iv1Root extends BaseDataObject {
public String getDiscriminator() {
beforePropertyRead("discriminator");
- return discriminator;
+ return this.discriminator;
}
public void setName(String name) {
@@ -43,7 +43,7 @@ public abstract class _Iv1Root extends BaseDataObject {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
@Override
@@ -91,15 +91,15 @@ public abstract class _Iv1Root extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(discriminator);
- out.writeObject(name);
+ out.writeObject(this.discriminator);
+ out.writeObject(this.name);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- discriminator = (String)in.readObject();
- name = (String)in.readObject();
+ this.discriminator = (String)in.readObject();
+ this.name = (String)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv1Sub1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv1Sub1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv1Sub1.java
index 9087579..d4e86e9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv1Sub1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv1Sub1.java
@@ -31,7 +31,7 @@ public abstract class _Iv1Sub1 extends Iv1Root {
public String getName() {
beforePropertyRead("name");
- return name;
+ return this.name;
}
@Override
@@ -74,13 +74,13 @@ public abstract class _Iv1Sub1 extends Iv1Root {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(name);
+ out.writeObject(this.name);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- name = (String)in.readObject();
+ this.name = (String)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv2Root.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv2Root.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv2Root.java
index 84434f5..824b3c7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv2Root.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv2Root.java
@@ -31,7 +31,7 @@ public abstract class _Iv2Root extends BaseDataObject {
public String getDiscriminator() {
beforePropertyRead("discriminator");
- return discriminator;
+ return this.discriminator;
}
@Override
@@ -74,13 +74,13 @@ public abstract class _Iv2Root extends BaseDataObject {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(discriminator);
+ out.writeObject(this.discriminator);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- discriminator = (String)in.readObject();
+ this.discriminator = (String)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv2Sub1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv2Sub1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv2Sub1.java
index 7fccf6c..a689f84 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv2Sub1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_Iv2Sub1.java
@@ -73,13 +73,13 @@ public abstract class _Iv2Sub1 extends Iv2Root {
@Override
protected void writeState(ObjectOutputStream out) throws IOException {
super.writeState(out);
- out.writeObject(x);
+ out.writeObject(this.x);
}
@Override
protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
super.readState(in);
- x = in.readObject();
+ this.x = in.readObject();
}
}