Fixed issue with prompt returning null instead of empty string. Also added "path" support for "is" filter so a template can check if a string is a path. Also enhanced ECStringUtil test case.

Bob Garner · Bob Garner · commit 3657a4be26e4 · 2022-07-24T08:02:26.000-07:00
diff --git a/src/main/java/org/entityc/compiler/cmdline/command/CLBuild.java b/src/main/java/org/entityc/compiler/cmdline/command/CLBuild.java
@@ -20,6 +20,7 @@
 import org.entityc.compiler.repository.RepositoryFile;
 import org.entityc.compiler.util.ECLog;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -42,6 +43,9 @@ public void run(String[] args) {
         }
 
         String       configurationName = args[0];
+        if (configurationName.contains(File.separator)) {
+            ECLog.logFatal("The specified configuration name is not a valid configuration name: " + configurationName);
+        }
         List<String> defines           = new ArrayList<>();
         boolean quietMode = false;
 
diff --git a/src/main/java/org/entityc/compiler/transform/template/tree/FTPrompt.java b/src/main/java/org/entityc/compiler/transform/template/tree/FTPrompt.java
@@ -19,7 +19,6 @@
 import org.entityc.compiler.model.entity.MTNativeType;
 import org.entityc.compiler.transform.template.TemplateLexer;
 import org.entityc.compiler.transform.template.formatter.TemplateFormatController;
-import org.entityc.compiler.util.ECLog;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -63,6 +62,42 @@ public FTPrompt(ParserRuleContext ctx, FTContainerNode parent,
         this.nativeType   = nativeType;
     }
 
