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:52 UTC

[15/18] cayenne git commit: CAY-2330 Field based data objects update test classes to latest cgen templates

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvAbstract.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvAbstract.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvAbstract.java
index 021f9e3..8f40c01 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvAbstract.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvAbstract.java
@@ -31,7 +31,7 @@ public abstract class _IvAbstract extends BaseDataObject {
 
     public String getType() {
         beforePropertyRead("type");
-        return type;
+        return this.type;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _IvAbstract extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(type);
+        out.writeObject(this.type);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        type = (String)in.readObject();
+        this.type = (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/_IvBase.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvBase.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvBase.java
index 91b2119..4286f72 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvBase.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvBase.java
@@ -33,7 +33,7 @@ public abstract class _IvBase extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void setType(String type) {
@@ -43,7 +43,7 @@ public abstract class _IvBase extends BaseDataObject {
 
     public String getType() {
         beforePropertyRead("type");
-        return type;
+        return this.type;
     }
 
     @Override
@@ -91,15 +91,15 @@ public abstract class _IvBase extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(type);
+        out.writeObject(this.name);
+        out.writeObject(this.type);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        type = (String)in.readObject();
+        this.name = (String)in.readObject();
+        this.type = (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/_IvBaseWithLock.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvBaseWithLock.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvBaseWithLock.java
index 29dfc23..6f6d0b1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvBaseWithLock.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvBaseWithLock.java
@@ -33,7 +33,7 @@ public abstract class _IvBaseWithLock extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void setType(String type) {
@@ -43,7 +43,7 @@ public abstract class _IvBaseWithLock extends BaseDataObject {
 
     public String getType() {
         beforePropertyRead("type");
-        return type;
+        return this.type;
     }
 
     @Override
@@ -91,15 +91,15 @@ public abstract class _IvBaseWithLock extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(type);
+        out.writeObject(this.name);
+        out.writeObject(this.type);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        type = (String)in.readObject();
+        this.name = (String)in.readObject();
+        this.type = (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/_IvConcrete.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvConcrete.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvConcrete.java
index 898c954..0e494d0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvConcrete.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvConcrete.java
@@ -37,7 +37,7 @@ public abstract class _IvConcrete extends IvAbstract {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToChildren(IvConcrete obj) {
@@ -111,17 +111,17 @@ public abstract class _IvConcrete extends IvAbstract {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(children);
-        out.writeObject(parent);
+        out.writeObject(this.name);
+        out.writeObject(this.children);
+        out.writeObject(this.parent);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        children = in.readObject();
-        parent = in.readObject();
+        this.name = (String)in.readObject();
+        this.children = in.readObject();
+        this.parent = 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/_IvImpl.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvImpl.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvImpl.java
index b24df08..dc6e086 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvImpl.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvImpl.java
@@ -38,7 +38,7 @@ public abstract class _IvImpl extends IvBase {
 
     public String getAttr1() {
         beforePropertyRead("attr1");
-        return attr1;
+        return this.attr1;
     }
 
     public void setAttr2(String attr2) {
@@ -48,7 +48,7 @@ public abstract class _IvImpl extends IvBase {
 
     public String getAttr2() {
         beforePropertyRead("attr2");
-        return attr2;
+        return this.attr2;
     }
 
     public void setOther1(IvOther other1) {
@@ -122,19 +122,19 @@ public abstract class _IvImpl extends IvBase {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(attr1);
-        out.writeObject(attr2);
-        out.writeObject(other1);
-        out.writeObject(other2);
+        out.writeObject(this.attr1);
+        out.writeObject(this.attr2);
+        out.writeObject(this.other1);
+        out.writeObject(this.other2);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        attr1 = (String)in.readObject();
-        attr2 = (String)in.readObject();
-        other1 = in.readObject();
-        other2 = in.readObject();
+        this.attr1 = (String)in.readObject();
+        this.attr2 = (String)in.readObject();
+        this.other1 = in.readObject();
+        this.other2 = 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/_IvImplWithLock.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvImplWithLock.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvImplWithLock.java
index b72749b..32fb526 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvImplWithLock.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvImplWithLock.java
@@ -34,7 +34,7 @@ public abstract class _IvImplWithLock extends IvBaseWithLock {
 
     public String getAttr1() {
         beforePropertyRead("attr1");
-        return attr1;
+        return this.attr1;
     }
 
     public void setOther1(IvOther other1) {
@@ -90,15 +90,15 @@ public abstract class _IvImplWithLock extends IvBaseWithLock {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(attr1);
-        out.writeObject(other1);
+        out.writeObject(this.attr1);
+        out.writeObject(this.other1);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        attr1 = (String)in.readObject();
-        other1 = in.readObject();
+        this.attr1 = (String)in.readObject();
+        this.other1 = 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/_IvOther.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvOther.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvOther.java
index 0554293..82e47d0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvOther.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvOther.java
@@ -38,7 +38,7 @@ public abstract class _IvOther extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     @SuppressWarnings("unchecked")
@@ -101,17 +101,17 @@ public abstract class _IvOther extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(impls);
-        out.writeObject(implsWithLock);
+        out.writeObject(this.name);
+        out.writeObject(this.impls);
+        out.writeObject(this.implsWithLock);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        impls = in.readObject();
-        implsWithLock = in.readObject();
+        this.name = (String)in.readObject();
+        this.impls = in.readObject();
+        this.implsWithLock = 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/_IvRoot.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvRoot.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvRoot.java
index b88346b..f3f86d0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvRoot.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvRoot.java
@@ -33,7 +33,7 @@ public abstract class _IvRoot extends BaseDataObject {
 
     public String getDiscriminator() {
         beforePropertyRead("discriminator");
-        return discriminator;
+        return this.discriminator;
     }
 
     public void setName(String name) {
@@ -43,7 +43,7 @@ public abstract class _IvRoot extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     @Override
@@ -91,15 +91,15 @@ public abstract class _IvRoot 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/_IvSub1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub1.java
index 3dc23bb..136987f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub1.java
@@ -31,7 +31,7 @@ public abstract class _IvSub1 extends IvRoot {
 
     public String getSub1Name() {
         beforePropertyRead("sub1Name");
-        return sub1Name;
+        return this.sub1Name;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _IvSub1 extends IvRoot {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(sub1Name);
+        out.writeObject(this.sub1Name);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        sub1Name = (String)in.readObject();
+        this.sub1Name = (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/_IvSub1Sub1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub1Sub1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub1Sub1.java
index 83e36f4..a3a8e97 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub1Sub1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub1Sub1.java
@@ -31,7 +31,7 @@ public abstract class _IvSub1Sub1 extends IvSub1 {
 
     public String getSub1Sub1Name() {
         beforePropertyRead("sub1Sub1Name");
-        return sub1Sub1Name;
+        return this.sub1Sub1Name;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _IvSub1Sub1 extends IvSub1 {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(sub1Sub1Name);
+        out.writeObject(this.sub1Sub1Name);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        sub1Sub1Name = (String)in.readObject();
+        this.sub1Sub1Name = (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/_IvSub2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub2.java
index 199322b..42dfb57 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub2.java
@@ -33,7 +33,7 @@ public abstract class _IvSub2 extends IvRoot {
 
     public String getSub2Attr() {
         beforePropertyRead("sub2Attr");
-        return sub2Attr;
+        return this.sub2Attr;
     }
 
     public void setSub2Name(String sub2Name) {
@@ -43,7 +43,7 @@ public abstract class _IvSub2 extends IvRoot {
 
     public String getSub2Name() {
         beforePropertyRead("sub2Name");
-        return sub2Name;
+        return this.sub2Name;
     }
 
     @Override
@@ -91,15 +91,15 @@ public abstract class _IvSub2 extends IvRoot {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(sub2Attr);
-        out.writeObject(sub2Name);
+        out.writeObject(this.sub2Attr);
+        out.writeObject(this.sub2Name);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        sub2Attr = (String)in.readObject();
-        sub2Name = (String)in.readObject();
+        this.sub2Attr = (String)in.readObject();
+        this.sub2Name = (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/_IvSub3.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub3.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub3.java
index b9272c0..827d09c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub3.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub3.java
@@ -28,7 +28,7 @@ public abstract class _IvSub3 extends IvRoot {
         return (IvRoot)readProperty("ivRoot");
     }
 
-protected abstract void onPrePersist();
+    protected abstract void onPrePersist();
 
     @Override
     public Object readPropertyDirectly(String propName) {
@@ -70,13 +70,13 @@ protected abstract void onPrePersist();
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(ivRoot);
+        out.writeObject(this.ivRoot);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        ivRoot = in.readObject();
+        this.ivRoot = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycle_callbacks_order/auto/_Lifecycle.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycle_callbacks_order/auto/_Lifecycle.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycle_callbacks_order/auto/_Lifecycle.java
index cce1bae..b4bc8ff 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycle_callbacks_order/auto/_Lifecycle.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycle_callbacks_order/auto/_Lifecycle.java
@@ -31,7 +31,7 @@ public abstract class _Lifecycle extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _Lifecycle 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/lifecycles/auto/_Lifecycles.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycles/auto/_Lifecycles.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycles/auto/_Lifecycles.java
index 5895dbb..ed26a39 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycles/auto/_Lifecycles.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lifecycles/auto/_Lifecycles.java
@@ -31,7 +31,7 @@ public abstract class _Lifecycles extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _Lifecycles 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/lob/auto/_BlobTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_BlobTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_BlobTestEntity.java
index 6e1cc8f..b81fbbb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_BlobTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_BlobTestEntity.java
@@ -31,7 +31,7 @@ public abstract class _BlobTestEntity extends BaseDataObject {
 
     public byte[] getBlobCol() {
         beforePropertyRead("blobCol");
-        return blobCol;
+        return this.blobCol;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _BlobTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(blobCol);
+        out.writeObject(this.blobCol);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        blobCol = (byte[])in.readObject();
+        this.blobCol = (byte[])in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_ClobTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_ClobTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_ClobTestEntity.java
index e5ae2e9..d8e7c3b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_ClobTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_ClobTestEntity.java
@@ -35,7 +35,7 @@ public abstract class _ClobTestEntity extends BaseDataObject {
 
     public String getClobCol() {
         beforePropertyRead("clobCol");
-        return clobCol;
+        return this.clobCol;
     }
 
     public void addToClobValue(ClobTestRelation obj) {
@@ -96,15 +96,15 @@ public abstract class _ClobTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(clobCol);
-        out.writeObject(clobValue);
+        out.writeObject(this.clobCol);
+        out.writeObject(this.clobValue);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        clobCol = (String)in.readObject();
-        clobValue = in.readObject();
+        this.clobCol = (String)in.readObject();
+        this.clobValue = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_ClobTestRelation.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_ClobTestRelation.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_ClobTestRelation.java
index 3a8c35d..bb3b212 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_ClobTestRelation.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_ClobTestRelation.java
@@ -36,7 +36,7 @@ public abstract class _ClobTestRelation extends BaseDataObject {
 
     public Integer getId() {
         beforePropertyRead("id");
-        return id;
+        return this.id;
     }
 
     public void setValue(Integer value) {
@@ -46,7 +46,7 @@ public abstract class _ClobTestRelation extends BaseDataObject {
 
     public Integer getValue() {
         beforePropertyRead("value");
-        return value;
+        return this.value;
     }
 
     public void setClobId(ClobTestEntity clobId) {
@@ -107,17 +107,17 @@ public abstract class _ClobTestRelation extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(id);
-        out.writeObject(value);
-        out.writeObject(clobId);
+        out.writeObject(this.id);
+        out.writeObject(this.value);
+        out.writeObject(this.clobId);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        id = (Integer)in.readObject();
-        value = (Integer)in.readObject();
-        clobId = in.readObject();
+        this.id = (Integer)in.readObject();
+        this.value = (Integer)in.readObject();
+        this.clobId = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_NClobTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_NClobTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_NClobTestEntity.java
index 3d88ec8..e23c436 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_NClobTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/lob/auto/_NClobTestEntity.java
@@ -31,7 +31,7 @@ public abstract class _NClobTestEntity extends BaseDataObject {
 
     public String getNclobCol() {
         beforePropertyRead("nclobCol");
-        return nclobCol;
+        return this.nclobCol;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _NClobTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(nclobCol);
+        out.writeObject(this.nclobCol);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        nclobCol = (String)in.readObject();
+        this.nclobCol = (String)in.readObject();
     }
 
 }

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

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_RelLockingTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_RelLockingTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_RelLockingTestEntity.java
index 40ca5c1..77134e2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_RelLockingTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_RelLockingTestEntity.java
@@ -38,7 +38,7 @@ public abstract class _RelLockingTestEntity extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToLockingHelpers(LockingHelper obj) {
@@ -112,17 +112,17 @@ public abstract class _RelLockingTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(lockingHelpers);
-        out.writeObject(toSimpleLockingTest);
+        out.writeObject(this.name);
+        out.writeObject(this.lockingHelpers);
+        out.writeObject(this.toSimpleLockingTest);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        lockingHelpers = in.readObject();
-        toSimpleLockingTest = in.readObject();
+        this.name = (String)in.readObject();
+        this.lockingHelpers = in.readObject();
+        this.toSimpleLockingTest = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SimpleLockingTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SimpleLockingTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SimpleLockingTestEntity.java
index 978e848..a74e312 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SimpleLockingTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/locking/auto/_SimpleLockingTestEntity.java
@@ -33,7 +33,7 @@ public abstract class _SimpleLockingTestEntity extends BaseDataObject {
 
     public String getDescription() {
         beforePropertyRead("description");
-        return description;
+        return this.description;
     }
 
     public void setName(String name) {
@@ -43,7 +43,7 @@ public abstract class _SimpleLockingTestEntity extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     @Override
@@ -91,15 +91,15 @@ public abstract class _SimpleLockingTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(description);
-        out.writeObject(name);
+        out.writeObject(this.description);
+        out.writeObject(this.name);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        description = (String)in.readObject();
-        name = (String)in.readObject();
+        this.description = (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/map_to_many/auto/_IdMapToMany.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_IdMapToMany.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_IdMapToMany.java
index d559308..289f86e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_IdMapToMany.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_IdMapToMany.java
@@ -79,13 +79,13 @@ public abstract class _IdMapToMany 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/map_to_many/auto/_IdMapToManyTarget.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_IdMapToManyTarget.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_IdMapToManyTarget.java
index 75e5668..7c9e69a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_IdMapToManyTarget.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_IdMapToManyTarget.java
@@ -73,13 +73,13 @@ public abstract class _IdMapToManyTarget extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(mapToMany);
+        out.writeObject(this.mapToMany);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        mapToMany = in.readObject();
+        this.mapToMany = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_MapToMany.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_MapToMany.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_MapToMany.java
index 93208bb..731504b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_MapToMany.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_MapToMany.java
@@ -79,13 +79,13 @@ public abstract class _MapToMany 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/map_to_many/auto/_MapToManyTarget.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_MapToManyTarget.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_MapToManyTarget.java
index 8bdb39c..2ae11ac 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_MapToManyTarget.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/map_to_many/auto/_MapToManyTarget.java
@@ -34,7 +34,7 @@ public abstract class _MapToManyTarget extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void setMapToMany(MapToMany mapToMany) {
@@ -90,15 +90,15 @@ public abstract class _MapToManyTarget extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(name);
-        out.writeObject(mapToMany);
+        out.writeObject(this.name);
+        out.writeObject(this.mapToMany);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        name = (String)in.readObject();
-        mapToMany = in.readObject();
+        this.name = (String)in.readObject();
+        this.mapToMany = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPKDep.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPKDep.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPKDep.java
index e78f7a9..adf1f91 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPKDep.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPKDep.java
@@ -34,7 +34,7 @@ public abstract class _MeaningfulPKDep extends BaseDataObject {
 
     public String getDescr() {
         beforePropertyRead("descr");
-        return descr;
+        return this.descr;
     }
 
     public void setToMeaningfulPK(MeaningfulPKTest1 toMeaningfulPK) {
@@ -90,15 +90,15 @@ public abstract class _MeaningfulPKDep extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(descr);
-        out.writeObject(toMeaningfulPK);
+        out.writeObject(this.descr);
+        out.writeObject(this.toMeaningfulPK);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        descr = (String)in.readObject();
-        toMeaningfulPK = in.readObject();
+        this.descr = (String)in.readObject();
+        this.toMeaningfulPK = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPKTest1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPKTest1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPKTest1.java
index 93bdada..9e994d3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPKTest1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPKTest1.java
@@ -37,7 +37,7 @@ public abstract class _MeaningfulPKTest1 extends BaseDataObject {
 
     public String getDescr() {
         beforePropertyRead("descr");
-        return descr;
+        return this.descr;
     }
 
     public void setPkAttribute(Integer pkAttribute) {
@@ -47,7 +47,7 @@ public abstract class _MeaningfulPKTest1 extends BaseDataObject {
 
     public Integer getPkAttribute() {
         beforePropertyRead("pkAttribute");
-        return pkAttribute;
+        return this.pkAttribute;
     }
 
     public void addToMeaningfulPKDepArray(MeaningfulPKDep obj) {
@@ -113,17 +113,17 @@ public abstract class _MeaningfulPKTest1 extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(descr);
-        out.writeObject(pkAttribute);
-        out.writeObject(meaningfulPKDepArray);
+        out.writeObject(this.descr);
+        out.writeObject(this.pkAttribute);
+        out.writeObject(this.meaningfulPKDepArray);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        descr = (String)in.readObject();
-        pkAttribute = (Integer)in.readObject();
-        meaningfulPKDepArray = in.readObject();
+        this.descr = (String)in.readObject();
+        this.pkAttribute = (Integer)in.readObject();
+        this.meaningfulPKDepArray = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPk.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPk.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPk.java
index 16f13ab..a45487d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPk.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/meaningful_pk/auto/_MeaningfulPk.java
@@ -31,7 +31,7 @@ public abstract class _MeaningfulPk extends BaseDataObject {
 
     public String getPk() {
         beforePropertyRead("pk");
-        return pk;
+        return this.pk;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _MeaningfulPk extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(pk);
+        out.writeObject(this.pk);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        pk = (String)in.readObject();
+        this.pk = (String)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_ArraysEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_ArraysEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_ArraysEntity.java
index 7d5ac6e..c1d0e9a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_ArraysEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_ArraysEntity.java
@@ -37,7 +37,7 @@ public abstract class _ArraysEntity extends BaseDataObject {
 
     public byte[] getByteArray() {
         beforePropertyRead("byteArray");
-        return byteArray;
+        return this.byteArray;
     }
 
     public void setByteWrapperArray(Byte[] byteWrapperArray) {
@@ -47,7 +47,7 @@ public abstract class _ArraysEntity extends BaseDataObject {
 
     public Byte[] getByteWrapperArray() {
         beforePropertyRead("byteWrapperArray");
-        return byteWrapperArray;
+        return this.byteWrapperArray;
     }
 
     public void setCharArray(char[] charArray) {
@@ -57,7 +57,7 @@ public abstract class _ArraysEntity extends BaseDataObject {
 
     public char[] getCharArray() {
         beforePropertyRead("charArray");
-        return charArray;
+        return this.charArray;
     }
 
     public void setCharWrapperArray(Character[] charWrapperArray) {
@@ -67,7 +67,7 @@ public abstract class _ArraysEntity extends BaseDataObject {
 
     public Character[] getCharWrapperArray() {
         beforePropertyRead("charWrapperArray");
-        return charWrapperArray;
+        return this.charWrapperArray;
     }
 
     @Override
@@ -125,19 +125,19 @@ public abstract class _ArraysEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(byteArray);
-        out.writeObject(byteWrapperArray);
-        out.writeObject(charArray);
-        out.writeObject(charWrapperArray);
+        out.writeObject(this.byteArray);
+        out.writeObject(this.byteWrapperArray);
+        out.writeObject(this.charArray);
+        out.writeObject(this.charWrapperArray);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        byteArray = (byte[])in.readObject();
-        byteWrapperArray = (Byte[])in.readObject();
-        charArray = (char[])in.readObject();
-        charWrapperArray = (Character[])in.readObject();
+        this.byteArray = (byte[])in.readObject();
+        this.byteWrapperArray = (Byte[])in.readObject();
+        this.charArray = (char[])in.readObject();
+        this.charWrapperArray = (Character[])in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_CharacterEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_CharacterEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_CharacterEntity.java
index 1163888..5add37c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_CharacterEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_CharacterEntity.java
@@ -31,7 +31,7 @@ public abstract class _CharacterEntity extends BaseDataObject {
 
     public Character getCharacterField() {
         beforePropertyRead("characterField");
-        return characterField;
+        return this.characterField;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _CharacterEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(characterField);
+        out.writeObject(this.characterField);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        characterField = (Character)in.readObject();
+        this.characterField = (Character)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_SerializableEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_SerializableEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_SerializableEntity.java
index 2f9adf1..2d79de4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_SerializableEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/misc_types/auto/_SerializableEntity.java
@@ -32,7 +32,7 @@ public abstract class _SerializableEntity extends BaseDataObject {
 
     public MockSerializable getSerializableField() {
         beforePropertyRead("serializableField");
-        return serializableField;
+        return this.serializableField;
     }
 
     @Override
@@ -75,13 +75,13 @@ public abstract class _SerializableEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(serializableField);
+        out.writeObject(this.serializableField);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        serializableField = (MockSerializable)in.readObject();
+        this.serializableField = (MockSerializable)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/mixed_persistence_strategy/auto/_MixedPersistenceStrategy.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mixed_persistence_strategy/auto/_MixedPersistenceStrategy.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mixed_persistence_strategy/auto/_MixedPersistenceStrategy.java
index e2427ee..b926c18 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mixed_persistence_strategy/auto/_MixedPersistenceStrategy.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mixed_persistence_strategy/auto/_MixedPersistenceStrategy.java
@@ -37,7 +37,7 @@ public abstract class _MixedPersistenceStrategy extends BaseDataObject {
 
     public String getDescription() {
         beforePropertyRead("description");
-        return description;
+        return this.description;
     }
 
     public void setName(String name) {
@@ -47,7 +47,7 @@ public abstract class _MixedPersistenceStrategy extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void addToDetails(MixedPersistenceStrategy2 obj) {
@@ -113,17 +113,17 @@ public abstract class _MixedPersistenceStrategy extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(description);
-        out.writeObject(name);
-        out.writeObject(details);
+        out.writeObject(this.description);
+        out.writeObject(this.name);
+        out.writeObject(this.details);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        description = (String)in.readObject();
-        name = (String)in.readObject();
-        details = in.readObject();
+        this.description = (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/mixed_persistence_strategy/auto/_MixedPersistenceStrategy2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mixed_persistence_strategy/auto/_MixedPersistenceStrategy2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mixed_persistence_strategy/auto/_MixedPersistenceStrategy2.java
index 300c2b3..81f24bc 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mixed_persistence_strategy/auto/_MixedPersistenceStrategy2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mixed_persistence_strategy/auto/_MixedPersistenceStrategy2.java
@@ -34,7 +34,7 @@ public abstract class _MixedPersistenceStrategy2 extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     public void setMaster(MixedPersistenceStrategy master) {
@@ -90,15 +90,15 @@ public abstract class _MixedPersistenceStrategy2 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/mt/auto/_MtTable1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1.java
index 21b0e92..1c2730b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1.java
@@ -37,7 +37,7 @@ public abstract class _MtTable1 extends BaseDataObject {
 
     public String getGlobalAttribute1() {
         beforePropertyRead("globalAttribute1");
-        return globalAttribute1;
+        return this.globalAttribute1;
     }
 
     public void setServerAttribute1(String serverAttribute1) {
@@ -47,7 +47,7 @@ public abstract class _MtTable1 extends BaseDataObject {
 
     public String getServerAttribute1() {
         beforePropertyRead("serverAttribute1");
-        return serverAttribute1;
+        return this.serverAttribute1;
     }
 
     public void addToTable2Array(MtTable2 obj) {
@@ -113,17 +113,17 @@ public abstract class _MtTable1 extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(globalAttribute1);
-        out.writeObject(serverAttribute1);
-        out.writeObject(table2Array);
+        out.writeObject(this.globalAttribute1);
+        out.writeObject(this.serverAttribute1);
+        out.writeObject(this.table2Array);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        globalAttribute1 = (String)in.readObject();
-        serverAttribute1 = (String)in.readObject();
-        table2Array = in.readObject();
+        this.globalAttribute1 = (String)in.readObject();
+        this.serverAttribute1 = (String)in.readObject();
+        this.table2Array = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass1.java
index ae178eb..a57126b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass1.java
@@ -31,7 +31,7 @@ public abstract class _MtTable1Subclass1 extends MtTable1 {
 
     public String getSubclass1Attribute1() {
         beforePropertyRead("subclass1Attribute1");
-        return subclass1Attribute1;
+        return this.subclass1Attribute1;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _MtTable1Subclass1 extends MtTable1 {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(subclass1Attribute1);
+        out.writeObject(this.subclass1Attribute1);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        subclass1Attribute1 = (String)in.readObject();
+        this.subclass1Attribute1 = (String)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass2.java
index da985cc..2e6b4ec 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass2.java
@@ -31,7 +31,7 @@ public abstract class _MtTable1Subclass2 extends MtTable1 {
 
     public String getSubclass2Attribute1() {
         beforePropertyRead("subclass2Attribute1");
-        return subclass2Attribute1;
+        return this.subclass2Attribute1;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _MtTable1Subclass2 extends MtTable1 {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(subclass2Attribute1);
+        out.writeObject(this.subclass2Attribute1);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        subclass2Attribute1 = (String)in.readObject();
+        this.subclass2Attribute1 = (String)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java
index 42160e8..8701e8e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java
@@ -37,7 +37,7 @@ public abstract class _MtTable2 extends BaseDataObject {
 
     public String getGlobalAttribute() {
         beforePropertyRead("globalAttribute");
-        return globalAttribute;
+        return this.globalAttribute;
     }
 
     public void setTable1(MtTable1 table1) {
@@ -106,17 +106,17 @@ public abstract class _MtTable2 extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(globalAttribute);
-        out.writeObject(table1);
-        out.writeObject(table3);
+        out.writeObject(this.globalAttribute);
+        out.writeObject(this.table1);
+        out.writeObject(this.table3);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        globalAttribute = (String)in.readObject();
-        table1 = in.readObject();
-        table3 = in.readObject();
+        this.globalAttribute = (String)in.readObject();
+        this.table1 = in.readObject();
+        this.table3 = in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java
index 9b38704..55269fe 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java
@@ -39,7 +39,7 @@ public abstract class _MtTable3 extends BaseDataObject {
 
     public byte[] getBinaryColumn() {
         beforePropertyRead("binaryColumn");
-        return binaryColumn;
+        return this.binaryColumn;
     }
 
     public void setCharColumn(String charColumn) {
@@ -49,7 +49,7 @@ public abstract class _MtTable3 extends BaseDataObject {
 
     public String getCharColumn() {
         beforePropertyRead("charColumn");
-        return charColumn;
+        return this.charColumn;
     }
 
     public void setIntColumn(Integer intColumn) {
@@ -59,7 +59,7 @@ public abstract class _MtTable3 extends BaseDataObject {
 
     public Integer getIntColumn() {
         beforePropertyRead("intColumn");
-        return intColumn;
+        return this.intColumn;
     }
 
     public void addToTable2Array(MtTable2 obj) {
@@ -130,19 +130,19 @@ public abstract class _MtTable3 extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(binaryColumn);
-        out.writeObject(charColumn);
-        out.writeObject(intColumn);
-        out.writeObject(table2Array);
+        out.writeObject(this.binaryColumn);
+        out.writeObject(this.charColumn);
+        out.writeObject(this.intColumn);
+        out.writeObject(this.table2Array);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        binaryColumn = (byte[])in.readObject();
-        charColumn = (String)in.readObject();
-        intColumn = (Integer)in.readObject();
-        table2Array = in.readObject();
+        this.binaryColumn = (byte[])in.readObject();
+        this.charColumn = (String)in.readObject();
+        this.intColumn = (Integer)in.readObject();
+        this.table2Array = in.readObject();
     }
 
 }

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

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

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/no_pk/auto/_NoPkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/no_pk/auto/_NoPkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/no_pk/auto/_NoPkTestEntity.java
index 72d3963..aa29094 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/no_pk/auto/_NoPkTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/no_pk/auto/_NoPkTestEntity.java
@@ -30,7 +30,7 @@ public abstract class _NoPkTestEntity extends BaseDataObject {
 
     public Integer getAttribute1() {
         beforePropertyRead("attribute1");
-        return attribute1;
+        return this.attribute1;
     }
 
     @Override
@@ -73,13 +73,13 @@ public abstract class _NoPkTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(attribute1);
+        out.writeObject(this.attribute1);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        attribute1 = (Integer)in.readObject();
+        this.attribute1 = (Integer)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigDecimalEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigDecimalEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigDecimalEntity.java
index 07fa1a0..536bd2e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigDecimalEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigDecimalEntity.java
@@ -32,7 +32,7 @@ public abstract class _BigDecimalEntity extends BaseDataObject {
 
     public BigDecimal getBigDecimalField() {
         beforePropertyRead("bigDecimalField");
-        return bigDecimalField;
+        return this.bigDecimalField;
     }
 
     @Override
@@ -75,13 +75,13 @@ public abstract class _BigDecimalEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(bigDecimalField);
+        out.writeObject(this.bigDecimalField);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        bigDecimalField = (BigDecimal)in.readObject();
+        this.bigDecimalField = (BigDecimal)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigIntegerEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigIntegerEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigIntegerEntity.java
index ef841d1..769b942 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigIntegerEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigIntegerEntity.java
@@ -32,7 +32,7 @@ public abstract class _BigIntegerEntity extends BaseDataObject {
 
     public BigInteger getBigIntegerField() {
         beforePropertyRead("bigIntegerField");
-        return bigIntegerField;
+        return this.bigIntegerField;
     }
 
     @Override
@@ -75,13 +75,13 @@ public abstract class _BigIntegerEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(bigIntegerField);
+        out.writeObject(this.bigIntegerField);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        bigIntegerField = (BigInteger)in.readObject();
+        this.bigIntegerField = (BigInteger)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitNumberTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitNumberTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitNumberTestEntity.java
index 2fcc59c..4185508 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitNumberTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitNumberTestEntity.java
@@ -31,7 +31,7 @@ public abstract class _BitNumberTestEntity extends BaseDataObject {
 
     public Integer getBitColumn() {
         beforePropertyRead("bitColumn");
-        return bitColumn;
+        return this.bitColumn;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _BitNumberTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(bitColumn);
+        out.writeObject(this.bitColumn);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        bitColumn = (Integer)in.readObject();
+        this.bitColumn = (Integer)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitTestEntity.java
index 59337dd..2b251c9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitTestEntity.java
@@ -31,7 +31,7 @@ public abstract class _BitTestEntity extends BaseDataObject {
 
     public Boolean getBitColumn() {
         beforePropertyRead("bitColumn");
-        return bitColumn;
+        return this.bitColumn;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _BitTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(bitColumn);
+        out.writeObject(this.bitColumn);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        bitColumn = (Boolean)in.readObject();
+        this.bitColumn = (Boolean)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BooleanTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BooleanTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BooleanTestEntity.java
index 5a1b340..d05f701 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BooleanTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BooleanTestEntity.java
@@ -31,7 +31,7 @@ public abstract class _BooleanTestEntity extends BaseDataObject {
 
     public Boolean getBooleanColumn() {
         beforePropertyRead("booleanColumn");
-        return booleanColumn;
+        return this.booleanColumn;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _BooleanTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(booleanColumn);
+        out.writeObject(this.booleanColumn);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        booleanColumn = (Boolean)in.readObject();
+        this.booleanColumn = (Boolean)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTest1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTest1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTest1.java
index 816493c..ceaac63 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTest1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTest1.java
@@ -33,7 +33,7 @@ public abstract class _DecimalPKTest1 extends BaseDataObject {
 
     public Double getDecimalPK() {
         beforePropertyRead("decimalPK");
-        return decimalPK;
+        return this.decimalPK;
     }
 
     public void setName(String name) {
@@ -43,7 +43,7 @@ public abstract class _DecimalPKTest1 extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     @Override
@@ -91,15 +91,15 @@ public abstract class _DecimalPKTest1 extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(decimalPK);
-        out.writeObject(name);
+        out.writeObject(this.decimalPK);
+        out.writeObject(this.name);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        decimalPK = (Double)in.readObject();
-        name = (String)in.readObject();
+        this.decimalPK = (Double)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/numeric_types/auto/_DecimalPKTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTestEntity.java
index 7f6cc44..8122f65 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTestEntity.java
@@ -34,7 +34,7 @@ public abstract class _DecimalPKTestEntity extends BaseDataObject {
 
     public BigDecimal getDecimalPK() {
         beforePropertyRead("decimalPK");
-        return decimalPK;
+        return this.decimalPK;
     }
 
     public void setName(String name) {
@@ -44,7 +44,7 @@ public abstract class _DecimalPKTestEntity extends BaseDataObject {
 
     public String getName() {
         beforePropertyRead("name");
-        return name;
+        return this.name;
     }
 
     @Override
@@ -92,15 +92,15 @@ public abstract class _DecimalPKTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(decimalPK);
-        out.writeObject(name);
+        out.writeObject(this.decimalPK);
+        out.writeObject(this.name);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        decimalPK = (BigDecimal)in.readObject();
-        name = (String)in.readObject();
+        this.decimalPK = (BigDecimal)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/numeric_types/auto/_LongEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_LongEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_LongEntity.java
index 9eb37ad..c0ff27b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_LongEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_LongEntity.java
@@ -31,7 +31,7 @@ public abstract class _LongEntity extends BaseDataObject {
 
     public Long getLongField() {
         beforePropertyRead("longField");
-        return longField;
+        return this.longField;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _LongEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(longField);
+        out.writeObject(this.longField);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        longField = (Long)in.readObject();
+        this.longField = (Long)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_SmallintTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_SmallintTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_SmallintTestEntity.java
index fa9d208..ec80ca5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_SmallintTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_SmallintTestEntity.java
@@ -31,7 +31,7 @@ public abstract class _SmallintTestEntity extends BaseDataObject {
 
     public Short getSmallintCol() {
         beforePropertyRead("smallintCol");
-        return smallintCol;
+        return this.smallintCol;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _SmallintTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(smallintCol);
+        out.writeObject(this.smallintCol);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        smallintCol = (Short)in.readObject();
+        this.smallintCol = (Short)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_TinyintTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_TinyintTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_TinyintTestEntity.java
index da57ad8..1914136 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_TinyintTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_TinyintTestEntity.java
@@ -31,7 +31,7 @@ public abstract class _TinyintTestEntity extends BaseDataObject {
 
     public Byte getTinyintCol() {
         beforePropertyRead("tinyintCol");
-        return tinyintCol;
+        return this.tinyintCol;
     }
 
     @Override
@@ -74,13 +74,13 @@ public abstract class _TinyintTestEntity extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(tinyintCol);
+        out.writeObject(this.tinyintCol);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        tinyintCol = (Byte)in.readObject();
+        this.tinyintCol = (Byte)in.readObject();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable2.java
index 52aceba..5880e83 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable2.java
@@ -34,7 +34,7 @@ public abstract class _OnewayTable2 extends BaseDataObject {
 
     public Integer getId() {
         beforePropertyRead("id");
-        return id;
+        return this.id;
     }
 
     public void setToOneOneWayDb(OnewayTable1 toOneOneWayDb) {
@@ -90,15 +90,15 @@ public abstract class _OnewayTable2 extends BaseDataObject {
     @Override
     protected void writeState(ObjectOutputStream out) throws IOException {
         super.writeState(out);
-        out.writeObject(id);
-        out.writeObject(toOneOneWayDb);
+        out.writeObject(this.id);
+        out.writeObject(this.toOneOneWayDb);
     }
 
     @Override
     protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
         super.readState(in);
-        id = (Integer)in.readObject();
-        toOneOneWayDb = in.readObject();
+        this.id = (Integer)in.readObject();
+        this.toOneOneWayDb = in.readObject();
     }
 
 }

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

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3a350e1/cayenne-server/src/test/java/org/apache/cayenne/testdo/primitive/auto/_PrimitivesTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/primitive/auto/_PrimitivesTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/primitive/auto/_PrimitivesTestEntity.java
index 2150ddb..640f660 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/primitive/auto/_PrimitivesTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/primitive/auto/_PrimitivesTestEntity.java
@@ -33,7 +33,7 @@ public abstract class _PrimitivesTestEntity extends BaseDataObject {
 
 	public boolean isBooleanColumn() {
         beforePropertyRead("booleanColumn");
-        return booleanColumn;
+        return this.booleanColumn;
     }
 
     public void setIntColumn(int intColumn) {
@@ -43,7 +43,7 @@ public abstract class _PrimitivesTestEntity extends BaseDataObject {
 
     public int getIntColumn() {
         beforePropertyRead("intColumn");
-        return intColumn;
+        return this.intColumn;
     }
 
     @Override
@@ -70,10 +70,10 @@ public abstract class _PrimitivesTestEntity extends BaseDataObject {
 
         switch (propName) {
             case "booleanColumn":
-                this.booleanColumn = (Boolean)val;
+                this.booleanColumn = val == null ? false : (Boolean)val;
                 break;
             case "intColumn":
-                this.intColumn = (Integer)val;
+                this.intColumn = val == null ? 0 : (Integer)val;
                 break;
             default:
                 super.writePropertyDirectly(propName, val);
@@ -91,15 +91,15 @@ public abstract class _PrimitivesTestEntity 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();
     }
 
 }