http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified1.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified1.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified1.java
index 546921d..0ac76c6 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified1.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified1.java
@@ -37,7 +37,7 @@ public abstract class _Qualified1 extends BaseDataObject {
 
     public Boolean getDeleted() {
         beforePropertyRead("deleted");
-        return deleted;
+        return this.deleted;
     }
 
     public void setName(String name) {
@@ -47,7 +47,7 @@ public abstract class _Qualified1 extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToQualified2s(Qualified2 obj) {
@@ -113,17 +113,17 @@ public abstract class _Qualified1 extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(deleted);
-        out.writeObject(name);
-        out.writeObject(qualified2s);
+        out.writeObject(this.deleted);
+        out.writeObject(this.name);
+        out.writeObject(this.qualified2s);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        deleted = (Boolean)in.readObject();
-        name = (String)in.readObject();
-        qualified2s = in.readObject();
+        this.deleted = (Boolean)in.readObject();
+        this.name = (String)in.readObject();
+        this.qualified2s = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified2.java
index fd82379..77b772d 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified2.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/qualified/auto/_Qualified2.java
@@ -36,7 +36,7 @@ public abstract class _Qualified2 extends BaseDataObject {
 
     public Boolean getDeleted() {
         beforePropertyRead("deleted");
-        return deleted;
+        return this.deleted;
     }
 
     public void setName(String name) {
@@ -46,7 +46,7 @@ public abstract class _Qualified2 extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void setQualified1(Qualified1 qualified1) {
@@ -107,17 +107,17 @@ public abstract class _Qualified2 extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(deleted);
-        out.writeObject(name);
-        out.writeObject(qualified1);
+        out.writeObject(this.deleted);
+        out.writeObject(this.name);
+        out.writeObject(this.qualified1);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        deleted = (Boolean)in.readObject();
-        name = (String)in.readObject();
-        qualified1 = in.readObject();
+        this.deleted = (Boolean)in.readObject();
+        this.name = (String)in.readObject();
+        this.qualified1 = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java
index cba1592..2ee2364 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_QuoteAdress.java
@@ -36,7 +36,7 @@ public abstract class _QuoteAdress extends BaseDataObject {
 
     public String getCity() {
         beforePropertyRead("city");
-        return city;
+        return this.city;
     }
 
     public void setGroup(String group) {
@@ -46,7 +46,7 @@ public abstract class _QuoteAdress extends BaseDataObject {
 
     public String getGroup() {
         beforePropertyRead("group");
-        return group;
+        return this.group;
     }
 
     public void setPerson_Rel(Quote_Person person_Rel) {
@@ -107,17 +107,17 @@ public abstract class _QuoteAdress extends BaseDataObject 
{
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(city);
-        out.writeObject(group);
-        out.writeObject(person_Rel);
+        out.writeObject(this.city);
+        out.writeObject(this.group);
+        out.writeObject(this.person_Rel);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        city = (String)in.readObject();
-        group = (String)in.readObject();
-        person_Rel = in.readObject();
+        this.city = (String)in.readObject();
+        this.group = (String)in.readObject();
+        this.person_Rel = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java
index 0f32540..3fe42e0 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/quotemap/auto/_Quote_Person.java
@@ -43,7 +43,7 @@ public abstract class _Quote_Person extends BaseDataObject {
 
     public Date getDAte() {
         beforePropertyRead("dAte");
-        return dAte;
+        return this.dAte;
     }
 
     public void setFULL_name(String fULL_name) {
@@ -53,7 +53,7 @@ public abstract class _Quote_Person extends BaseDataObject {
 
     public String getFULL_name() {
         beforePropertyRead("fULL_name");
-        return fULL_name;
+        return this.fULL_name;
     }
 
     public void setGroup(String group) {
@@ -63,7 +63,7 @@ public abstract class _Quote_Person extends BaseDataObject {
 
     public String getGroup() {
         beforePropertyRead("group");
-        return group;
+        return this.group;
     }
 
     public void setName(String name) {
@@ -73,7 +73,7 @@ public abstract class _Quote_Person extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void setSalary(Integer salary) {
@@ -83,7 +83,7 @@ public abstract class _Quote_Person extends BaseDataObject {
 
     public Integer getSalary() {
         beforePropertyRead("salary");
-        return salary;
+        return this.salary;
     }
 
     public void setAddress_Rel(QuoteAdress address_Rel) {
@@ -159,23 +159,23 @@ public abstract class _Quote_Person extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(dAte);
-        out.writeObject(fULL_name);
-        out.writeObject(group);
-        out.writeObject(name);
-        out.writeObject(salary);
-        out.writeObject(address_Rel);
+        out.writeObject(this.dAte);
+        out.writeObject(this.fULL_name);
+        out.writeObject(this.group);
+        out.writeObject(this.name);
+        out.writeObject(this.salary);
+        out.writeObject(this.address_Rel);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        dAte = (Date)in.readObject();
-        fULL_name = (String)in.readObject();
-        group = (String)in.readObject();
-        name = (String)in.readObject();
-        salary = (Integer)in.readObject();
-        address_Rel = in.readObject();
+        this.dAte = (Date)in.readObject();
+        this.fULL_name = (String)in.readObject();
+        this.group = (String)in.readObject();
+        this.name = (String)in.readObject();
+        this.salary = (Integer)in.readObject();
+        this.address_Rel = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/reflexive/auto/_Reflexive.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/reflexive/auto/_Reflexive.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/reflexive/auto/_Reflexive.java
index 9a4238d..81a85a0 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/reflexive/auto/_Reflexive.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/reflexive/auto/_Reflexive.java
@@ -37,7 +37,7 @@ public abstract class _Reflexive extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToChildren(Reflexive obj) {
@@ -111,17 +111,17 @@ public abstract class _Reflexive extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(children);
-        out.writeObject(toParent);
+        out.writeObject(this.name);
+        out.writeObject(this.children);
+        out.writeObject(this.toParent);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        children = in.readObject();
-        toParent = in.readObject();
+        this.name = (String)in.readObject();
+        this.children = in.readObject();
+        this.toParent = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_FkOfDifferentType.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_FkOfDifferentType.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_FkOfDifferentType.java
index 33129d9..a7a7ebf 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_FkOfDifferentType.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_FkOfDifferentType.java
@@ -73,13 +73,13 @@ public abstract class _FkOfDifferentType extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(relationshipHelper);
+        out.writeObject(this.relationshipHelper);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        relationshipHelper = in.readObject();
+        this.relationshipHelper = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_MeaningfulFK.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_MeaningfulFK.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_MeaningfulFK.java
index 37b13c0..a14eece 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_MeaningfulFK.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_MeaningfulFK.java
@@ -34,7 +34,7 @@ public abstract class _MeaningfulFK extends BaseDataObject {
 
     public Integer getRelationshipHelperID() {
         beforePropertyRead("relationshipHelperID");
-        return relationshipHelperID;
+        return this.relationshipHelperID;
     }
 
     public void setToRelationshipHelper(RelationshipHelper 
toRelationshipHelper) {
@@ -90,15 +90,15 @@ public abstract class _MeaningfulFK extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(relationshipHelperID);
-        out.writeObject(toRelationshipHelper);
+        out.writeObject(this.relationshipHelperID);
+        out.writeObject(this.toRelationshipHelper);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        relationshipHelperID = (Integer)in.readObject();
-        toRelationshipHelper = in.readObject();
+        this.relationshipHelperID = (Integer)in.readObject();
+        this.toRelationshipHelper = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_ReflexiveAndToOne.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_ReflexiveAndToOne.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_ReflexiveAndToOne.java
index 3666855..750527f 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_ReflexiveAndToOne.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_ReflexiveAndToOne.java
@@ -40,7 +40,7 @@ public abstract class _ReflexiveAndToOne extends 
BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToChildren(ReflexiveAndToOne obj) {
@@ -127,19 +127,19 @@ public abstract class _ReflexiveAndToOne extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(children);
-        out.writeObject(toHelper);
-        out.writeObject(toParent);
+        out.writeObject(this.name);
+        out.writeObject(this.children);
+        out.writeObject(this.toHelper);
+        out.writeObject(this.toParent);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        children = in.readObject();
-        toHelper = in.readObject();
-        toParent = in.readObject();
+        this.name = (String)in.readObject();
+        this.children = in.readObject();
+        this.toHelper = in.readObject();
+        this.toParent = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_RelationshipHelper.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_RelationshipHelper.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_RelationshipHelper.java
index b36d04d..2e2d51c 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_RelationshipHelper.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/auto/_RelationshipHelper.java
@@ -41,7 +41,7 @@ public abstract class _RelationshipHelper extends 
BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToFksOfDifferentType(FkOfDifferentType obj) {
@@ -138,19 +138,19 @@ public abstract class _RelationshipHelper extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(fksOfDifferentType);
-        out.writeObject(meanigfulFKs);
-        out.writeObject(reflexiveAndToOneArray);
+        out.writeObject(this.name);
+        out.writeObject(this.fksOfDifferentType);
+        out.writeObject(this.meanigfulFKs);
+        out.writeObject(this.reflexiveAndToOneArray);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        fksOfDifferentType = in.readObject();
-        meanigfulFKs = in.readObject();
-        reflexiveAndToOneArray = in.readObject();
+        this.name = (String)in.readObject();
+        this.fksOfDifferentType = in.readObject();
+        this.meanigfulFKs = in.readObject();
+        this.reflexiveAndToOneArray = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/auto/_Activity.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/auto/_Activity.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/auto/_Activity.java
index 1dbdc84..da9ad3f 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/auto/_Activity.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/auto/_Activity.java
@@ -38,7 +38,7 @@ public abstract class _Activity extends BaseDataObject {
 
     public Date getAppointmentDate() {
         beforePropertyRead("appointmentDate");
-        return appointmentDate;
+        return this.appointmentDate;
     }
 
     public void setAppointmentNo(int appointmentNo) {
@@ -48,7 +48,7 @@ public abstract class _Activity extends BaseDataObject {
 
     public int getAppointmentNo() {
         beforePropertyRead("appointmentNo");
-        return appointmentNo;
+        return this.appointmentNo;
     }
 
     public void addToResults(ActivityResult obj) {
@@ -93,7 +93,7 @@ public abstract class _Activity extends BaseDataObject {
                 this.appointmentDate = (Date)val;
                 break;
             case "appointmentNo":
-                this.appointmentNo = (Integer)val;
+                this.appointmentNo = val == null ? 0 : (Integer)val;
                 break;
             case "results":
                 this.results = val;
@@ -114,17 +114,17 @@ public abstract class _Activity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(appointmentDate);
-        out.writeInt(appointmentNo);
-        out.writeObject(results);
+        out.writeObject(this.appointmentDate);
+        out.writeInt(this.appointmentNo);
+        out.writeObject(this.results);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        appointmentDate = (Date)in.readObject();
-        appointmentNo = in.readInt();
-        results = in.readObject();
+        this.appointmentDate = (Date)in.readObject();
+        this.appointmentNo = in.readInt();
+        this.results = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/auto/_ActivityResult.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/auto/_ActivityResult.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/auto/_ActivityResult.java
index c713e8f..cd5fb62 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/auto/_ActivityResult.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_activity/auto/_ActivityResult.java
@@ -38,7 +38,7 @@ public abstract class _ActivityResult extends BaseDataObject {
 
     public Date getAppointDate() {
         beforePropertyRead("appointDate");
-        return appointDate;
+        return this.appointDate;
     }
 
     public void setAppointNo(int appointNo) {
@@ -48,7 +48,7 @@ public abstract class _ActivityResult extends BaseDataObject {
 
     public int getAppointNo() {
         beforePropertyRead("appointNo");
-        return appointNo;
+        return this.appointNo;
     }
 
     public void setField(String field) {
@@ -58,7 +58,7 @@ public abstract class _ActivityResult extends BaseDataObject {
 
     public String getField() {
         beforePropertyRead("field");
-        return field;
+        return this.field;
     }
 
     @Override
@@ -90,7 +90,7 @@ public abstract class _ActivityResult extends BaseDataObject {
                 this.appointDate = (Date)val;
                 break;
             case "appointNo":
-                this.appointNo = (Integer)val;
+                this.appointNo = val == null ? 0 : (Integer)val;
                 break;
             case "field":
                 this.field = (String)val;
@@ -111,17 +111,17 @@ public abstract class _ActivityResult extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(appointDate);
-        out.writeInt(appointNo);
-        out.writeObject(field);
+        out.writeObject(this.appointDate);
+        out.writeInt(this.appointNo);
+        out.writeObject(this.field);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        appointDate = (Date)in.readObject();
-        appointNo = in.readInt();
-        field = (String)in.readObject();
+        this.appointDate = (Date)in.readObject();
+        this.appointNo = in.readInt();
+        this.field = (String)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_child_master/auto/_Child.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_child_master/auto/_Child.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_child_master/auto/_Child.java
index 6c0c80d..fd3be7d 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_child_master/auto/_Child.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_child_master/auto/_Child.java
@@ -73,13 +73,13 @@ public abstract class _Child extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(master);
+        out.writeObject(this.master);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        master = in.readObject();
+        this.master = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_child_master/auto/_Master.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_child_master/auto/_Master.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_child_master/auto/_Master.java
index fb90e0b..fc412bd 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_child_master/auto/_Master.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_child_master/auto/_Master.java
@@ -35,7 +35,7 @@ public abstract class _Master extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToChildren(Child obj) {
@@ -96,15 +96,15 @@ public abstract class _Master extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(children);
+        out.writeObject(this.name);
+        out.writeObject(this.children);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        children = in.readObject();
+        this.name = (String)in.readObject();
+        this.children = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_clob/auto/_ClobDetail.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_clob/auto/_ClobDetail.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_clob/auto/_ClobDetail.java
index 3f455bb..7f3efed 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_clob/auto/_ClobDetail.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_clob/auto/_ClobDetail.java
@@ -34,7 +34,7 @@ public abstract class _ClobDetail extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void setMaster(ClobMaster master) {
@@ -90,15 +90,15 @@ public abstract class _ClobDetail extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(master);
+        out.writeObject(this.name);
+        out.writeObject(this.master);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        master = in.readObject();
+        this.name = (String)in.readObject();
+        this.master = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_clob/auto/_ClobMaster.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_clob/auto/_ClobMaster.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_clob/auto/_ClobMaster.java
index d88ad8f..d970afe 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_clob/auto/_ClobMaster.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_clob/auto/_ClobMaster.java
@@ -37,7 +37,7 @@ public abstract class _ClobMaster extends BaseDataObject {
 
     public String getClobColumn() {
         beforePropertyRead("clobColumn");
-        return clobColumn;
+        return this.clobColumn;
     }
 
     public void setName(String name) {
@@ -47,7 +47,7 @@ public abstract class _ClobMaster extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToDetails(ClobDetail obj) {
@@ -113,17 +113,17 @@ public abstract class _ClobMaster extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(clobColumn);
-        out.writeObject(name);
-        out.writeObject(details);
+        out.writeObject(this.clobColumn);
+        out.writeObject(this.name);
+        out.writeObject(this.details);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        clobColumn = (String)in.readObject();
-        name = (String)in.readObject();
-        details = in.readObject();
+        this.clobColumn = (String)in.readObject();
+        this.name = (String)in.readObject();
+        this.details = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_collection_to_many/auto/_CollectionToMany.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_collection_to_many/auto/_CollectionToMany.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_collection_to_many/auto/_CollectionToMany.java
index c771d5e..6543da7 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_collection_to_many/auto/_CollectionToMany.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_collection_to_many/auto/_CollectionToMany.java
@@ -79,13 +79,13 @@ public abstract class _CollectionToMany extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(targets);
+        out.writeObject(this.targets);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        targets = in.readObject();
+        this.targets = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_collection_to_many/auto/_CollectionToManyTarget.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_collection_to_many/auto/_CollectionToManyTarget.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_collection_to_many/auto/_CollectionToManyTarget.java
index 6ed5354..653d9d2 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_collection_to_many/auto/_CollectionToManyTarget.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_collection_to_many/auto/_CollectionToManyTarget.java
@@ -73,13 +73,13 @@ public abstract class _CollectionToManyTarget extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(collectionToMany);
+        out.writeObject(this.collectionToMany);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        collectionToMany = in.readObject();
+        this.collectionToMany = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleFlatA.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleFlatA.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleFlatA.java
index c9d5139..7d986f3 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleFlatA.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleFlatA.java
@@ -79,13 +79,13 @@ public abstract class _DeleteRuleFlatA extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(flatB);
+        out.writeObject(this.flatB);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        flatB = in.readObject();
+        this.flatB = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleFlatB.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleFlatB.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleFlatB.java
index da50775..2df6405 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleFlatB.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleFlatB.java
@@ -79,13 +79,13 @@ public abstract class _DeleteRuleFlatB extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(untitledRel);
+        out.writeObject(this.untitledRel);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        untitledRel = in.readObject();
+        this.untitledRel = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest1.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest1.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest1.java
index 6bd477f..150a973 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest1.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest1.java
@@ -73,13 +73,13 @@ public abstract class _DeleteRuleTest1 extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(test2);
+        out.writeObject(this.test2);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        test2 = in.readObject();
+        this.test2 = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest2.java
index 1a88c8e..12f0254 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest2.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest2.java
@@ -100,15 +100,15 @@ public abstract class _DeleteRuleTest2 extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(deleteRuleTest3Array);
-        out.writeObject(test1Array);
+        out.writeObject(this.deleteRuleTest3Array);
+        out.writeObject(this.test1Array);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        deleteRuleTest3Array = in.readObject();
-        test1Array = in.readObject();
+        this.deleteRuleTest3Array = in.readObject();
+        this.test1Array = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest3.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest3.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest3.java
index a908ca4..1cd806d 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest3.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_delete_rules/auto/_DeleteRuleTest3.java
@@ -73,13 +73,13 @@ public abstract class _DeleteRuleTest3 extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(toDeleteRuleTest2);
+        out.writeObject(this.toDeleteRuleTest2);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        toDeleteRuleTest2 = in.readObject();
+        this.toDeleteRuleTest2 = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedCircular.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedCircular.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedCircular.java
index 23b387e..a62f528 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedCircular.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedCircular.java
@@ -99,15 +99,15 @@ public abstract class _FlattenedCircular extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(side1s);
-        out.writeObject(side2s);
+        out.writeObject(this.side1s);
+        out.writeObject(this.side2s);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        side1s = in.readObject();
-        side2s = in.readObject();
+        this.side1s = in.readObject();
+        this.side2s = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest1.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest1.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest1.java
index a60aff7..1cde2b6 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest1.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest1.java
@@ -46,7 +46,7 @@ public abstract class _FlattenedTest1 extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToFt2Array(FlattenedTest2 obj) {
@@ -163,23 +163,23 @@ public abstract class _FlattenedTest1 extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(ft2Array);
-        out.writeObject(ft3Array);
-        out.writeObject(ft3OverComplex);
-        out.writeObject(ft4ArrayFor1);
-        out.writeObject(ft5Array);
+        out.writeObject(this.name);
+        out.writeObject(this.ft2Array);
+        out.writeObject(this.ft3Array);
+        out.writeObject(this.ft3OverComplex);
+        out.writeObject(this.ft4ArrayFor1);
+        out.writeObject(this.ft5Array);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        ft2Array = in.readObject();
-        ft3Array = in.readObject();
-        ft3OverComplex = in.readObject();
-        ft4ArrayFor1 = in.readObject();
-        ft5Array = in.readObject();
+        this.name = (String)in.readObject();
+        this.ft2Array = in.readObject();
+        this.ft3Array = in.readObject();
+        this.ft3OverComplex = in.readObject();
+        this.ft4ArrayFor1 = in.readObject();
+        this.ft5Array = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest2.java
index 5cee2ab..ed8921c 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest2.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest2.java
@@ -38,7 +38,7 @@ public abstract class _FlattenedTest2 extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToFt3Array(FlattenedTest3 obj) {
@@ -112,17 +112,17 @@ public abstract class _FlattenedTest2 extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(ft3Array);
-        out.writeObject(toFT1);
+        out.writeObject(this.name);
+        out.writeObject(this.ft3Array);
+        out.writeObject(this.toFT1);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        ft3Array = in.readObject();
-        toFT1 = in.readObject();
+        this.name = (String)in.readObject();
+        this.ft3Array = in.readObject();
+        this.toFT1 = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest3.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest3.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest3.java
index ce4fb5c..1de97ac 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest3.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest3.java
@@ -41,7 +41,7 @@ public abstract class _FlattenedTest3 extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToFt4Array(FlattenedTest4 obj) {
@@ -124,19 +124,19 @@ public abstract class _FlattenedTest3 extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(ft4Array);
-        out.writeObject(toFT1);
-        out.writeObject(toFT2);
+        out.writeObject(this.name);
+        out.writeObject(this.ft4Array);
+        out.writeObject(this.toFT1);
+        out.writeObject(this.toFT2);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        ft4Array = in.readObject();
-        toFT1 = in.readObject();
-        toFT2 = in.readObject();
+        this.name = (String)in.readObject();
+        this.ft4Array = in.readObject();
+        this.toFT1 = in.readObject();
+        this.toFT2 = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest4.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest4.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest4.java
index 725f2b5..7bf8825 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest4.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest4.java
@@ -34,7 +34,7 @@ public abstract class _FlattenedTest4 extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void setToFT3(FlattenedTest3 toFT3) {
@@ -90,15 +90,15 @@ public abstract class _FlattenedTest4 extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(toFT3);
+        out.writeObject(this.name);
+        out.writeObject(this.toFT3);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        toFT3 = in.readObject();
+        this.name = (String)in.readObject();
+        this.toFT3 = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest5.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest5.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest5.java
index e6112ab..74f8328 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest5.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_flattened/auto/_FlattenedTest5.java
@@ -34,7 +34,7 @@ public abstract class _FlattenedTest5 extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void setToFT1(FlattenedTest1 toFT1) {
@@ -90,15 +90,15 @@ public abstract class _FlattenedTest5 extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(toFT1);
+        out.writeObject(this.name);
+        out.writeObject(this.toFT1);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        toFT1 = in.readObject();
+        this.name = (String)in.readObject();
+        this.toFT1 = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_set_to_many/auto/_SetToMany.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_set_to_many/auto/_SetToMany.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_set_to_many/auto/_SetToMany.java
index 07ba3e7..d17f891 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_set_to_many/auto/_SetToMany.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_set_to_many/auto/_SetToMany.java
@@ -79,13 +79,13 @@ public abstract class _SetToMany extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(targets);
+        out.writeObject(this.targets);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        targets = in.readObject();
+        this.targets = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_set_to_many/auto/_SetToManyTarget.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_set_to_many/auto/_SetToManyTarget.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_set_to_many/auto/_SetToManyTarget.java
index dd0d5ca..59b149b 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_set_to_many/auto/_SetToManyTarget.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_set_to_many/auto/_SetToManyTarget.java
@@ -73,13 +73,13 @@ public abstract class _SetToManyTarget extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(setToMany);
+        out.writeObject(this.setToMany);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        setToMany = in.readObject();
+        this.setToMany = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyFkDep.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyFkDep.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyFkDep.java
index 25c3d34..45fe97f 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyFkDep.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyFkDep.java
@@ -40,7 +40,7 @@ public abstract class _ToManyFkDep extends BaseDataObject {
 
     public Integer getDepId() {
         beforePropertyRead("depId");
-        return depId;
+        return this.depId;
     }
 
     public void setName(String name) {
@@ -50,7 +50,7 @@ public abstract class _ToManyFkDep extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void setRoot(ToManyFkRoot root) {
@@ -124,19 +124,19 @@ public abstract class _ToManyFkDep extends BaseDataObject 
{
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(depId);
-        out.writeObject(name);
-        out.writeObject(root);
-        out.writeObject(root2);
+        out.writeObject(this.depId);
+        out.writeObject(this.name);
+        out.writeObject(this.root);
+        out.writeObject(this.root2);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        depId = (Integer)in.readObject();
-        name = (String)in.readObject();
-        root = in.readObject();
-        root2 = in.readObject();
+        this.depId = (Integer)in.readObject();
+        this.name = (String)in.readObject();
+        this.root = in.readObject();
+        this.root2 = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyFkRoot.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyFkRoot.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyFkRoot.java
index 496de77..aa0157b 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyFkRoot.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyFkRoot.java
@@ -37,7 +37,7 @@ public abstract class _ToManyFkRoot extends BaseDataObject {
 
     public Integer getDepId() {
         beforePropertyRead("depId");
-        return depId;
+        return this.depId;
     }
 
     public void setName(String name) {
@@ -47,7 +47,7 @@ public abstract class _ToManyFkRoot extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToDeps(ToManyFkDep obj) {
@@ -113,17 +113,17 @@ public abstract class _ToManyFkRoot extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(depId);
-        out.writeObject(name);
-        out.writeObject(deps);
+        out.writeObject(this.depId);
+        out.writeObject(this.name);
+        out.writeObject(this.deps);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        depId = (Integer)in.readObject();
-        name = (String)in.readObject();
-        deps = in.readObject();
+        this.depId = (Integer)in.readObject();
+        this.name = (String)in.readObject();
+        this.deps = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyRoot2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyRoot2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyRoot2.java
index 27bebd2..b950ef2 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyRoot2.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_many_fk/auto/_ToManyRoot2.java
@@ -35,7 +35,7 @@ public abstract class _ToManyRoot2 extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToDeps(ToManyFkDep obj) {
@@ -96,15 +96,15 @@ public abstract class _ToManyRoot2 extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(deps);
+        out.writeObject(this.name);
+        out.writeObject(this.deps);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        deps = in.readObject();
+        this.name = (String)in.readObject();
+        this.deps = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_one_fk/auto/_ToOneFK1.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_one_fk/auto/_ToOneFK1.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_one_fk/auto/_ToOneFK1.java
index 3e911ce..5929024 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_one_fk/auto/_ToOneFK1.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_one_fk/auto/_ToOneFK1.java
@@ -73,13 +73,13 @@ public abstract class _ToOneFK1 extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(toPK);
+        out.writeObject(this.toPK);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        toPK = in.readObject();
+        this.toPK = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_one_fk/auto/_ToOneFK2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_one_fk/auto/_ToOneFK2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_one_fk/auto/_ToOneFK2.java
index 1ae24c7..1e98f78 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_one_fk/auto/_ToOneFK2.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships_to_one_fk/auto/_ToOneFK2.java
@@ -73,13 +73,13 @@ public abstract class _ToOneFK2 extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(toOneToFK);
+        out.writeObject(this.toOneToFK);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        toOneToFK = in.readObject();
+        this.toOneToFK = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMap1.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMap1.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMap1.java
index fc1de31..f100857 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMap1.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMap1.java
@@ -71,7 +71,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Long getBigintColumn() {
         beforePropertyRead("bigintColumn");
-        return bigintColumn;
+        return this.bigintColumn;
     }
 
     public void setBitColumn(Boolean bitColumn) {
@@ -81,7 +81,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Boolean getBitColumn() {
         beforePropertyRead("bitColumn");
-        return bitColumn;
+        return this.bitColumn;
     }
 
     public void setBooleanColumn(Boolean booleanColumn) {
@@ -91,7 +91,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Boolean getBooleanColumn() {
         beforePropertyRead("booleanColumn");
-        return booleanColumn;
+        return this.booleanColumn;
     }
 
     public void setCharColumn(String charColumn) {
@@ -101,7 +101,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public String getCharColumn() {
         beforePropertyRead("charColumn");
-        return charColumn;
+        return this.charColumn;
     }
 
     public void setDateColumn(Date dateColumn) {
@@ -111,7 +111,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Date getDateColumn() {
         beforePropertyRead("dateColumn");
-        return dateColumn;
+        return this.dateColumn;
     }
 
     public void setDecimalColumn(BigDecimal decimalColumn) {
@@ -121,7 +121,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public BigDecimal getDecimalColumn() {
         beforePropertyRead("decimalColumn");
-        return decimalColumn;
+        return this.decimalColumn;
     }
 
     public void setDoubleColumn(Double doubleColumn) {
@@ -131,7 +131,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Double getDoubleColumn() {
         beforePropertyRead("doubleColumn");
-        return doubleColumn;
+        return this.doubleColumn;
     }
 
     public void setFloatColumn(Float floatColumn) {
@@ -141,7 +141,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Float getFloatColumn() {
         beforePropertyRead("floatColumn");
-        return floatColumn;
+        return this.floatColumn;
     }
 
     public void setIntegerColumn(Integer integerColumn) {
@@ -151,7 +151,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Integer getIntegerColumn() {
         beforePropertyRead("integerColumn");
-        return integerColumn;
+        return this.integerColumn;
     }
 
     public void setLongnvarcharColumn(String longnvarcharColumn) {
@@ -161,7 +161,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public String getLongnvarcharColumn() {
         beforePropertyRead("longnvarcharColumn");
-        return longnvarcharColumn;
+        return this.longnvarcharColumn;
     }
 
     public void setLongvarcharColumn(String longvarcharColumn) {
@@ -171,7 +171,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public String getLongvarcharColumn() {
         beforePropertyRead("longvarcharColumn");
-        return longvarcharColumn;
+        return this.longvarcharColumn;
     }
 
     public void setNcharColumn(String ncharColumn) {
@@ -181,7 +181,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public String getNcharColumn() {
         beforePropertyRead("ncharColumn");
-        return ncharColumn;
+        return this.ncharColumn;
     }
 
     public void setNumericColumn(BigDecimal numericColumn) {
@@ -191,7 +191,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public BigDecimal getNumericColumn() {
         beforePropertyRead("numericColumn");
-        return numericColumn;
+        return this.numericColumn;
     }
 
     public void setNvarcharColumn(String nvarcharColumn) {
@@ -201,7 +201,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public String getNvarcharColumn() {
         beforePropertyRead("nvarcharColumn");
-        return nvarcharColumn;
+        return this.nvarcharColumn;
     }
 
     public void setRealColumn(Float realColumn) {
@@ -211,7 +211,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Float getRealColumn() {
         beforePropertyRead("realColumn");
-        return realColumn;
+        return this.realColumn;
     }
 
     public void setSmallintColumn(Short smallintColumn) {
@@ -221,7 +221,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Short getSmallintColumn() {
         beforePropertyRead("smallintColumn");
-        return smallintColumn;
+        return this.smallintColumn;
     }
 
     public void setTimeColumn(Date timeColumn) {
@@ -231,7 +231,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Date getTimeColumn() {
         beforePropertyRead("timeColumn");
-        return timeColumn;
+        return this.timeColumn;
     }
 
     public void setTimestampColumn(Date timestampColumn) {
@@ -241,7 +241,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Date getTimestampColumn() {
         beforePropertyRead("timestampColumn");
-        return timestampColumn;
+        return this.timestampColumn;
     }
 
     public void setTinyintColumn(Byte tinyintColumn) {
@@ -251,7 +251,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public Byte getTinyintColumn() {
         beforePropertyRead("tinyintColumn");
-        return tinyintColumn;
+        return this.tinyintColumn;
     }
 
     public void setVarcharColumn(String varcharColumn) {
@@ -261,7 +261,7 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
 
     public String getVarcharColumn() {
         beforePropertyRead("varcharColumn");
-        return varcharColumn;
+        return this.varcharColumn;
     }
 
     @Override
@@ -399,51 +399,51 @@ public abstract class _ReturnTypesMap1 extends 
CayenneDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(bigintColumn);
-        out.writeObject(bitColumn);
-        out.writeObject(booleanColumn);
-        out.writeObject(charColumn);
-        out.writeObject(dateColumn);
-        out.writeObject(decimalColumn);
-        out.writeObject(doubleColumn);
-        out.writeObject(floatColumn);
-        out.writeObject(integerColumn);
-        out.writeObject(longnvarcharColumn);
-        out.writeObject(longvarcharColumn);
-        out.writeObject(ncharColumn);
-        out.writeObject(numericColumn);
-        out.writeObject(nvarcharColumn);
-        out.writeObject(realColumn);
-        out.writeObject(smallintColumn);
-        out.writeObject(timeColumn);
-        out.writeObject(timestampColumn);
-        out.writeObject(tinyintColumn);
-        out.writeObject(varcharColumn);
+        out.writeObject(this.bigintColumn);
+        out.writeObject(this.bitColumn);
+        out.writeObject(this.booleanColumn);
+        out.writeObject(this.charColumn);
+        out.writeObject(this.dateColumn);
+        out.writeObject(this.decimalColumn);
+        out.writeObject(this.doubleColumn);
+        out.writeObject(this.floatColumn);
+        out.writeObject(this.integerColumn);
+        out.writeObject(this.longnvarcharColumn);
+        out.writeObject(this.longvarcharColumn);
+        out.writeObject(this.ncharColumn);
+        out.writeObject(this.numericColumn);
+        out.writeObject(this.nvarcharColumn);
+        out.writeObject(this.realColumn);
+        out.writeObject(this.smallintColumn);
+        out.writeObject(this.timeColumn);
+        out.writeObject(this.timestampColumn);
+        out.writeObject(this.tinyintColumn);
+        out.writeObject(this.varcharColumn);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        bigintColumn = (Long)in.readObject();
-        bitColumn = (Boolean)in.readObject();
-        booleanColumn = (Boolean)in.readObject();
-        charColumn = (String)in.readObject();
-        dateColumn = (Date)in.readObject();
-        decimalColumn = (BigDecimal)in.readObject();
-        doubleColumn = (Double)in.readObject();
-        floatColumn = (Float)in.readObject();
-        integerColumn = (Integer)in.readObject();
-        longnvarcharColumn = (String)in.readObject();
-        longvarcharColumn = (String)in.readObject();
-        ncharColumn = (String)in.readObject();
-        numericColumn = (BigDecimal)in.readObject();
-        nvarcharColumn = (String)in.readObject();
-        realColumn = (Float)in.readObject();
-        smallintColumn = (Short)in.readObject();
-        timeColumn = (Date)in.readObject();
-        timestampColumn = (Date)in.readObject();
-        tinyintColumn = (Byte)in.readObject();
-        varcharColumn = (String)in.readObject();
+        this.bigintColumn = (Long)in.readObject();
+        this.bitColumn = (Boolean)in.readObject();
+        this.booleanColumn = (Boolean)in.readObject();
+        this.charColumn = (String)in.readObject();
+        this.dateColumn = (Date)in.readObject();
+        this.decimalColumn = (BigDecimal)in.readObject();
+        this.doubleColumn = (Double)in.readObject();
+        this.floatColumn = (Float)in.readObject();
+        this.integerColumn = (Integer)in.readObject();
+        this.longnvarcharColumn = (String)in.readObject();
+        this.longvarcharColumn = (String)in.readObject();
+        this.ncharColumn = (String)in.readObject();
+        this.numericColumn = (BigDecimal)in.readObject();
+        this.nvarcharColumn = (String)in.readObject();
+        this.realColumn = (Float)in.readObject();
+        this.smallintColumn = (Short)in.readObject();
+        this.timeColumn = (Date)in.readObject();
+        this.timestampColumn = (Date)in.readObject();
+        this.tinyintColumn = (Byte)in.readObject();
+        this.varcharColumn = (String)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMap2.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMap2.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMap2.java
index 99d82d1..a039a48 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMap2.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMap2.java
@@ -37,7 +37,7 @@ public abstract class _ReturnTypesMap2 extends 
CayenneDataObject {
 
     public byte[] getBinaryColumn() {
         beforePropertyRead("binaryColumn");
-        return binaryColumn;
+        return this.binaryColumn;
     }
 
     public void setBlobColumn(byte[] blobColumn) {
@@ -47,7 +47,7 @@ public abstract class _ReturnTypesMap2 extends 
CayenneDataObject {
 
     public byte[] getBlobColumn() {
         beforePropertyRead("blobColumn");
-        return blobColumn;
+        return this.blobColumn;
     }
 
     public void setLongvarbinaryColumn(byte[] longvarbinaryColumn) {
@@ -57,7 +57,7 @@ public abstract class _ReturnTypesMap2 extends 
CayenneDataObject {
 
     public byte[] getLongvarbinaryColumn() {
         beforePropertyRead("longvarbinaryColumn");
-        return longvarbinaryColumn;
+        return this.longvarbinaryColumn;
     }
 
     public void setVarbinaryColumn(byte[] varbinaryColumn) {
@@ -67,7 +67,7 @@ public abstract class _ReturnTypesMap2 extends 
CayenneDataObject {
 
     public byte[] getVarbinaryColumn() {
         beforePropertyRead("varbinaryColumn");
-        return varbinaryColumn;
+        return this.varbinaryColumn;
     }
 
     @Override
@@ -125,19 +125,19 @@ public abstract class _ReturnTypesMap2 extends 
CayenneDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(binaryColumn);
-        out.writeObject(blobColumn);
-        out.writeObject(longvarbinaryColumn);
-        out.writeObject(varbinaryColumn);
+        out.writeObject(this.binaryColumn);
+        out.writeObject(this.blobColumn);
+        out.writeObject(this.longvarbinaryColumn);
+        out.writeObject(this.varbinaryColumn);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        binaryColumn = (byte[])in.readObject();
-        blobColumn = (byte[])in.readObject();
-        longvarbinaryColumn = (byte[])in.readObject();
-        varbinaryColumn = (byte[])in.readObject();
+        this.binaryColumn = (byte[])in.readObject();
+        this.blobColumn = (byte[])in.readObject();
+        this.longvarbinaryColumn = (byte[])in.readObject();
+        this.varbinaryColumn = (byte[])in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMapLobs1.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMapLobs1.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMapLobs1.java
index 8bff54e..4d189f2 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMapLobs1.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/return_types/auto/_ReturnTypesMapLobs1.java
@@ -33,7 +33,7 @@ public abstract class _ReturnTypesMapLobs1 extends 
CayenneDataObject {
 
     public String getClobColumn() {
         beforePropertyRead("clobColumn");
-        return clobColumn;
+        return this.clobColumn;
     }
 
     public void setNclobColumn(String nclobColumn) {
@@ -43,7 +43,7 @@ public abstract class _ReturnTypesMapLobs1 extends 
CayenneDataObject {
 
     public String getNclobColumn() {
         beforePropertyRead("nclobColumn");
-        return nclobColumn;
+        return this.nclobColumn;
     }
 
     @Override
@@ -91,15 +91,15 @@ public abstract class _ReturnTypesMapLobs1 extends 
CayenneDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(clobColumn);
-        out.writeObject(nclobColumn);
+        out.writeObject(this.clobColumn);
+        out.writeObject(this.nclobColumn);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        clobColumn = (String)in.readObject();
-        nclobColumn = (String)in.readObject();
+        this.clobColumn = (String)in.readObject();
+        this.nclobColumn = (String)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/soft_delete/auto/_SoftDelete.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/soft_delete/auto/_SoftDelete.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/soft_delete/auto/_SoftDelete.java
index fd8c22a..ee87549 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/soft_delete/auto/_SoftDelete.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/soft_delete/auto/_SoftDelete.java
@@ -33,7 +33,7 @@ public abstract class _SoftDelete extends BaseDataObject {
 
     public Boolean getDeleted() {
         beforePropertyRead("deleted");
-        return deleted;
+        return this.deleted;
     }
 
     public void setName(String name) {
@@ -43,10 +43,10 @@ public abstract class _SoftDelete extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
-protected abstract void onPrePersist();
+    protected abstract void onPrePersist();
 
     @Override
     public Object readPropertyDirectly(String propName) {
@@ -93,15 +93,15 @@ protected abstract void onPrePersist();
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(deleted);
-        out.writeObject(name);
+        out.writeObject(this.deleted);
+        out.writeObject(this.name);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        deleted = (Boolean)in.readObject();
-        name = (String)in.readObject();
+        this.deleted = (Boolean)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/table_primitives/auto/_TablePrimitives.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/table_primitives/auto/_TablePrimitives.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/table_primitives/auto/_TablePrimitives.java
index 50fcda0..947ed87 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/table_primitives/auto/_TablePrimitives.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/table_primitives/auto/_TablePrimitives.java
@@ -33,7 +33,7 @@ public abstract class _TablePrimitives extends BaseDataObject 
{
 
        public boolean isBooleanColumn() {
         beforePropertyRead("booleanColumn");
-        return booleanColumn;
+        return this.booleanColumn;
     }
 
     public void setIntColumn(int intColumn) {
@@ -43,7 +43,7 @@ public abstract class _TablePrimitives extends BaseDataObject 
{
 
     public int getIntColumn() {
         beforePropertyRead("intColumn");
-        return intColumn;
+        return this.intColumn;
     }
 
     @Override
@@ -91,15 +91,15 @@ public abstract class _TablePrimitives extends 
BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeBoolean(booleanColumn);
-        out.writeInt(intColumn);
+        out.writeBoolean(this.booleanColumn);
+        out.writeInt(this.intColumn);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        booleanColumn = in.readBoolean();
-        intColumn = in.readInt();
+        this.booleanColumn = in.readBoolean();
+        this.intColumn = in.readInt();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java
index 479af42..bd43dfb 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java
@@ -47,19 +47,19 @@ public abstract class _ArtistCallback extends 
BaseDataObject {
         return this.dateOfBirth;
     }
 
-protected abstract void prePersistEntityObjEntity();
+    protected abstract void prePersistEntityObjEntity();
 
-protected abstract void preRemoveEntityObjEntity();
+    protected abstract void preRemoveEntityObjEntity();
 
-protected abstract void preUpdateEntityObjEntity();
+    protected abstract void preUpdateEntityObjEntity();
 
-protected abstract void postPersistEntityObjEntity();
+    protected abstract void postPersistEntityObjEntity();
 
-protected abstract void postRemoveEntityObjEntity();
+    protected abstract void postRemoveEntityObjEntity();
 
-protected abstract void postUpdateEntityObjEntity();
+    protected abstract void postUpdateEntityObjEntity();
 
-protected abstract void postLoadEntityObjEntity();
+    protected abstract void postLoadEntityObjEntity();
 
     @Override
     public Object readPropertyDirectly(String propName) {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java
index de58c44..1620b69 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java
@@ -41,7 +41,7 @@ public abstract class _Bag extends CayenneDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     @SuppressWarnings("unchecked")
@@ -122,19 +122,19 @@ public abstract class _Bag extends CayenneDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(balls);
-        out.writeObject(boxes);
-        out.writeObject(things);
+        out.writeObject(this.name);
+        out.writeObject(this.balls);
+        out.writeObject(this.boxes);
+        out.writeObject(this.things);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        balls = in.readObject();
-        boxes = in.readObject();
-        things = in.readObject();
+        this.name = (String)in.readObject();
+        this.balls = in.readObject();
+        this.boxes = in.readObject();
+        this.things = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java
index cffdcc9..4114014 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java
@@ -39,7 +39,7 @@ public abstract class _Ball extends CayenneDataObject {
 
     public Integer getThingVolume() {
         beforePropertyRead("thingVolume");
-        return thingVolume;
+        return this.thingVolume;
     }
 
     public void setThingWeight(Integer thingWeight) {
@@ -49,7 +49,7 @@ public abstract class _Ball extends CayenneDataObject {
 
     public Integer getThingWeight() {
         beforePropertyRead("thingWeight");
-        return thingWeight;
+        return this.thingWeight;
     }
 
     public void setBox(Box box) {
@@ -123,19 +123,19 @@ public abstract class _Ball extends CayenneDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(thingVolume);
-        out.writeObject(thingWeight);
-        out.writeObject(box);
-        out.writeObject(thing);
+        out.writeObject(this.thingVolume);
+        out.writeObject(this.thingWeight);
+        out.writeObject(this.box);
+        out.writeObject(this.thing);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        thingVolume = (Integer)in.readObject();
-        thingWeight = (Integer)in.readObject();
-        box = in.readObject();
-        thing = in.readObject();
+        this.thingVolume = (Integer)in.readObject();
+        this.thingWeight = (Integer)in.readObject();
+        this.box = in.readObject();
+        this.thing = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java
index 9a9b09e..af9be5c 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java
@@ -44,7 +44,7 @@ public abstract class _Box extends CayenneDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void setBag(Bag bag) {
@@ -141,21 +141,21 @@ public abstract class _Box extends CayenneDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(bag);
-        out.writeObject(balls);
-        out.writeObject(boxInfo);
-        out.writeObject(things);
+        out.writeObject(this.name);
+        out.writeObject(this.bag);
+        out.writeObject(this.balls);
+        out.writeObject(this.boxInfo);
+        out.writeObject(this.things);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        bag = in.readObject();
-        balls = in.readObject();
-        boxInfo = in.readObject();
-        things = in.readObject();
+        this.name = (String)in.readObject();
+        this.bag = in.readObject();
+        this.balls = in.readObject();
+        this.boxInfo = in.readObject();
+        this.things = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
----------------------------------------------------------------------
diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
index 2a23b29..b96394c 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
@@ -34,7 +34,7 @@ public abstract class _BoxInfo extends CayenneDataObject {
 
     public String getColor() {
         beforePropertyRead("color");
-        return color;
+        return this.color;
     }
 
     public void setBox(Box box) {
@@ -90,15 +90,15 @@ public abstract class _BoxInfo extends CayenneDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(color);
-        out.writeObject(box);
+        out.writeObject(this.color);
+        out.writeObject(this.box);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         super.readState(in);
-        color = (String)in.readObject();
-        box = in.readObject();
+        this.color = (String)in.readObject();
+        this.box = in.readObject();
     }
 
 }

Reply via email to