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/02/29 00:06:11 UTC

[freemarker-generator] 03/06: FREEMARKER-135 Support user-supplied names for datasources

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

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

commit 06a2db9ebc4ba806c9e5bb50b7084204ffd7d586
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Fri Feb 28 22:58:12 2020 +0100

    FREEMARKER-135 Support user-supplied names for datasources
---
 .../activation/MimetypesFileTypeMapFactory.java    | 41 ++++++++++++++++++++++
 .../base/datasource/DatasourceFactory.java         |  2 ++
 2 files changed, 43 insertions(+)

diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/activation/MimetypesFileTypeMapFactory.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/activation/MimetypesFileTypeMapFactory.java
new file mode 100644
index 0000000..3623bc5
--- /dev/null
+++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/activation/MimetypesFileTypeMapFactory.java
@@ -0,0 +1,41 @@
+/*
+ * 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.base.activation;
+
+import javax.activation.MimetypesFileTypeMap;
+
+public class MimetypesFileTypeMapFactory {
+
+    private static MimetypesFileTypeMap mimeTypes;
+
+    public static synchronized MimetypesFileTypeMap create() {
+        if (mimeTypes == null) {
+            mimeTypes = new MimetypesFileTypeMap();
+            mimeTypes.addMimeTypes("application/json json JSON");
+            mimeTypes.addMimeTypes("application/octet-stream bin");
+            mimeTypes.addMimeTypes("application/vnd.ms-excel xls XLS");
+            mimeTypes.addMimeTypes("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx XLSX");
+            mimeTypes.addMimeTypes("application/xml xml XML");
+            mimeTypes.addMimeTypes("text/csv csv CSV");
+            mimeTypes.addMimeTypes("text/plain properties");
+            mimeTypes.addMimeTypes("text/yaml yml yaml YML YAML");
+        }
+
+        return mimeTypes;
+    }
+}
\ No newline at end of file
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DatasourceFactory.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DatasourceFactory.java
index 08af5df..6f8571c 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DatasourceFactory.java
+++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DatasourceFactory.java
@@ -19,6 +19,7 @@ package org.apache.freemarker.generator.base.datasource;
 import org.apache.freemarker.generator.base.FreeMarkerConstants.Location;
 import org.apache.freemarker.generator.base.activation.ByteArrayDataSource;
 import org.apache.freemarker.generator.base.activation.InputStreamDataSource;
+import org.apache.freemarker.generator.base.activation.MimetypesFileTypeMapFactory;
 import org.apache.freemarker.generator.base.activation.StringDataSource;
 
 import javax.activation.DataSource;
@@ -56,6 +57,7 @@ public class DatasourceFactory {
 
     public static Datasource create(String name, File file, Charset charset) {
         final FileDataSource dataSource = new FileDataSource(file);
+        dataSource.setFileTypeMap(MimetypesFileTypeMapFactory.create());
         return create(name, dataSource, file.getAbsolutePath(), charset);
     }