[freemarker-generator] branch FREEMARKER-195 updated: FREEMARKER-195 [freemarker-generator] Cleanup code and examples

[sgoeschl]

This is an automated email from the ASF dual-hosted git repository.

sgoeschl pushed a commit to branch FREEMARKER-195
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git


The following commit(s) were added to refs/heads/FREEMARKER-195 by this push:
     new 8a232ac  FREEMARKER-195 [freemarker-generator] Cleanup code and 
examples
8a232ac is described below

commit 8a232ac6306f415543f4ffcff8905bfdcd40dcd8
Author: Siegfried Goeschl <siegfried.goes...@gmail.com>
AuthorDate: Tue Oct 5 09:05:12 2021 +0200

    FREEMARKER-195 [freemarker-generator] Cleanup code and examples
---
 .../src/app/examples/templates/datasources.ftl     | 51 +++++++++++++---------
 .../freemarker/generator/cli/ManualTest.java       |  6 +--
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git 
a/freemarker-generator-cli/src/app/examples/templates/datasources.ftl 
b/freemarker-generator-cli/src/app/examples/templates/datasources.ftl
index 32d58b5..440ea61 100644
--- a/freemarker-generator-cli/src/app/examples/templates/datasources.ftl
+++ b/freemarker-generator-cli/src/app/examples/templates/datasources.ftl
@@ -1,4 +1,3 @@
-<#ftl output_format="plainText" strip_whitespace=true>
 <#--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -15,58 +14,68 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-Support FreeMarker Directives
+Support Of FreeMarker Directives
 ==============================================================================
 dataSources?has_content: ${dataSources?has_content?c}
 dataSources?size: ${dataSources?size}
 
-Use FTL Array-style Access
+Iterate Over DataSources Using Array-style Access
 ==============================================================================
 <#if dataSources?has_content>
-dataSources[0]: ${dataSources[0].name}
+<#list 0..dataSources?size-1 as i>
+- dataSource[${i}] ==> ${dataSources[i].name}
+</#list>
 <#else>
 No data sources provided ...
 </#if>
 
-Iterate Over DataSources as List
+Iterate Over DataSources Using Sequence
 ==============================================================================
 <#list dataSources as dataSource>
-- dataSource[${dataSource?index}] => ${dataSource.name}<#lt>
+- dataSource[${dataSource?index}] => ${dataSource.name}
+<#else>
+No data sources provided ...
 </#list>
 
-Iterate Over DataSources as Map
+Iterate Over DataSources Using Key & Values
 ==============================================================================
 <#list dataSources as name, dataSource>
 - dataSource["${name}"] => ${dataSource.name}<#lt>
+<#else>
+No data sources provided ...
 </#list>
 
-Iterate Over DataSources as Values
+Iterate Over DataSources Using Values
 ==============================================================================
 <#list dataSources?values as dataSource>
-- dataSource[${dataSource?index}] => ${dataSource.name}<#lt>
+- dataSource[${dataSource?index}] => ${dataSource.name}
+<#else>
+No data sources provided ...
 </#list>
 
-Get Document Names As Keys
+Iterate Over DataSources Using Hash Map Keys
 ==============================================================================
-<#list dataSources?keys as name>
-- ${name}<#lt>
+<#list dataSources?keys as key>
+- dataSource["${key}"] => ${dataSources[key].name}
+<#else>
+No data sources provided ...
 </#list>
 
-Access Underlying DataSources API
-==============================================================================
-DataSources.getNames(): ${dataSources?api.names?size}
-DataSources.getGroups(): ${dataSources?api.getGroups()?size}
-DataSources.find(): ${dataSources?api.find("*")?size}
-
 Iterate Over DataSources Using Wildcard Search
 ==============================================================================
-<#if dataSources?has_content>
 <#list dataSources?api.find("*") as dataSource>
 - ${dataSource.name}
-</#list>
 <#else>
 No data sources provided ...
-</#if>
+</#list>
+
+Access Underlying DataSources API
+==============================================================================
+DataSources.getNames(): ${dataSources?api.names?size}
+DataSources.getGroups(): ${dataSources?api.getGroups()?size}
+DataSources.find("*"): ${dataSources?api.find("*")?size}
+DataSources.find("uri", "*.md"): ${dataSources?api.find("uri", "*.md")?size}
+DataSources.find("extension", "md"): ${dataSources?api.find("extension", 
"md")?size}
 
 <#if dataSources?has_content>
 <#list dataSources as dataSource>
diff --git 
a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java
 
b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java
index 64705a0..2f1596b 100644
--- 
a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java
+++ 
b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java
@@ -25,10 +25,8 @@ public class ManualTest extends AbstractMainTest {
 
     // private static final String CMD = "-V";
     private static final String CMD =
-            "-M generate " +
-                    "-o target/out " +
-                    "-t freemarker-generator/csv/html/transform.ftl " +
-                    "src/app/examples/data/csv";
+            "-t src/app/examples/templates/datasources.ftl 
readme:documentation=README.md src/main/assembly";
+            // "-t src/app/examples/templates/datasources.ftl";
 
     @Override
     public String execute(String commandLine) throws IOException {