diff --git a/src/test/resources/astDiff/commits/linkedin_rest.li/bd0d3bf75d31a8b5db34b8b66dfb28e5e1f492de/generator.src.main.java.com.linkedin.pegasus.generator.JavaCodeGeneratorBase.json b/src/test/resources/astDiff/commits/linkedin_rest.li/bd0d3bf75d31a8b5db34b8b66dfb28e5e1f492de/generator.src.main.java.com.linkedin.pegasus.generator.JavaCodeGeneratorBase.json
index 03bc0b3ff..acf824209 100644
--- a/src/test/resources/astDiff/commits/linkedin_rest.li/bd0d3bf75d31a8b5db34b8b66dfb28e5e1f492de/generator.src.main.java.com.linkedin.pegasus.generator.JavaCodeGeneratorBase.json
+++ b/src/test/resources/astDiff/commits/linkedin_rest.li/bd0d3bf75d31a8b5db34b8b66dfb28e5e1f492de/generator.src.main.java.com.linkedin.pegasus.generator.JavaCodeGeneratorBase.json
@@ -2935,6 +2935,83 @@
   "secondPos" : 5379,
   "firstEndPos" : 3340,
   "secondEndPos" : 5395
+}, {
+  "firstType" : "FieldDeclaration",
+  "secondType" : "FieldDeclaration",
+  "firstLabel" : "",
+  "secondLabel" : "",
+  "firstParentType" : "TypeDeclaration",
+  "secondParentType" : "TypeDeclaration",
+  "firstPos" : 3344,
+  "secondPos" : 5399,
+  "firstEndPos" : 3379,
+  "secondEndPos" : 5436
+}, {
+  "firstType" : "Modifier",
+  "secondType" : "Modifier",
+  "firstLabel" : "protected",
+  "secondLabel" : "private",
+  "firstParentType" : "FieldDeclaration",
+  "secondParentType" : "FieldDeclaration",
+  "firstPos" : 3344,
+  "secondPos" : 5399,
+  "firstEndPos" : 3353,
+  "secondEndPos" : 5406
+}, {
+  "firstType" : "Modifier",
+  "secondType" : "Modifier",
+  "firstLabel" : "final",
+  "secondLabel" : "final",
+  "firstParentType" : "FieldDeclaration",
+  "secondParentType" : "FieldDeclaration",
+  "firstPos" : 3354,
+  "secondPos" : 5407,
+  "firstEndPos" : 3359,
+  "secondEndPos" : 5412
+}, {
+  "firstType" : "SimpleName",
+  "secondType" : "SimpleName",
+  "firstLabel" : "JClass",
+  "secondLabel" : "JClass",
+  "firstParentType" : "SimpleType",
+  "secondParentType" : "SimpleType",
+  "firstPos" : 3360,
+  "secondPos" : 5413,
+  "firstEndPos" : 3366,
+  "secondEndPos" : 5419
+}, {
+  "firstType" : "SimpleType",
+  "secondType" : "SimpleType",
+  "firstLabel" : "",
+  "secondLabel" : "",
+  "firstParentType" : "FieldDeclaration",
+  "secondParentType" : "FieldDeclaration",
+  "firstPos" : 3360,
+  "secondPos" : 5413,
+  "firstEndPos" : 3366,
+  "secondEndPos" : 5419
+}, {
+  "firstType" : "SimpleName",
+  "secondType" : "SimpleName",
+  "firstLabel" : "_unionClass",
+  "secondLabel" : "_unionBaseClass",
+  "firstParentType" : "VariableDeclarationFragment",
+  "secondParentType" : "VariableDeclarationFragment",
+  "firstPos" : 3367,
+  "secondPos" : 5420,
+  "firstEndPos" : 3378,
+  "secondEndPos" : 5435
+}, {
+  "firstType" : "VariableDeclarationFragment",
+  "secondType" : "VariableDeclarationFragment",
+  "firstLabel" : "",
+  "secondLabel" : "",
+  "firstParentType" : "FieldDeclaration",
+  "secondParentType" : "FieldDeclaration",
+  "firstPos" : 3367,
+  "secondPos" : 5420,
+  "firstEndPos" : 3378,
+  "secondEndPos" : 5435
 }, {
   "firstType" : "FieldDeclaration",
   "secondType" : "FieldDeclaration",
diff --git a/src/test/resources/astDiff/commits/linkedin_rest.li/bd0d3bf75d31a8b5db34b8b66dfb28e5e1f492de/generator.src.main.java.com.linkedin.pegasus.generator.JavaDataTemplateGenerator.json b/src/test/resources/astDiff/commits/linkedin_rest.li/bd0d3bf75d31a8b5db34b8b66dfb28e5e1f492de/generator.src.main.java.com.linkedin.pegasus.generator.JavaDataTemplateGenerator.json
index ad2b61b4b..cb90a4ddc 100644
--- a/src/test/resources/astDiff/commits/linkedin_rest.li/bd0d3bf75d31a8b5db34b8b66dfb28e5e1f492de/generator.src.main.java.com.linkedin.pegasus.generator.JavaDataTemplateGenerator.json
+++ b/src/test/resources/astDiff/commits/linkedin_rest.li/bd0d3bf75d31a8b5db34b8b66dfb28e5e1f492de/generator.src.main.java.com.linkedin.pegasus.generator.JavaDataTemplateGenerator.json
@@ -1637,6 +1637,28 @@
   "secondPos" : 3662,
   "firstEndPos" : 3356,
   "secondEndPos" : 3676
+}, {
+  "firstType" : "FieldDeclaration",
+  "secondType" : "FieldDeclaration",
+  "firstLabel" : "",
+  "secondLabel" : "",
+  "firstParentType" : "TypeDeclaration",
+  "secondParentType" : "TypeDeclaration",
+  "firstPos" : 3344,
+  "secondPos" : 5399,
+  "firstEndPos" : 3379,
+  "secondEndPos" : 5436
+}, {
+  "firstType" : "Modifier",
+  "secondType" : "Modifier",
+  "firstLabel" : "protected",
+  "secondLabel" : "private",
+  "firstParentType" : "FieldDeclaration",
+  "secondParentType" : "FieldDeclaration",
+  "firstPos" : 3344,
+  "secondPos" : 5399,
+  "firstEndPos" : 3353,
+  "secondEndPos" : 5406
 }, {
   "firstType" : "SimpleName",
   "secondType" : "SimpleName",
@@ -1648,6 +1670,17 @@
   "secondPos" : 3669,
   "firstEndPos" : 3355,
   "secondEndPos" : 3675
+}, {
+  "firstType" : "Modifier",
+  "secondType" : "Modifier",
+  "firstLabel" : "final",
+  "secondLabel" : "final",
+  "firstParentType" : "FieldDeclaration",
+  "secondParentType" : "FieldDeclaration",
+  "firstPos" : 3354,
+  "secondPos" : 5407,
+  "firstEndPos" : 3359,
+  "secondEndPos" : 5412
 }, {
   "firstType" : "TextElement",
   "secondType" : "TextElement",
@@ -1659,6 +1692,50 @@
   "secondPos" : 3676,
   "firstEndPos" : 3380,
   "secondEndPos" : 3700
+}, {
+  "firstType" : "SimpleName",
+  "secondType" : "SimpleName",
+  "firstLabel" : "JClass",
+  "secondLabel" : "JClass",
+  "firstParentType" : "SimpleType",
+  "secondParentType" : "SimpleType",
+  "firstPos" : 3360,
+  "secondPos" : 5413,
+  "firstEndPos" : 3366,
+  "secondEndPos" : 5419
+}, {
+  "firstType" : "SimpleType",
+  "secondType" : "SimpleType",
+  "firstLabel" : "",
+  "secondLabel" : "",
+  "firstParentType" : "FieldDeclaration",
+  "secondParentType" : "FieldDeclaration",
+  "firstPos" : 3360,
+  "secondPos" : 5413,
+  "firstEndPos" : 3366,
+  "secondEndPos" : 5419
+}, {
+  "firstType" : "SimpleName",
+  "secondType" : "SimpleName",
+  "firstLabel" : "_unionClass",
+  "secondLabel" : "_unionBaseClass",
+  "firstParentType" : "VariableDeclarationFragment",
+  "secondParentType" : "VariableDeclarationFragment",
+  "firstPos" : 3367,
+  "secondPos" : 5420,
+  "firstEndPos" : 3378,
+  "secondEndPos" : 5435
+}, {
+  "firstType" : "VariableDeclarationFragment",
+  "secondType" : "VariableDeclarationFragment",
+  "firstLabel" : "",
+  "secondLabel" : "",
+  "firstParentType" : "FieldDeclaration",
+  "secondParentType" : "FieldDeclaration",
+  "firstPos" : 3367,
+  "secondPos" : 5420,
+  "firstEndPos" : 3378,
+  "secondEndPos" : 5435
 }, {
   "firstType" : "TagElement",
   "secondType" : "TagElement",