Add ability to get a bean by its class

Author: NathanJPhillips

env-model-generator/src/mapTrackingDuplicates.ts

@@ -0,0 +1,22 @@
+export default class MapTrackingDuplicates<K, V>
+{
+  private _map = new Map<K, V | null>();
+
+  public has(key: K): boolean {
+    const value = this._map.get(key);
+    return value !== undefined && value !== null;
+  }
+
+  public hasDuplicates(key: K): boolean {
+    return this._map.get(key) === null;
+  }
+
+  public get(key: K): V | undefined {
+    const value = this._map.get(key);
+    return value === null ? undefined : value;
+  }
+
+  public set(key: K, value: V): void {
+    this._map.set(key, this._map.has(key) ? null : value);
+  }
+}

env-model-generator/src/model.ts

@@ -16,6 +16,7 @@ import {
   StringConstant,
   Symbol,
 } from "./javaCode";
+import MapTrackingDuplicates from "./mapTrackingDuplicates";
 import NameMap from "./nameMap";
 import { makeIdentifier, upperInitialChar } from "./utils";
 
@@ -237,6 +238,20 @@ export class Bean {
   public static getAliases(): Iterable<[ string, string ]> {
     return Bean.aliases;
   }
+
+  private static beanIdByClass = new MapTrackingDuplicates<string, string>();
+
+  public static registerIdForClass(qualifiedClassName: string, beanId: string) {
+    Bean.beanIdByClass.set(qualifiedClassName, beanId);
+  }
+
+  public static tryGetIdByClass(qualifiedClassName: string): string | undefined {
+    return Bean.beanIdByClass.get(qualifiedClassName);
+  }
+
+  public static hasMultipleBeansForClass(qualifiedClassName: string): boolean {
+    return Bean.beanIdByClass.hasDuplicates(qualifiedClassName);
+  }
 }
 
 export abstract class Value {

env-model-generator/src/parseJson.ts

@@ -34,6 +34,7 @@ export async function collectBeansFromConfigFile(filePath: string): Promise<stri
     // Create a bean model for the bean
     const bean = { qualifiedClassName: qualifiedClassName, bean: annotationConfig.beans[qualifiedClassName] };
     beansById.set(id, bean);
+    model.Bean.registerIdForClass(bean.qualifiedClassName, id);
   }
   // TODO: Return paths to XML config files specified in code
   return [];

env-model-generator/src/parseSpringXml.ts

@@ -4,7 +4,7 @@ import * as pathUtils from "path";
 import * as spring from "../xmlns/www.springframework.org/schema/beans";
 import { ConfigParseError } from "./configParseError";
 import * as model from "./model";
-import { getBean } from "./parserDriver";
+import { getBeanById } from "./parserDriver";
 import { makeIdentifier, parseXmlString } from "./utils";
 
 const beansById = new Map<string, spring.BeanType>();
@@ -58,6 +58,8 @@ export async function collectBeansFromConfigFile(filePath: string): Promise<stri
         model.Bean.addAlias(ids[i], id);
       // Record the actual bean
       beansById.set(id, bean);
+      if (bean.class)
+        model.Bean.registerIdForClass(bean.class, id);
     }
   }
   return imports;
@@ -92,14 +94,14 @@ export function parseBean(id: string): model.Bean {
 function parseXmlBean(id: string | undefined, bean: spring.BeanType): model.Bean {
   let parent;
   if (bean.parent) {
-    parent = getBean(bean.parent);
+    parent = getBeanById(bean.parent);
     if (parent === undefined)
       throw new ConfigParseError(
         `Couldn't find bean '${bean.parent}' specified as parent of ${id === undefined ? "anonymous bean" : `'${id}'`}`);
   }
   let factoryBean;
   if (bean.factoryBean) {
-    factoryBean = getBean(bean.factoryBean);
+    factoryBean = getBeanById(bean.factoryBean);
     if (factoryBean === undefined)
       throw new ConfigParseError(
         `Couldn't find bean '${bean.factoryBean}' specified as factoryBean of ${id === undefined ? "anonymous bean" : `'${id}'`}`);

env-model-generator/src/parserDriver.ts

@@ -32,7 +32,7 @@ async function collectBeansFromConfigFiles(filePaths: string[]): Promise<void> {
   }
 }
 
-export function getBean(beanId: string): model.Bean | undefined {
+export function getBeanById(beanId: string): model.Bean | undefined {
   const beanModel = model.Bean.tryGet(beanId);
   if (beanModel !== undefined)
     return beanModel;
@@ -45,6 +45,6 @@ export function getBean(beanId: string): model.Bean | undefined {
     return xmlParser.parseBean(beanId);
   const aliasedBeanId = model.Bean.getAlias(beanId);
   if (aliasedBeanId !== undefined)
-    return getBean(aliasedBeanId);
+    return getBeanById(aliasedBeanId);
   return undefined;
 }