[freemarker-generator] branch FREEMARKER-148 updated (4a106bd -> 9cea3f1)

[sg...@apache.org]

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 4a106bd  FREEMARKER-148 Align camel-case naming
     add f42e3ac  FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like
     add 9cea3f1  FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like

No new revisions were added by this update.

Summary of changes:
 .../generator/base/datasource/DataSource.java      | 64 +++++++++++++---------
 .../base/datasource/DataSourceFactory.java         | 16 ++----
 .../generator/base/datasource/DataSources.java     | 26 ++++++++-
 .../base/datasource/DataSourcesSupplier.java       |  4 +-
 .../generator/base/util/StringUtils.java           |  5 ++
 .../freemarker/generator/base/util/UriUtils.java   | 11 ++--
 .../datasource/DataSourceFactoryTest.java          |  8 +--
 .../generator/datasource/DataSourceTest.java       |  4 +-
 .../datasource/DataSourcesSupplierTest.java        |  8 +--
 .../generator/datasource/DataSourcesTest.java      | 21 ++++---
 .../examples/data/ftl/nginx/nginx.conf.ftl         |  2 +-
 .../templates/accesslog/combined-access.ftl        |  2 +-
 .../templates/csv/csv/gatling-user-credentials.ftl |  2 +-
 .../examples/templates/csv/fo/transactions.ftl     |  2 +-
 .../examples/templates/csv/fo/transform.ftl        |  2 +-
 .../examples/templates/csv/html/transactions.ftl   |  2 +-
 .../examples/templates/csv/md/filter.ftl           |  2 +-
 .../examples/templates/csv/shell/curl.ftl          |  2 +-
 .../examples/templates/dataframe/example.ftl       |  2 +-
 .../examples/templates/dataframe/html/print.ftl    |  2 +-
 .../examples/templates/demo.ftl                    | 20 ++-----
 .../examples/templates/excel/csv/custom.ftl        |  2 +-
 .../templates/excel/dataframe/transform.ftl        |  2 +-
 .../examples/templates/html/csv/dependencies.ftl   |  2 +-
 .../templates/json/csv/swagger-endpoints.ftl       |  2 +-
 .../templates/json/dataframe/github-users.ftl      |  2 +-
 .../examples/templates/json/md/github-users.ftl    |  2 +-
 .../templates/properties/csv/locker-test-users.ftl |  2 +-
 .../examples/templates/tsv/fo/transactions.ftl     |  2 +-
 .../examples/templates/xml/txt/recipients.ftl      |  2 +-
 .../examples/templates/yaml/txt/transform.ftl      |  2 +-
 .../cli/config/ConfigurationSupplier.java          |  4 ++
 .../generator/cli/model/DataSourcesModel.java      | 52 +++++++-----------
 .../cli/model/GeneratorObjectWrapper.java          |  3 +-
 .../src/site/markdown/cli/concepts/data-sources.md |  4 +-
 .../site/markdown/cli/usage/running-examples.md    | 32 +++++------
 .../site/markdown/cli/usage/using-dataframes.md    |  6 +-
 .../freemarker/generator/cli/ExamplesTest.java     | 36 ++++--------
 .../freemarker/generator/cli/ManualTest.java       |  2 +-
 .../src/test/templates/manual.ftl                  |  2 +-
 .../src/test/templates/tools/csv.ftl               |  2 +-
 freemarker-generator-cli/templates/cat.ftl         |  2 +-
 .../templates/csv/csv/transform.ftl                |  2 +-
 .../templates/csv/html/transform.ftl               |  2 +-
 .../templates/csv/md/transform.ftl                 |  2 +-
 .../templates/excel/csv/transform.ftl              |  2 +-
 .../templates/excel/html/transform.ftl             |  2 +-
 .../templates/excel/md/transform.ftl               |  2 +-
 freemarker-generator-cli/templates/info.ftl        |  6 +-
 .../templates/json/yaml/transform.ftl              |  2 +-
 .../templates/yaml/json/transform.ftl              |  2 +-
 51 files changed, 202 insertions(+), 192 deletions(-)