Collect all beans created using @bean

Author: NathanJPhillips

env-model-generator/src/parseJson.ts

@@ -9,7 +9,14 @@ interface NamedComponent {
   component: jsonConfig.Component;
 }
 
+interface NamedBeanDefinitionMethod {
+  className: string;
+  name: string;
+  method: jsonConfig.BeanDefinitionMethod;
+}
+
 const componentsById = new Map<string, NamedComponent>();
+const beansById = new Map<string, NamedBeanDefinitionMethod>();
 
 export async function collectBeansFromConfigFile(filePath: string): Promise<string[]> {
   let json: string;
@@ -22,24 +29,47 @@ export async function collectBeansFromConfigFile(filePath: string): Promise<stri
   for (const qualifiedClassName in annotationConfig.components) {
     if (!annotationConfig.components.hasOwnProperty(qualifiedClassName))
       continue;
-    // Create bean ID
     // TODO: Handle name value on @Component annotation
     const id = lowerInitialChar(<string>qualifiedClassName.split(".").pop());
-    // Check for duplicate ids from other beans
-    if (componentsById.has(id))
-      throw new ConfigParseError(`Found multiple components with id '${id}'`);
-    const aliasedBeanId = model.Bean.getAlias(id);
-    if (aliasedBeanId !== undefined)
-      throw new ConfigParseError(`Found a bean with id same as an alias for '${aliasedBeanId}'`);
-    // Create a bean model for the bean
-    const component = { qualifiedClassName: qualifiedClassName, component: annotationConfig.components[qualifiedClassName] };
-    componentsById.set(id, component);
-    model.Bean.registerIdForClass(component.qualifiedClassName, id);
+    checkBeanId(id, `@Component annotation on class '${qualifiedClassName}'`);
+    componentsById.set(id, { qualifiedClassName: qualifiedClassName, component: annotationConfig.components[qualifiedClassName] });
+    model.Bean.registerIdForClass(qualifiedClassName, id);
+  }
+  for (const configurationClassName in annotationConfig.configurations) {
+    if (!annotationConfig.configurations.hasOwnProperty(configurationClassName))
+      continue;
+    const beanDefinitionMethods = annotationConfig.configurations[configurationClassName].beanDefinitionMethods;
+    for (const beanDefinitionMethodName in beanDefinitionMethods) {
+      if (!beanDefinitionMethods.hasOwnProperty(beanDefinitionMethodName))
+        continue;
+      const beanDefinitionMethod = beanDefinitionMethods[beanDefinitionMethodName];
+      let id = beanDefinitionMethodName;
+      if (beanDefinitionMethod.specifiedNames !== undefined && beanDefinitionMethod.specifiedNames.length !== 0) {
+        id = beanDefinitionMethod.specifiedNames[0];
+        // Add aliases
+        for (let i = 1; i < beanDefinitionMethod.specifiedNames.length; ++i)
+          model.Bean.addAlias(beanDefinitionMethod.specifiedNames[i], id);
+      }
+      checkBeanId(id, `@Bean annotation on '${configurationClassName}.${beanDefinitionMethodName}'`);
+      beansById.set(id, { className: configurationClassName, name: configurationClassName, method: beanDefinitionMethod });
+      model.Bean.registerIdForClass(beanDefinitionMethod.type, id);
+    }
   }
   // TODO: Return paths to XML config files specified in code
   return [];
 }
 
+// Check for duplicate ids from other beans
+function checkBeanId(id: string, location: string): void {
+  if (componentsById.has(id))
+    throw new ConfigParseError(`${location}: There is an existing component with id '${id}'`);
+  if (beansById.has(id))
+    throw new ConfigParseError(`${location}: There is an existing bean with id '${id}'`);
+  const aliasedBeanId = model.Bean.getAlias(id);
+  if (aliasedBeanId !== undefined)
+    throw new ConfigParseError(`${location}: There is an existing alias with identifier '${aliasedBeanId}'`);
+}
+
 export function beanWithIdExists(id: string): boolean {
   return componentsById.has(id);
 }