Extract getBeanForClass

Author: NathanJPhillips

env-model-generator/src/parseJson.ts

@@ -96,15 +96,20 @@ function parseJsonComponent(id: string, namedBean: NamedComponent): model.Bean {
   for (const fieldName in component.fields) {
     if (!component.fields.hasOwnProperty(fieldName))
       continue;
-    const fieldClass = component.fields[fieldName].type;
-
-    const fieldBeanId = model.Bean.tryGetIdByClass(fieldClass);
-    if (fieldBeanId === undefined)
-      throw new ConfigParseError(
-        `Auto-wired field '${namedBean.qualifiedClassName}.${fieldName}' depends on a class '${fieldClass}' `
-          + `that has ${model.Bean.hasMultipleBeansForClass(fieldClass) ? "multiple" : "no"} implementations`);
-    properties.push({ name: fieldName, value: new model.BeanRefValue(fieldBeanId) });
+    properties.push({
+      name: fieldName,
+      value: getBeanForClass(component.fields[fieldName].type, `Auto-wired field '${namedBean.qualifiedClassName}.${fieldName}'`),
+    });
   }
   // TODO: Handle constructor arguments
   return new model.Bean(undefined, id, namedBean.qualifiedClassName, false, [], properties);
 }
+
+function getBeanForClass(className: string, userString: string): model.BeanRefValue {
+  const fieldBeanId = model.Bean.tryGetIdByClass(className);
+  if (fieldBeanId === undefined)
+    throw new ConfigParseError(
+      `${userString} depends on a class '${className}' `
+        + `that has ${model.Bean.hasMultipleBeansForClass(className) ? "multiple" : "no"} implementations`);
+  return new model.BeanRefValue(fieldBeanId);
+}