You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by sg...@apache.org on 2020/07/05 08:35:00 UTC
[freemarker-generator] branch FREEMARKER-148 updated (261d6a1 ->
8f498f5)
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a change to branch FREEMARKER-148
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git.
from 261d6a1 FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like
new d85b723 FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like
add b27c6ba FREEMARKER-149 Support multiple template transformation on the command line (#17)
new a288c4e FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like
new fc5e117 FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like
new 8f498f5 FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../generator/base/datasource/DataSources.java | 2 +-
.../generator/base/file/RecursiveFileSupplier.java | 6 +-
.../generator/base/template/TemplateOutput.java | 8 +++
.../base/template/TemplateTransformation.java | 8 +++
.../template/TemplateTransformationsBuilder.java | 34 ++++++----
.../freemarker/generator/base/uri/NamedUri.java | 2 +-
.../freemarker/generator/base/util/ListUtils.java | 4 ++
freemarker-generator-cli/CHANGELOG.md | 10 ++-
freemarker-generator-cli/README.md | 29 ++++----
freemarker-generator-cli/pom.xml | 2 +
.../org/apache/freemarker/generator/cli/Main.java | 42 +++++++-----
.../freemarker/generator/cli/config/Settings.java | 30 ++++----
.../freemarker/generator/cli/config/Suppliers.java | 2 +-
.../markdown/cli/advanced/cli-configuration.md | 2 +-
.../site/markdown/cli/concepts/template-loading.md | 2 +-
.../site/markdown/cli/concepts/transformation.md | 74 ++++++++++++++++++--
.../markdown/cli/introduction/getting-started.md | 79 +++++++++++-----------
.../freemarker/generator/cli/ExamplesTest.java | 41 ++++++++++-
.../freemarker/generator/cli/ManualTest.java | 2 +-
.../freemarker/generator/cli/PicocliTest.java | 8 +++
.../generator/cli/config/SettingsTest.java | 5 +-
freemarker-generator-maven-plugin/pom.xml | 1 +
.../commonscsv/impl/CommonsCSVPrinterFacade.java | 16 +++++
.../generator/tools/excel/ExcelTool.java | 2 +-
.../tools/dataframe/DataFrameToolTest.java | 2 +-
pom.xml | 25 ++++++-
26 files changed, 312 insertions(+), 126 deletions(-)
[freemarker-generator] 03/04: FREEMARKER-148 Make usage of
"DataSources" more "Freemarker" like
Posted by sg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-148
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit fc5e1172f302714ed116f17cde6f667d892baf2e
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Sun Jul 5 09:45:47 2020 +0200
FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like
---
pom.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 45cb794..05fa956 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,12 @@
<developer>
<name>Siegfried Goeschl</name>
<organization>ASF</organization>
- <organizationUrl>https://github.com/sgoeschl</organizationUrl>
+ <organizationUrl>https://www.apache.org</organizationUrl>
+ </developer>
+ <developer>
+ <name>Daniel Dekany</name>
+ <organization>ASF</organization>
+ <organizationUrl>https://www.apache.org</organizationUrl>
</developer>
</developers>
[freemarker-generator] 04/04: FREEMARKER-148 Make usage of
"DataSources" more "Freemarker" like
Posted by sg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-148
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 8f498f52a8c47a6ef3bb4dc6e73aecf046fa5a7d
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Sun Jul 5 10:34:43 2020 +0200
FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like
---
freemarker-generator-cli/CHANGELOG.md | 2 ++
.../freemarker/generator/cli/ExamplesTest.java | 24 ++++++++++++++++++++++
freemarker-generator-maven-plugin/pom.xml | 1 +
.../commonscsv/impl/CommonsCSVPrinterFacade.java | 16 +++++++++++++++
pom.xml | 18 ++++++++++++++--
5 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/freemarker-generator-cli/CHANGELOG.md b/freemarker-generator-cli/CHANGELOG.md
index 70d43a1..6b03fc4 100644
--- a/freemarker-generator-cli/CHANGELOG.md
+++ b/freemarker-generator-cli/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. We try to a
## 0.1.0-SNAPSHOT
### Added
+* [FREEMARKER-148] Make usage of "DataSources" more "Freemarker" like
* [FREEMARKER-149] Support multiple template transformations on the command line
* [FREEMARKER-144] Proof Of Concept for providing DataFrames
* [FREEMARKER-142] Support Transformation Of Directories
@@ -41,4 +42,5 @@ All notable changes to this project will be documented in this file. We try to a
[FREEMARKER-144]: https://issues.apache.org/jira/browse/FREEMARKER-144
[FREEMARKER-146]: https://issues.apache.org/jira/browse/FREEMARKER-146
[FREEMARKER-147]: https://issues.apache.org/jira/browse/FREEMARKER-147
+[FREEMARKER-148]: https://issues.apache.org/jira/browse/FREEMARKER-148
[FREEMARKER-149]: https://issues.apache.org/jira/browse/FREEMARKER-149
\ No newline at end of file
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
index e66d457..308d0df 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
@@ -21,6 +21,7 @@ import org.junit.Test;
import java.io.IOException;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -139,6 +140,29 @@ public class ExamplesTest extends AbstractMainTest {
}
@Test
+ public void shouldSupportDataSourcesAccessInFTL() throws IOException {
+ final String args = "examples/data/json/github-users.json examples/data/csv/contract.csv";
+
+ // check FreeMarker directives
+ assertEquals("true", execute(args + " -i ${DataSources?has_content?c}"));
+ assertEquals("2", execute(args + " -i ${DataSources?size}"));
+
+ // check FTL array-style access
+ assertEquals("github-users.json", execute(args + " -i ${DataSources[0].name}"));
+ assertEquals("github-users.json", execute(args + " -i ${DataSources.get(0).name}"));
+
+ // check FTL map-style access
+ assertEquals("github-users.json", execute(args + " -i ${DataSources[\"github-users.json\"].name}"));
+ assertEquals("github-users.json", execute(args + " -i ${DataSources.get(\"github-users.json\").name}"));
+
+ // check arbitrary methods
+ assertEquals("false", execute(args + " -i ${DataSources.empty?c}"));
+ assertEquals("false", execute(args + " -i ${DataSources.isEmpty()?c}"));
+ assertEquals("2", execute(args + " -i ${DataSources.size()}"));
+ assertEquals("worx", execute(args + " -i ${DataSources.close()}worx"));
+ }
+
+ @Test
@Ignore("Manual test to check memory consumption and resource handling")
public void shouldCloseAllResources() throws IOException {
for (int i = 0; i < 500; i++) {
diff --git a/freemarker-generator-maven-plugin/pom.xml b/freemarker-generator-maven-plugin/pom.xml
index be360ec..30442ec 100644
--- a/freemarker-generator-maven-plugin/pom.xml
+++ b/freemarker-generator-maven-plugin/pom.xml
@@ -167,6 +167,7 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
+ <exclude>CHANGELOG.md</exclude>
<exclude>README.md</exclude>
<exclude>src/site/markdown/**/*.md</exclude>
<excludde>**/*.json</excludde>
diff --git a/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/commonscsv/impl/CommonsCSVPrinterFacade.java b/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/commonscsv/impl/CommonsCSVPrinterFacade.java
index c8e8ac5..9909d17 100644
--- a/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/commonscsv/impl/CommonsCSVPrinterFacade.java
+++ b/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/commonscsv/impl/CommonsCSVPrinterFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.freemarker.generator.tools.commonscsv.impl;
import org.apache.commons.csv.CSVFormat;
diff --git a/pom.xml b/pom.xml
index 05fa956..4e132e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,9 @@
<organization>ASF</organization>
<organizationUrl>https://www.apache.org</organizationUrl>
</developer>
+ <developer>
+ <name>Benjamin Jackson</name>
+ </developer>
</developers>
<dependencyManagement>
@@ -149,7 +152,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -169,7 +172,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
@@ -273,6 +276,17 @@
<linkXRef>false</linkXRef>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <id>default</id>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
</project>
\ No newline at end of file
[freemarker-generator] 02/04: FREEMARKER-148 Make usage of
"DataSources" more "Freemarker" like
Posted by sg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-148
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit a288c4e7b058d1825629199da08d8d7fac89f1a6
Merge: d85b723 b27c6ba
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Sun Jul 5 08:40:16 2020 +0200
FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like
.../generator/base/datasource/DataSources.java | 2 +-
.../generator/base/file/RecursiveFileSupplier.java | 6 +-
.../generator/base/template/TemplateOutput.java | 8 +++
.../base/template/TemplateTransformation.java | 8 +++
.../template/TemplateTransformationsBuilder.java | 34 ++++++----
.../freemarker/generator/base/uri/NamedUri.java | 2 +-
.../freemarker/generator/base/util/ListUtils.java | 4 ++
freemarker-generator-cli/CHANGELOG.md | 8 ++-
freemarker-generator-cli/README.md | 29 ++++----
freemarker-generator-cli/pom.xml | 2 +
.../org/apache/freemarker/generator/cli/Main.java | 42 +++++++-----
.../freemarker/generator/cli/config/Settings.java | 30 ++++----
.../freemarker/generator/cli/config/Suppliers.java | 2 +-
.../markdown/cli/advanced/cli-configuration.md | 2 +-
.../site/markdown/cli/concepts/template-loading.md | 2 +-
.../site/markdown/cli/concepts/transformation.md | 74 ++++++++++++++++++--
.../markdown/cli/introduction/getting-started.md | 79 +++++++++++-----------
.../freemarker/generator/cli/ExamplesTest.java | 17 ++++-
.../freemarker/generator/cli/ManualTest.java | 2 +-
.../freemarker/generator/cli/PicocliTest.java | 8 +++
.../generator/cli/config/SettingsTest.java | 5 +-
.../generator/tools/excel/ExcelTool.java | 2 +-
22 files changed, 246 insertions(+), 122 deletions(-)
[freemarker-generator] 01/04: FREEMARKER-148 Make usage of
"DataSources" more "Freemarker" like
Posted by sg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-148
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit d85b7230f16eb7026e80edd34abbef0ed942258a
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Sun Jul 5 08:36:10 2020 +0200
FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like
---
.../apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java
index 6965064..0e1d395 100644
--- a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java
+++ b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java
@@ -126,7 +126,7 @@ public class DataFrameToolTest {
assertNotNull(dataFrame.getColumn("Time"));
assertNotNull(dataFrame.getColumn("Percentage"));
assertNotNull(dataFrame.getColumn("Forumula"));
- assertEquals("Row 1", dataFrame.getValue(0,0));
+ assertEquals("Row 1", dataFrame.getValue(0, 0));
assertEquals("C3*F3", dataFrame.getColumn("Forumula").get(1));
}