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 2021/02/05 18:03:41 UTC
[freemarker-generator] branch FREEMARKER-172 updated:
FREEMARKER-172 [freemarker-generator] Store the data sources directly as
map in the FreeMarker context
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-172
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-172 by this push:
new dcaec24 FREEMARKER-172 [freemarker-generator] Store the data sources directly as map in the FreeMarker context
dcaec24 is described below
commit dcaec2495f64298b5614e264928792361971e39d
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Fri Feb 5 19:03:22 2021 +0100
FREEMARKER-172 [freemarker-generator] Store the data sources directly as map in the FreeMarker context
---
.../org/apache/freemarker/generator/base/datasource/DataSources.java | 1 -
.../freemarker/generator/base/mime/MimetypesFileTypeMapFactory.java | 4 ++--
.../apache/freemarker/generator/cli/config/ConfigurationSupplier.java | 4 ++--
.../apache/freemarker/generator/cli/model/GeneratorObjectWrapper.java | 3 ++-
.../java/org/apache/freemarker/generator/cli/task/FreeMarkerTask.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
index b95f100..4df5c0c 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
+++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
@@ -26,7 +26,6 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.stream.Collectors;
import static java.util.function.Function.identity;
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/mime/MimetypesFileTypeMapFactory.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/mime/MimetypesFileTypeMapFactory.java
index 56e9efa..f8bbf2a 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/mime/MimetypesFileTypeMapFactory.java
+++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/mime/MimetypesFileTypeMapFactory.java
@@ -46,7 +46,7 @@ public class MimetypesFileTypeMapFactory {
mimeTypes.addMimeTypes(MIME_APPLICATION_XML + " xml XML");
mimeTypes.addMimeTypes(MIME_APPLICATION_XHTML + " xhtml XHTML");
mimeTypes.addMimeTypes(MIME_TEXT_CSV + " csv CSV");
- mimeTypes.addMimeTypes(MIME_TEXT_PLAIN + " adoc ADOC bat BAT env ENV ftl FTL ini INI log LOG properties txt TXT");
+ mimeTypes.addMimeTypes(MIME_TEXT_PLAIN + " adoc ADOC bat BAT env ENV ftl FTL ini INI log LOG properties PROPERTIES txt TXT");
mimeTypes.addMimeTypes(MIME_TEXT_HTML + " htm HTM html HTML");
mimeTypes.addMimeTypes(MIME_TEXT_MARKDOWM + " md MD");
mimeTypes.addMimeTypes(MIME_TEXT_RTF + " rtf RTF");
@@ -56,4 +56,4 @@ public class MimetypesFileTypeMapFactory {
return mimeTypes;
}
-}
\ No newline at end of file
+}
diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/ConfigurationSupplier.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/ConfigurationSupplier.java
index 60c7743..9c165a3 100644
--- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/ConfigurationSupplier.java
+++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/ConfigurationSupplier.java
@@ -55,8 +55,8 @@ public class ConfigurationSupplier implements Supplier<Configuration> {
// apply all "freemarker.configuration.setting" values
configuration.setSettings(freeMarkerConfigurationSettings());
- // provide custom models for "DataSources"
- configuration.setObjectWrapper(new GeneratorObjectWrapper(FREEMARKER_VERSION));
+ // TODO sgoeschl 2021-02-05 Probably not needed at all
+ // configuration.setObjectWrapper(new "dataSources"(FREEMARKER_VERSION));
// override current configuration with caller-provided settings
configuration.setDefaultEncoding(settings.getTemplateEncoding().name());
diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/model/GeneratorObjectWrapper.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/model/GeneratorObjectWrapper.java
index 921722c..6ed0d39 100644
--- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/model/GeneratorObjectWrapper.java
+++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/model/GeneratorObjectWrapper.java
@@ -25,7 +25,8 @@ import org.apache.freemarker.generator.base.datasource.DataSources;
/**
* Custom FreeMarker object wrapper to expose <code>DataSources</code>
- * as <code>Map</code> in the FreeMarker data model.
+ * as <code>Map</code> in the FreeMarker data model. Please note that
+ * this hides ALL operation exposed by "DataSources".
*/
public class GeneratorObjectWrapper extends DefaultObjectWrapper {
diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/task/FreeMarkerTask.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/task/FreeMarkerTask.java
index 1fe6f57..d202786 100644
--- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/task/FreeMarkerTask.java
+++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/task/FreeMarkerTask.java
@@ -116,7 +116,7 @@ public class FreeMarkerTask implements Callable<Integer> {
private static Map<String, Object> toTemplateDataModel(DataSources dataSources, Map<String, Object>... maps) {
final Map<String, Object> result = new HashMap<>();
Arrays.stream(maps).forEach(result::putAll);
- result.put(Model.DATASOURCES, dataSources);
+ result.put(Model.DATASOURCES, dataSources.toMap());
return result;
}