Used new, more structured, blocks

Author: NathanJPhillips

env-model-generator/src/env-model-generator.ts

@@ -6,7 +6,7 @@ import * as program from "commander";
 import * as fs from "fs-extra";
 import * as _ from "lodash";
 import * as pathUtils from "path";
-import { BlankLine, Block, Class, FnCall, Method, Null, Return, Statement } from "./javaCode";
+import { BlankLine, CatchBlock, Class, FnCall, IfThenElse, Method, Null, Return, Statement, StringConstant, TryCatch } from "./javaCode";
 import * as model from "./model";
 import parseSpringConfigFiles from "./parserDriver";
 import { createPath } from "./utils";
@@ -64,14 +64,13 @@ async function transformConfigFiles(fileName: string, options: any) {
           new Method(
             "public Object getBean(String name)",
             [
-              new Block(
-                "try",
+              new TryCatch(
                 (<Statement[]>[]).concat(
                   model.Repository.getNamed()
                     .sort((a, b) => a.name < b.name ? -1 : a.name === b.name ? 0 : 1)
                     .map((bean) =>
-                      new Block(
-                        `if (name.equals("${bean.name}"))`,
+                      new IfThenElse(
+                        new FnCall("name.equals", [ new StringConstant(bean.name) ]),
                         [
                           new Return(new FnCall(bean.getter, [])),
                         ])),
@@ -80,17 +79,14 @@ async function transformConfigFiles(fileName: string, options: any) {
                       const bean = model.Repository.tryGet(beanId);
                       if (bean === undefined)
                         throw new Error("Found alias to bean that doesn't exist");
-                      return new Block(
-                        `if (name.equals("${alias}"))`,
+                      return new IfThenElse(
+                        new FnCall("name.equals", [ new StringConstant(alias) ]),
                         [
                           new Return(new FnCall(bean.getter, [])),
                         ]);
                     }),
                 ),
-              ),
-              new Block(
-                "catch(Exception ex)",
-                []),
+                [ new CatchBlock("Exception") ]),
               new Return(new Null()),
             ],
             [],

env-model-generator/src/model.ts

@@ -2,16 +2,18 @@ import * as _ from "lodash";
 import { ConfigParseError } from "./configParseError";
 import {
   Assignment,
+  BinaryOperator,
   BlankLine,
-  Block,
   BraceInitialiser,
   Declaration,
   Expression,
   FnCall,
   FnStatement,
+  IfThenElse,
   Member,
   Method,
   Null,
+  RangedFor,
   Return,
   Statement,
   StringConstant,
@@ -190,8 +192,8 @@ export class Bean implements IBean {
       this._javaMembers.push(new Method(
         `public static ${typeName} ${this.getter}()`,
         [
-          new Block(
-            `if (${variableName} == null)`,
+          new IfThenElse(
+            new BinaryOperator(new Symbol(variableName), "==", new Null()),
             [
               new Assignment(variableName, new FnCall(creatorFn, constructorArgs)),
               ...initialisers,
@@ -432,8 +434,10 @@ export class PropertiesValue extends Value {
         "public static java.util.Properties listToProperties(java.util.List<java.util.AbstractMap.SimpleEntry<String, String>> properties)",
         [
           new Declaration("java.util.Properties", "result", new FnCall("new java.util.Properties", [])),
-          new Block(
-            "for (java.util.AbstractMap.SimpleEntry<String, String> prop : properties)",
+          new RangedFor(
+            "java.util.AbstractMap.SimpleEntry<String, String>",
+            "prop",
+            new Symbol("properties"),
             [
               new FnStatement(new FnCall("result.put", [ new FnCall("prop.getKey", []), new FnCall("prop.getValue", []) ])),
             ]),
@@ -481,8 +485,10 @@ export class MapValue extends Value {
         "public static java.util.Map<String, String> listToMap(java.util.List<java.util.AbstractMap.SimpleEntry<String, String>> entries)",
         [
           new Declaration("java.util.Map<String, String>", "result", new FnCall("new java.util.HashMap<String, String>", [])),
-          new Block(
-            "for (java.util.AbstractMap.SimpleEntry<String, String> entry : entries)",
+          new RangedFor(
+            "java.util.AbstractMap.SimpleEntry<String, String>",
+            "entry",
+            new Symbol("entries"),
             [
               new FnStatement(new FnCall("result.put", [ new FnCall("entry.getKey", []), new FnCall("entry.getValue", []) ])),
             ]),