Merge pull request diffblue#524 from diffblue/bugfix/autowired-fields-not-properties

Fix bug where autowired fields were set using property accessors

Author: NathanJPhillips

env-model-generator/src/annotationConfig.ts

@@ -18,6 +18,7 @@ export interface AutoWiredFields {
 
 export interface AutoWiredField {
   type: string;
+  isPublic: boolean;
 }
 
 export interface Configurations {

env-model-generator/src/model.ts

@@ -13,6 +13,7 @@ import {
   Method,
   Null,
   Return,
+  Statement,
   StringConstant,
   Symbol,
 } from "./javaCode";
@@ -23,6 +24,8 @@ import { makeIdentifier, upperInitialChar } from "./utils";
 export interface BeanProperty {
   name: string;
   value: Value;
+  isPublic: boolean;
+  isField: boolean;
 }
 
 interface Factory {
@@ -117,17 +120,49 @@ export class Bean implements IBean {
     this._exceptions = [];
     const variableName = !this.isLazyInit ? `_${this.identifier}` : "value";
     const [ constructorArgs, constructorArgsExceptions ] = collectionToJava(this.constructorArgs);
-    const [ initialisers, initialisersExceptions ]: [ FnStatement[], string[][] ] =
+    const [ initialisersStatements, initialisersExceptions ]: [ Statement[][], string[][] ] =
       this.properties.size === 0
         ? [ [], [] ]
         : <any>_.unzip([...this.properties].map((property) => {
           const [ initialiserJava, initialiserExceptions ] = property.value.toJava();
+          let statements: Statement[];
+          if (property.isField) {
+            if (property.isPublic)
+              statements = [ new Assignment(`${variableName}.${property.name}`, initialiserJava) ];
+            else {
+              const fieldVariableName = `${property.name}_field`;
+              statements = [
+                new Declaration(
+                  "java.lang.reflect.Field",
+                  fieldVariableName,
+                  new FnCall(`${variableName}.getClass().getDeclaredField`, [ new StringConstant(property.name) ])),
+                new FnStatement(new FnCall(`${fieldVariableName}.setAccessible`, [ new Symbol("true") ])),
+                new FnStatement(new FnCall(`${fieldVariableName}.set`, [ new Symbol(variableName), initialiserJava ])),
+              ];
+            }
+          } else {
+            const setterName = `set${upperInitialChar(property.name)}`;
+            if (property.isPublic)
+              statements = [ new FnStatement(new FnCall(`${variableName}.${setterName}`, [ initialiserJava ])) ];
+            else {
+              const setterVariableName = `${property.name}_setter`;
+              statements = [
+                new Declaration(
+                  "java.lang.reflect.Method",
+                  setterVariableName,
+                  new FnCall(`${variableName}.getClass().getDeclaredMethod`, [ new StringConstant(setterName) ])),
+                new FnStatement(new FnCall(`${setterVariableName}.setAccessible`, [ new Symbol("true") ])),
+                new FnStatement(new FnCall(`${setterVariableName}.invoke`, [ new Symbol(variableName), initialiserJava ])),
+              ];
+            }
+          }
           return [
-            new FnStatement(new FnCall(`${variableName}.set${upperInitialChar(property.name)}`, [ initialiserJava ])),
+            statements,
             initialiserExceptions,
           ];
         }));
     this._exceptions = _.uniq(constructorArgsExceptions.concat(_.flatten(initialisersExceptions)));
+    const initialisers = _.flatten(initialisersStatements);
     if (this.initMethod !== undefined)
       initialisers.push(new FnStatement(new FnCall(`${variableName}.${this.initMethod}`, [])));
     let typeName;

env-model-generator/src/parseJson.ts

@@ -145,9 +145,12 @@ function parseJsonComponent(id: string, namedBean: NamedComponent): model.IBean
   for (const fieldName in component.fields) {
     if (!component.fields.hasOwnProperty(fieldName))
       continue;
+    const field = component.fields[fieldName];
     properties.push({
       name: fieldName,
-      value: getBeanForClass(component.fields[fieldName].type, `Auto-wired field '${namedBean.qualifiedClassName}.${fieldName}'`),
+      value: getBeanForClass(field.type, `Auto-wired field '${namedBean.qualifiedClassName}.${fieldName}'`),
+      isField: true,
+      isPublic: field.isPublic,
     });
   }
   // TODO: Handle constructor arguments

env-model-generator/src/parseSpringXml.ts

@@ -121,7 +121,7 @@ function parseXmlBean(id: string | undefined, bean: spring.BeanType): model.IBea
     return parseProperty(arg);
   });
   const properties = (bean.property || []).map((property) =>
-    ({ name: property.name, value: parseProperty(property) }));
+    ({ name: property.name, value: parseProperty(property), isField: false, isPublic: true }));
   let impl;
   if (factoryBean && bean.factoryMethod)
     impl = { bean: factoryBean, method: bean.factoryMethod };