Fixed some output colorization. Fixed tests - which includes now using the -parameters option when compiling so method argument names will be returned properly when introspected.

bobgarner · bobgarner · commit 500466da0282 · 2022-06-29T20:39:39.000-07:00
diff --git a/pom.xml b/pom.xml
@@ -74,6 +74,16 @@
                     </descriptorRefs>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                <compilerArgs>
+                    <arg>-parameters</arg>
+                </compilerArgs>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
diff --git a/src/main/java/org/entityc/compiler/cmdline/command/CLBuild.java b/src/main/java/org/entityc/compiler/cmdline/command/CLBuild.java
@@ -113,7 +113,7 @@ public void run(String[] args) {
         // close out our session
         ProjectManager.getInstance().close();
         if (!quietMode) {
-            ECLog.log(StdoutColor.GreenForeground.getStringValue() + "Success");
+            ECLog.log(colorize("Success", StdoutColor.GreenForeground));
         }
     }
 
diff --git a/src/main/java/org/entityc/compiler/cmdline/command/CLCommand.java b/src/main/java/org/entityc/compiler/cmdline/command/CLCommand.java
@@ -51,9 +51,7 @@ public static void displayItems(String message, Set<String> listOfItems, StdoutC
         ECLog.log(ECStringUtil.WrapString(message + ":", "", DISPLAY_LINE_WIDTH));
         Collection<String> sortedNames = listOfItems.stream().sorted().collect(Collectors.toList());
         for (String name : sortedNames) {
-            ECLog.log("    " + (itemColor != null ?
-                                itemColor.stringValue :
-                                "") + name);
+            ECLog.log("    " + colorize(name, itemColor));
         }
     }
 
@@ -123,7 +121,7 @@ protected List<String> processSingleDirWildcardArg(String arg, String dirpath) {
         return sourceFileNames;
     }
 
