This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-142
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-142 by this push:
new 51ab85d FREEMARKER-142 First draft of supporting multiple templates
on the command line
51ab85d is described below
commit 51ab85d97dba184cd4845881106707b4d489fc0b
Author: Siegfried Goeschl <[email protected]>
AuthorDate: Sun May 17 09:17:52 2020 +0200
FREEMARKER-142 First draft of supporting multiple templates on the command
line
---
.../template/TemplateProcessingInfoSupplier.java | 10 +++++-
.../TemplateProcessingInfoSupplierTest.java | 36 +++++++++-------------
.../template/TemplateSourceFactoryTest.java | 5 +--
3 files changed, 26 insertions(+), 25 deletions(-)
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateProcessingInfoSupplier.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateProcessingInfoSupplier.java
index 8ed7e32..4c6a42e 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateProcessingInfoSupplier.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateProcessingInfoSupplier.java
@@ -30,11 +30,19 @@ public class TemplateProcessingInfoSupplier implements
Supplier<List<TemplatePro
/** Optional user-supplied writer */
private final Writer writer;
- public TemplateProcessingInfoSupplier(Collection<String> sources, String
include, String exclude, File out, Writer writer) {
+ public TemplateProcessingInfoSupplier(Collection<String> sources, String
include, String exclude, File out) {
this.sources = new ArrayList<>(sources);
this.include = include;
this.exclude = exclude;
this.out = out;
+ this.writer = null;
+ }
+
+ public TemplateProcessingInfoSupplier(Collection<String> sources, String
include, String exclude, Writer writer) {
+ this.sources = new ArrayList<>(sources);
+ this.include = include;
+ this.exclude = exclude;
+ this.out = null;
this.writer = writer;
}
diff --git
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateProcessingInfoSupplierTest.java
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateProcessingInfoSupplierTest.java
index a1559e5..129fd71 100644
---
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateProcessingInfoSupplierTest.java
+++
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateProcessingInfoSupplierTest.java
@@ -21,7 +21,6 @@ import
org.apache.freemarker.generator.base.template.TemplateProcessingInfoSuppl
import org.junit.Test;
import java.io.File;
-import java.io.StringWriter;
import java.util.Collections;
import java.util.List;
@@ -30,19 +29,17 @@ import static org.junit.Assert.assertNotNull;
public class TemplateProcessingInfoSupplierTest {
+ private static final File ROOT_DIR = new File("./target/out");
private static final String ANY_TEMPLATE_FILE_NAME =
"src/test/template/application.properties";
private static final String ANY_TEMPLATE_PATH = "template/info.ftl";
private static final String ANY_TEMPLATE_DIRECTORY_NAME =
"src/test/template";
+ private static final String NO_INCLUDE = null;
+ private static final String NO_EXCLUDE = null;
+
@Test
public void shouldCreateFromTemplateFile() {
- final TemplateProcessingInfoSupplier supplier = new
TemplateProcessingInfoSupplier(
- Collections.singleton(ANY_TEMPLATE_FILE_NAME),
- null,
- null,
- null,
- new StringWriter(1024));
-
+ final TemplateProcessingInfoSupplier supplier =
supplier(ANY_TEMPLATE_FILE_NAME);
final List<TemplateProcessingInfo> templateProcessingInfos =
supplier.get();
@@ -52,13 +49,7 @@ public class TemplateProcessingInfoSupplierTest {
@Test
public void shouldCreateFromTemplatePath() {
- final TemplateProcessingInfoSupplier supplier = new
TemplateProcessingInfoSupplier(
- Collections.singleton(ANY_TEMPLATE_PATH),
- null,
- null,
- null,
- new StringWriter(1024));
-
+ final TemplateProcessingInfoSupplier supplier =
supplier(ANY_TEMPLATE_PATH);
final List<TemplateProcessingInfo> templateProcessingInfos =
supplier.get();
@@ -68,13 +59,7 @@ public class TemplateProcessingInfoSupplierTest {
@Test
public void shouldCreateFromTemplateDirectory() {
- final TemplateProcessingInfoSupplier supplier = new
TemplateProcessingInfoSupplier(
- Collections.singleton(ANY_TEMPLATE_DIRECTORY_NAME),
- null,
- null,
- new File("."),
- null);
-
+ final TemplateProcessingInfoSupplier supplier =
supplier(ANY_TEMPLATE_DIRECTORY_NAME);
final List<TemplateProcessingInfo> templateProcessingInfos =
supplier.get();
@@ -82,4 +67,11 @@ public class TemplateProcessingInfoSupplierTest {
assertEquals(2, templateProcessingInfos.size());
}
+ private TemplateProcessingInfoSupplier supplier(String source) {
+ return new TemplateProcessingInfoSupplier(
+ Collections.singleton(source),
+ NO_INCLUDE,
+ NO_EXCLUDE,
+ ROOT_DIR);
+ }
}
diff --git
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateSourceFactoryTest.java
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateSourceFactoryTest.java
index 50a60d6..1d84c90 100644
---
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateSourceFactoryTest.java
+++
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateSourceFactoryTest.java
@@ -19,6 +19,7 @@ package org.apache.freemarker.generator.template;
import org.apache.freemarker.generator.base.template.TemplateSource;
import org.apache.freemarker.generator.base.template.TemplateSource.Origin;
import org.apache.freemarker.generator.base.template.TemplateSourceFactory;
+import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -65,7 +66,7 @@ public class TemplateSourceFactoryTest {
}
@Test
- // @Ignore("Requires internet access")
+ @Ignore("Requires internet access")
public void shouldCreateFromUrl() {
final TemplateSource templateSource =
TemplateSourceFactory.create(ANY_URL);
@@ -76,7 +77,7 @@ public class TemplateSourceFactoryTest {
}
@Test
- // @Ignore("Requires internet access")
+ @Ignore("Requires internet access")
public void shouldCreateFromNamedUri() {
final TemplateSource templateSource =
TemplateSourceFactory.create(ANY_NAMED_URI);
