This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch FREEMARKER-154
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git.
from 52469b8 Switched all examples to use [docgen.insertWithOutput]. Also
upgraded to use latest Docgen.
add 0695c04 FREEMARKER-161 [freemarker-generator] Replace any
"freemarker-cli" invocation with "freemarker-generator"
add 652fa4d FREEMARKER-161 [freemarker-generator] Update documentation to
be in sync with previous refactorings
add 5a0a6eb FREEMARKER-161 [freemarker-generator] Update documentation to
be in sync with previous refactorings
add 14bbb5e FREEMARKER-161 [freemarker-generator] Allow multiple
transformations on the CLI (#25)
add 4962dcb FREEMARKER-156 [freemarker-generator] The Maven plugin unit
tests failed randomly (#26)
add f0bae9a FREEMARKER-172 [freemarker-generator] Refactor
DataSourceFactory (#27)
add 27fd68c FREEMARKER-173 [freemarker-generator] Allow to pass arbitrary
key/value pairs to DataSource when using NamedURIs (#29)
add 30c603d FREEMARKER-174 [freemarker-generator] Don't expose
"DataSources" in the FreeMarker context (#30)
add 6798f2c FREEMARKER-175 [freemarker-generator] Use latest FreeMarker
version (#31)
add 09e0315 FREEMARKER-176 [freemarker-generator] Running examples on
Windows fails (#32)
new 3c6c41a Merge remote-tracking branch 'origin/master' into
FREEMARKER-154. (This also includes applying changes in the md-s on the
DocBook, for the parts that were already in the DocBook.)
The 1 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:
NOTICE | 2 +-
.../generator/base/datasource/DataSource.java | 119 +++++--
.../base/datasource/DataSourceFactory.java | 177 ++++-----
.../DataSourceLoader.java} | 33 +-
.../base/datasource/DataSourceLoaderFactory.java | 44 +++
.../generator/base/datasource/DataSources.java | 22 +-
.../base/datasource/DataSourcesSupplier.java | 36 +-
.../datasource/loader/DefaultDataSourceLoader.java | 55 +++
.../loader/EnvironmentDataSourceLoader.java | 69 ++++
.../datasource/loader/FileDataSourceLoader.java | 51 +++
.../datasource/loader/HttpDataSourceLoader.java | 64 ++++
.../generator/base/file/RecursiveFileSupplier.java | 2 +-
.../base/mime/MimetypesFileTypeMapFactory.java | 4 +-
.../OutputGenerator.java} | 37 +-
.../generator/base/template/TemplateOutput.java | 41 +--
.../generator/base/template/TemplateSource.java | 20 +-
.../base/template/TemplateSourceFactory.java | 40 ---
.../base/template/TemplateTransformation.java | 2 +-
.../base/template/TemplateTransformations.java | 47 ---
.../template/TemplateTransformationsBuilder.java | 178 ++++-----
.../generator/base/tools/ToolsFactory.java | 3 +-
.../freemarker/generator/base/uri/NamedUri.java | 94 +++--
.../freemarker/generator/base/util/ListUtils.java | 21 --
.../freemarker/generator/base/util/MapBuilder.java | 8 +-
.../generator/base/util/MapFlattener.java | 140 --------
.../{CachingSupplier.java => OperatingSystem.java} | 25 +-
.../generator/base/util/PropertiesFactory.java | 13 +
.../generator/base/util/PropertiesTransformer.java | 12 -
.../freemarker/generator/base/util/UriUtils.java | 21 +-
.../src/test/data/txt/utf16.txt | Bin 0 -> 362 bytes
.../src/test/data/txt}/utf8.txt | 2 +
.../datasource/DataSourceFactoryTest.java | 69 +---
.../generator/datasource/DataSourceLoaderTest.java | 189 ++++++++++
.../generator/datasource/DataSourceTest.java | 42 ++-
.../datasource/DataSourcesSupplierTest.java | 48 ++-
.../generator/datasource/DataSourcesTest.java | 95 ++---
.../generator/file/RecursiveFileSupplierTest.java | 6 +-
.../template/TemplateSourceFactoryTest.java | 88 -----
.../TemplateTransformationsBuilderTest.java | 132 ++++---
.../generator/uri/NamedUriStringParserTest.java | 9 +-
.../generator/util/MapFlattenerTest.java | 43 ---
.../generator/util/PropertiesTransformerTest.java | 4 -
freemarker-generator-cli/CHANGELOG.md | 26 +-
freemarker-generator-cli/LICENSE | 6 +
freemarker-generator-cli/pom.xml | 8 +-
.../examples/templates/datasources.ftl} | 78 ++--
.../src/app/examples/templates/demo.ftl | 5 +-
.../examples/templates/javafaker/csv/testdata.ftl | 16 +-
.../src/app/scripts/run-examples.bat | 14 +-
.../src/app/scripts/run-examples.sh | 14 +-
.../app/templates/freemarker-generator/info.ftl | 22 +-
.../freemarker-generator/lib/commons-csv.ftl | 18 +
.../org/apache/freemarker/generator/cli/Main.java | 156 +++-----
.../cli/config/ConfigurationSupplier.java | 25 +-
.../generator/cli/config/DataModelSupplier.java | 11 +-
.../cli/config/OutputGeneratorsSupplier.java | 142 ++++++++
.../freemarker/generator/cli/config/Settings.java | 298 ++++++----------
.../freemarker/generator/cli/config/Suppliers.java | 42 +--
.../generator/cli/config/ToolsSupplier.java | 13 +-
.../generator/cli/model/DataSourcesModel.java | 40 ---
.../cli/model/GeneratorObjectWrapper.java | 25 --
.../generator/cli/picocli/DataModelDefinition.java | 23 +-
.../cli/picocli/DataSourceDefinition.java | 16 +-
.../cli/picocli/OutputGeneratorDefinition.java | 110 ++++++
.../cli/picocli/TemplateOutputDefinition.java | 22 +-
.../cli/picocli/TemplateSourceDefinition.java | 23 +-
.../picocli/TemplateSourceFilterDefinition.java | 24 +-
.../generator/cli/task/FreeMarkerTask.java | 164 ++++-----
.../markdown/cli/advanced/cli-configuration.md | 9 +-
.../src/site/markdown/cli/concepts/data-sources.md | 271 ++++++++++++--
.../src/site/markdown/cli/concepts/design-goals.md | 1 +
.../src/site/markdown/cli/concepts/named-uris.md | 126 ++++++-
.../src/site/markdown/cli/concepts/passing-data.md | 2 +-
.../site/markdown/cli/concepts/template-loading.md | 22 +-
.../src/site/markdown/cli/concepts/tools.md | 33 +-
.../site/markdown/cli/concepts/transformation.md | 38 +-
.../markdown/cli/introduction/getting-started.md | 50 ++-
.../site/markdown/cli/usage/generating-testdata.md | 44 ++-
.../site/markdown/cli/usage/transforming-csv.md | 6 +-
.../markdown/cli/usage/transforming-directories.md | 56 ++-
.../site/markdown/cli/usage/using-dataframes.md | 18 +-
.../src/site/markdown/index.md | 4 +-
.../src/test/data/encoding/utf16.txt | Bin 174 -> 362 bytes
.../src/test/data/encoding/utf8.txt | 2 +
.../freemarker/generator/cli/ExamplesTest.java | 31 +-
.../freemarker/generator/cli/ManualTest.java | 2 +-
.../freemarker/generator/cli/PicocliTest.java | 111 ++++--
.../cli/config/ConfigurationSupplierTest.java | 7 +-
.../generator/cli/config/SettingsTest.java | 86 -----
.../generator/cli/config/SuppliersTest.java | 154 ++++++++
.../src/test/templates/manual.ftl | 65 ++--
freemarker-generator-maven-plugin/CHANGELOG.md | 6 +-
freemarker-generator-maven-plugin/pom.xml | 37 +-
.../generator/maven/ConfigurationSupplier.java | 72 ++++
.../freemarker/generator/maven/FactoryUtil.java | 50 ---
.../freemarker/generator/maven/FreeMarkerMojo.java | 44 +--
.../generator/maven/GeneratingFileVisitor.java | 11 +-
.../generator/maven/JsonPropertiesProvider.java | 1 -
.../generator/maven/OutputGenerator.java | 4 +-
.../maven/OutputGeneratorPropertiesProvider.java | 1 -
.../data/mydir/invalid-json.json | 1 +
.../generator/maven/ConfigurationSupplierTest.java | 54 +++
.../generator/maven/FreeMarkerMojoTest.java | 396 ++++++---------------
.../generator/maven/GeneratingFileVisitorTest.java | 219 +++++-------
.../maven/JsonPropertiesProviderTest.java | 126 +++----
.../generator/maven/OperatingSystem.java | 24 --
.../generator/maven/OutputGeneratorTest.java | 242 +++++--------
.../freemarker/generator/maven/UnitTestHelper.java | 67 ++++
freemarker-generator-tools/pom.xml | 8 +-
.../generator/tools/commonscsv/CommonsCSVTool.java | 2 +-
.../tools/dataframe/DataFrameToolTest.java | 9 +-
.../src/main/docgen/book.xml | 105 +++---
licences/LICENCE_javafaker.txt | 13 +
pom.xml | 5 +
114 files changed, 3344 insertions(+), 2739 deletions(-)
copy
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/{util/CachingSupplier.java
=> datasource/DataSourceLoader.java} (62%)
create mode 100644
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceLoaderFactory.java
create mode 100644
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/loader/DefaultDataSourceLoader.java
create mode 100644
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/loader/EnvironmentDataSourceLoader.java
create mode 100644
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/loader/FileDataSourceLoader.java
create mode 100644
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/loader/HttpDataSourceLoader.java
copy
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/{template/TemplateTransformation.java
=> output/OutputGenerator.java} (57%)
delete mode 100644
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateSourceFactory.java
delete mode 100644
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformations.java
delete mode 100644
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/MapFlattener.java
copy
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/{CachingSupplier.java
=> OperatingSystem.java} (65%)
create mode 100755 freemarker-generator-base/src/test/data/txt/utf16.txt
copy {freemarker-generator-cli/src/test/data/encoding =>
freemarker-generator-base/src/test/data/txt}/utf8.txt (51%)
create mode 100644
freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceLoaderTest.java
delete mode 100644
freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateSourceFactoryTest.java
delete mode 100644
freemarker-generator-base/src/test/java/org/apache/freemarker/generator/util/MapFlattenerTest.java
copy freemarker-generator-cli/src/{test/templates/manual.ftl =>
app/examples/templates/datasources.ftl} (52%)
create mode 100644
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/OutputGeneratorsSupplier.java
delete mode 100644
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/model/DataSourcesModel.java
delete mode 100644
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/model/GeneratorObjectWrapper.java
copy
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/ClosableUtils.java
=>
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/DataModelDefinition.java
(67%)
rename
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsSupplier.java
=>
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/DataSourceDefinition.java
(65%)
create mode 100644
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputGeneratorDefinition.java
copy
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/ClosableUtils.java
=>
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateOutputDefinition.java
(68%)
copy
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/CachingSupplier.java
=>
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateSourceDefinition.java
(62%)
copy
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/CachingSupplier.java
=>
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateSourceFilterDefinition.java
(61%)
delete mode 100644
freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/SettingsTest.java
create mode 100644
freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/SuppliersTest.java
create mode 100644
freemarker-generator-maven-plugin/src/main/java/org/apache/freemarker/generator/maven/ConfigurationSupplier.java
delete mode 100644
freemarker-generator-maven-plugin/src/main/java/org/apache/freemarker/generator/maven/FactoryUtil.java
create mode 100644
freemarker-generator-maven-plugin/src/test/data/generating-file-visitor/data/mydir/invalid-json.json
create mode 100644
freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/ConfigurationSupplierTest.java
delete mode 100644
freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/OperatingSystem.java
create mode 100644
freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/UnitTestHelper.java
create mode 100644 licences/LICENCE_javafaker.txt