+    public static boolean isInteger(String strNum) {
+        if (strNum == null) {
+            return false;
+        }
+        try {
+            double d = Integer.parseInt(strNum);
+        } catch (NumberFormatException nfe) {
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean isFloat(String strNum) {
+        if (strNum == null) {
+            return false;
+        }
+        try {
+            double d = Double.parseDouble(strNum);
+        } catch (NumberFormatException nfe) {
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean isDouble(String strNum) {
+        if (strNum == null) {
+            return false;
+        }
+        try {
+            double d = Double.parseDouble(strNum);
+        } catch (NumberFormatException nfe) {
+            return false;
+        }
+        return true;
+    }
+
     @Override
     public FTBody getBody() {
         return body;
@@ -89,7 +124,8 @@ public boolean format(TemplateFormatController formatController, int indentLevel
             formatController.addInstructionInside(InstructionArgument, variableName, this.getStartLineNumber());
             if (nativeType != null) {
                 formatController.addInstructionInside(InstructionArgumentDelim, ":", this.getStartLineNumber());
-                formatController.addInstructionInside(InstructionArgument, nativeType.getDataType().getName(), this.getStartLineNumber());
+                formatController.addInstructionInside(InstructionArgument, nativeType.getDataType().getName(),
+                                                      this.getStartLineNumber());
             }
         }
         formatController.addInstructionEnd(this);
@@ -103,42 +139,6 @@ public boolean hasOwnBody() {
         return true;
     }
 
-    public static boolean isInteger(String strNum) {
-        if (strNum == null) {
-            return false;
-        }
-        try {
-            double d = Integer.parseInt(strNum);
-        } catch (NumberFormatException nfe) {
-            return false;
-        }
-        return true;
-    }
-
-    public static boolean isFloat(String strNum) {
-        if (strNum == null) {
-            return false;
-        }
-        try {
-            double d = Double.parseDouble(strNum);
-        } catch (NumberFormatException nfe) {
-            return false;
-        }
-        return true;
-    }
-
-    public static boolean isDouble(String strNum) {
-        if (strNum == null) {
-            return false;
-        }
-        try {
-            double d = Double.parseDouble(strNum);
-        } catch (NumberFormatException nfe) {
-            return false;
-        }
-        return true;
-    }
-
     public void prompt(FTTransformSession session) {
         String  text   = body.getText();
         boolean asking = true;
@@ -148,7 +148,11 @@ public void prompt(FTTransformSession session) {
             Scanner scanner = new Scanner(System.in);
             String  value   = scanner.nextLine();
             if (value.trim().length() == 0) {
-                value = session.getValue(variableName).toString();
+                if (session.getValue(variableName) == null) {
+                    value = "";
+                } else {
+                    value = session.getValue(variableName).toString();
+                }
             }
             try {
                 switch (nativeType.getDataType()) {
@@ -175,7 +179,8 @@ public void prompt(FTTransformSession session) {
                             session.setValue(variableName, Boolean.parseBoolean(value));
                         } else {
                             System.err.println(
-                                    "ERROR: Invalid boolean value \"" + value + "\" must be \"true\", \"false\", \"yes\", or \"no\".");
+                                    "ERROR: Invalid boolean value \"" + value
+                                    + "\" must be \"true\", \"false\", \"yes\", or \"no\".");
                             asking = true;
                         }
                         break;
diff --git a/src/main/java/org/entityc/compiler/transform/template/tree/filter/FTIsFilter.java b/src/main/java/org/entityc/compiler/transform/template/tree/filter/FTIsFilter.java
@@ -34,6 +34,7 @@ public FTIsFilter() {
     private enum KindOfThing {
         IDENTIFIER("identifier"),
         NAMESPACE("namespace"),
+        PATH("path"),
         CAPITALIZED("capitalized"),
         UNCAPITALIZED("uncapitalized"),
         ;
@@ -89,6 +90,8 @@ public Object filter(ParserRuleContext ctx, FTTransformSession session, Object i
                     return ECStringUtil.IsIdentifier(stringValue);
                 case NAMESPACE:
                     return ECStringUtil.IsNamespace(stringValue);
+                case PATH:
+                    return ECStringUtil.IsPath(stringValue);
                 case CAPITALIZED:
                     return ECStringUtil.IsCapitalized(stringValue);
                 case UNCAPITALIZED:
diff --git a/src/main/java/org/entityc/compiler/util/ECStringUtil.java b/src/main/java/org/entityc/compiler/util/ECStringUtil.java
@@ -105,6 +105,7 @@ public static String ProcessParserString(String inputString) {
      * When reading in text with double quotes, before they can be written out they need to first
      * be double escaped so the end result is a single escaped double quote - just like the very original
      * input text that was parsed.
+     *
      * @param inputString The input string with double quotes.
      * @return Double escaped double quoted string.
      */
@@ -306,6 +307,24 @@ public static String GetClassNameFromFullName(String fullTypeName) {
         return shortName;
     }
 
+    public static boolean IsNamespace(String text) {
+        if (text == null || text.length() == 0) {
+            return false;
+        }
+        for (int i = 1; i < text.length(); i++) {
+            char ch = text.charAt(i);
+            if (!(Character.isLetterOrDigit(ch) || ch == '.')) {
+                return false;
+            }
+        }
+        for (String seg : text.split("\\.")) {
+            if (!IsIdentifier(seg)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public static boolean IsIdentifier(String text) {
         //ECLog.logFatal("Checking if identifier: \"" + text + "\"...");
         if (text == null || text.length() == 0) {
@@ -325,18 +344,13 @@ public static boolean IsIdentifier(String text) {
         return true;
     }
 
-    public static boolean IsNamespace(String text) {
+    public static boolean IsPath(String text) {
         if (text == null || text.length() == 0) {
-            return false;
+            return true;
         }
-        for (int i = 1; i < text.length(); i++) {
+        for (int i = 0; i < text.length(); i++) {
             char ch = text.charAt(i);
-            if (!(Character.isLetterOrDigit(ch) || ch == '.')) {
-                return false;
-            }
-        }
-        for (String seg : text.split("\\.")) {
-            if (!IsIdentifier(seg)) {
+            if (!(Character.isLetterOrDigit(ch) || ch == '-' || ch == '/')) {
                 return false;
             }
         }
@@ -359,7 +373,7 @@ public static boolean IsUncapitalized(String text) {
 
     public static String RepeatString(String str, int times) {
         StringBuilder sb = new StringBuilder();
-        for (int i=0;i<times;i++) {
+        for (int i = 0; i < times; i++) {
             sb.append(str);
         }
         return sb.toString();
diff --git a/test/java/org/entityc/compiler/util/ECStringUtilTest.java b/test/java/org/entityc/compiler/util/ECStringUtilTest.java
@@ -35,6 +35,16 @@ void stripQuotes() {
     void doubleEscapeDoubleQuotes() {
         assertEquals("\\\\\"DoubleQuotes\\\\\"", ECStringUtil.DoubleEscapeDoubleQuotes("\"DoubleQuotes\""));
     }
+
+    @Test
+    void isPath() {
+        assertEquals(true, ECStringUtil.IsPath(""));
+        assertEquals(true, ECStringUtil.IsPath("this-is-ok"));
+        assertEquals(true, ECStringUtil.IsPath("this/is-ok"));
+        assertEquals(true, ECStringUtil.IsPath("this/is/ok"));
+        assertEquals(false, ECStringUtil.IsPath("this-os&bad"));
+        assertEquals(false, ECStringUtil.IsPath("this/is+bad"));
+    }
     @Test
     void stripLineEnd() {
         assertEquals(ECStringUtil.StripLineEnd("WithoutCR\n"), "WithoutCR");
