Merge pull request diffblue#517 from diffblue/bugfix/update-annotation-schema

NathanJPhillips · web-flow · commit 385ceaf0a6c0 · 2018-07-25T18:12:24.000+01:00
Update annotation schema
diff --git a/env-model-generator/src/annotationConfig.ts b/env-model-generator/src/annotationConfig.ts
@@ -33,11 +33,11 @@ export interface BeanDefinitionMethods {
 }
 
 export interface BeanDefinitionMethod {
+    specifiedNames?: string[];
     type: string;
     parameterTypes: string[];
     scope?: string;
     isLazyInit?: boolean;
-    specifiedName?: string;
     initMethod?: string;
     destroyMethod?: string;
 }
diff --git a/src/java-class-info/java_class_info.cpp b/src/java-class-info/java_class_info.cpp
@@ -395,7 +395,7 @@ int cmdline_optionst::doit()
     }
 
     json_objectt root;
-    json_objectt &json_beans = root["beans"].make_object();
+    json_objectt &json_beans = root["components"].make_object();
     for(const beant &bean : beans)
     {
       json_objectt &json_bean = json_beans[id2string(bean.name)].make_object();

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,11 @@ export interface BeanDefinitionMethods {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`export interface BeanDefinitionMethod {`
	`36`	`+ specifiedNames?: string[];`
`36`	`37`	`type: string;`
`37`	`38`	`parameterTypes: string[];`
`38`	`39`	`scope?: string;`
`39`	`40`	`isLazyInit?: boolean;`
`40`		`- specifiedName?: string;`
`41`	`41`	`initMethod?: string;`
`42`	`42`	`destroyMethod?: string;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ int cmdline_optionst::doit()`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`json_objectt root;`
`398`		`- json_objectt &json_beans = root["beans"].make_object();`
	`398`	`+ json_objectt &json_beans = root["components"].make_object();`
`399`	`399`	`for(const beant &bean : beans)`
`400`	`400`	`{`
`401`	`401`	`json_objectt &json_bean = json_beans[id2string(bean.name)].make_object();`