-    protected String colorize(String text, StdoutColor color) {
+    protected static String colorize(String text, StdoutColor color) {
         return color.getStringValue() + text + StdoutColor.Default.getStringValue();
     }
 
diff --git a/src/main/java/org/entityc/compiler/project/ProjectManager.java b/src/main/java/org/entityc/compiler/project/ProjectManager.java
@@ -323,6 +323,9 @@ public void setQuietMode(boolean quietMode) {
     }
 
     public void registerSchemaDirectory(String path) {
+        if (schemaDirectories == null) {
+            schemaDirectories = new HashSet<>();
+        }
         schemaDirectories.add(path);
     }
 
diff --git a/test/java/org/entityc/compiler/EntityCompilerTest.java b/test/java/org/entityc/compiler/EntityCompilerTest.java
@@ -28,7 +28,7 @@ private void runTemplateTest(String testName) throws IOException {
         final String TestResourceDir = BASE_RESOURCE_DIR + "/" + testName;
         String       strTmp          = System.getProperty("java.io.tmpdir");
         String       sourceFile      = TestResourceDir + "/" + testName + ".edl";
-        EntityCompiler.main(new String[]{sourceFile, "-c", "Config", "-tp", TestResourceDir, "-D", "TEMP_DIR=" + strTmp});
+        EntityCompiler.main(new String[]{"build", "Config", sourceFile, "-tp", TestResourceDir, "-D", "TEMP_DIR=" + strTmp});
         String actual   = FileUtils.readFileToString(new File(strTmp + File.separator + testName + ".txt"));
         String expected = FileUtils.readFileToString(new File(TestResourceDir + "/" + testName + "Expected.txt"));
         assertEquals(expected, actual);
@@ -56,7 +56,7 @@ private void runPostgresTest(String testName) throws IOException {
         final String TestResourceDir = BASE_RESOURCE_DIR + "/" + testName;
         String       strTmp          = System.getProperty("java.io.tmpdir");
         String       sourceFile      = TestResourceDir + "/" + testName + ".edl";
-        EntityCompiler.main(new String[]{sourceFile, "-c", "Config", "-tp", TestResourceDir, "-D", "TEMP_DIR=" + strTmp});
+        EntityCompiler.main(new String[]{"build", "Config", sourceFile, "-tp", TestResourceDir, "-D", "TEMP_DIR=" + strTmp});
         String actual   = FileUtils.readFileToString(new File(strTmp + File.separator + "V1__Space.sql"));
         String expected = FileUtils.readFileToString(new File(TestResourceDir + "/" + testName + "Expected.sql"));
         assertEquals(expected, actual);
diff --git a/test/resources/compiler/main/CompilerDocs/CompilerDocsExpected.txt b/test/resources/compiler/main/CompilerDocs/CompilerDocsExpected.txt
@@ -469,8 +469,8 @@ These methods relate to a part of application configuration.
 
 | Method/Property |
 |---|
-| `String` **`directoryName`** |
-| Returns the directory name if available. Otherwise returns `null` |
+| `String` **`directoryPath`** |
+| Returns the directory path if available. Otherwise returns `null` |
 |<hr style="border-bottom:1px solid #77c;"><tr></tr>|
 | `String` **`filename`** |
 | Returns the filename of the template which is preceded by a directory name if available. |
@@ -943,6 +943,9 @@ These methods relate to relationships.
 | `boolean` **`hasParentRelationship`** |
 | Indicates whether it has a least one relationship declared as parent. |
 |<hr style="border-bottom:1px solid #77c;"><tr></tr>|
+| `boolean` [**`hasParentRelationshipToEntity(MTEntity parentEntity)`**](#class_MTEntity_hasParentRelationshipToEntity) |
+| Indicates whether it has a least one relationship declared as parent to the specified entity. |
+|<hr style="border-bottom:1px solid #77c;"><tr></tr>|
 | `boolean` **`hasPrimaryParentRelationship`** |
 | Indicates whether this entity has a primary parent relationship. A primary parent relationship is one which is declared `parent` and **not** declared `optional`. |
 |<hr style="border-bottom:1px solid #77c;"><tr></tr>|
@@ -1025,6 +1028,16 @@ Given an entity object, this method will try to find and return a relationship o
 
 
 
+<a name="class_MTEntity_hasParentRelationshipToEntity">
+#### Method `boolean hasParentRelationshipToEntity(MTEntity parentEntity)`
+</a>
+
+Indicates whether it has a least one relationship declared as parent to the specified entity.
+
+| Parameter | Description |
+|-----|-----|
+|`MTEntity parentEntity` | *no description* |
+
 
 
 
@@ -1632,6 +1645,9 @@ These methods relate to data types.
 | `MTEnum` **`enumType`** |
 | If this type is an enum type then it returns the enum type object. Otherwise it returns `null`. |
 |<hr style="border-bottom:1px solid #77c;"><tr></tr>|
+| `boolean` **`isBooleanType`** |
+| Indicates whether this type is one of the integer data types. |
+|<hr style="border-bottom:1px solid #77c;"><tr></tr>|
 | `boolean` **`isByteArrayType`** |
 | Indicates whether this type is both an array type and also `byte` data type. |
 |<hr style="border-bottom:1px solid #77c;"><tr></tr>|
@@ -1666,6 +1682,7 @@ These methods relate to data types.
 
 
 
+
 <a name="class_MTType_isNativeDataType">
 #### Method `boolean isNativeDataType(DataType dataType)`
 </a>
@@ -3010,7 +3027,7 @@ These methods relate to an outlet.
 | Indicates whether this author has child authors that connect to an outlet. |
 |<hr style="border-bottom:1px solid #77c;"><tr></tr>|
 | `boolean` **`hasChildOutletsWithIntermediateParents`** |
-| Indicates whether this author has children authors that connect to an outlet and there are intermediate parent authors (that is authors that don't connect to an outlet). |
+| Indicates whether this author has children authors that connect to an outlet and there are intermediate parent authors (that is, authors that don't connect to an outlet). |
 |<hr style="border-bottom:1px solid #77c;"><tr></tr>|
 | `boolean` **`isOutletAuthor`** |
 | Indicates whether this author connects to an outlet. |
diff --git a/test/resources/compiler/main/TemplateCodeFormatting/TemplateCodeFormattingExpected.eml b/test/resources/compiler/main/TemplateCodeFormatting/TemplateCodeFormattingExpected.eml
@@ -13,22 +13,22 @@ Enum: ${enum.name}
 ${qualifier}Entity: ${entity.name}
         $[foreach attribute in entity.attributes]
             $[switch attribute.type]
-                $[case string]
-                    $[let typeLongName = "String of characters"]
+                $[case uuid]
+                    $[let typeLongName = "Unique Identifier - 128 bits"]
                 $[case int32]
                     $[let typeLongName = "32-bit Integer"]
                 $[case int64]
                     $[let typeLongName = "64-bit Integer"]
-                $[case double]
-                    $[let typeLongName = "64-bit Floating Point"]
                 $[case float]
                     $[let typeLongName = "32-bit Floating Point"]
-                $[case uuid]
-                    $[let typeLongName = "Unique Identifier - 128 bits"]
-                $[case typedef]
-                    $[let typeLongName = "Typedef named " + attribute.type.name]
+                $[case double]
+                    $[let typeLongName = "64-bit Floating Point"]
+                $[case string]
+                    $[let typeLongName = "String of characters"]
                 $[case enum]
                     $[let typeLongName = "Enum named " + attribute.type.name]
+                $[case typedef]
+                    $[let typeLongName = "Typedef named " + attribute.type.name]
                 $[case entity]
                     $[let typeLongName = "Entity named " + attribute.type.name]
                 $[default]

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public void run(String[] args) {`
`113`	`113`	`// close out our session`
`114`	`114`	`ProjectManager.getInstance().close();`
`115`	`115`	`if (!quietMode) {`
`116`		`- ECLog.log(StdoutColor.GreenForeground.getStringValue() + "Success");`
	`116`	`+ ECLog.log(colorize("Success", StdoutColor.GreenForeground));`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,7 @@ public static void displayItems(String message, Set<String> listOfItems, StdoutC`
`51`	`51`	`ECLog.log(ECStringUtil.WrapString(message + ":", "", DISPLAY_LINE_WIDTH));`
`52`	`52`	`Collection<String> sortedNames = listOfItems.stream().sorted().collect(Collectors.toList());`
`53`	`53`	`for (String name : sortedNames) {`
`54`		`- ECLog.log(" " + (itemColor != null ?`
`55`		`- itemColor.stringValue :`
`56`		`- "") + name);`
	`54`	`+ ECLog.log(" " + colorize(name, itemColor));`
`57`	`55`	`}`
`58`	`56`	`}`
`59`	`57`
`@@ -123,7 +121,7 @@ protected List<String> processSingleDirWildcardArg(String arg, String dirpath) {`
`123`	`121`	`return sourceFileNames;`
`124`	`122`	`}`
`125`	`123`
`126`		`- protected String colorize(String text, StdoutColor color) {`
	`124`	`+ protected static String colorize(String text, StdoutColor color) {`
`127`	`125`	`return color.getStringValue() + text + StdoutColor.Default.getStringValue();`
`128`	`126`	`}`
`129`	`127`
Original file line number	Diff line number	Diff line change
`@@ -323,6 +323,9 @@ public void setQuietMode(boolean quietMode) {`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`public void registerSchemaDirectory(String path) {`
	`326`	`+ if (schemaDirectories == null) {`
	`327`	`+ schemaDirectories = new HashSet<>();`
	`328`	`+ }`
`326`	`329`	`schemaDirectories.add(path);`
`327`	`330`	`}`
`328`	`331`