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/08/04 20:26:27 UTC
[freemarker-generator] branch FREEMARKER-153 updated:
FREEMARKER-153 Cleanup code
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-153
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-153 by this push:
new c9c58cd FREEMARKER-153 Cleanup code
c9c58cd is described below
commit c9c58cdba6a42678d85185ebffd7516cce27cf74
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Tue Aug 4 22:26:14 2020 +0200
FREEMARKER-153 Cleanup code
---
.../generator/base/template/TemplateTransformationsBuilder.java | 4 +++-
.../generator/template/TemplateTransformationsBuilderTest.java | 7 ++++---
.../java/org/apache/freemarker/generator/cli/config/Suppliers.java | 3 ++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java
index c738670..5411152 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java
+++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java
@@ -16,6 +16,8 @@
*/
package org.apache.freemarker.generator.base.template;
+import org.apache.freemarker.generator.base.FreeMarkerConstants;
+import org.apache.freemarker.generator.base.FreeMarkerConstants.Location;
import org.apache.freemarker.generator.base.file.RecursiveFileSupplier;
import org.apache.freemarker.generator.base.util.NonClosableWriterWrapper;
import org.apache.freemarker.generator.base.util.StringUtils;
@@ -217,7 +219,7 @@ public class TemplateTransformationsBuilder {
}
private List<TemplateTransformation> resolveTemplateCode(String source, File out) {
- final TemplateSource templateSource = TemplateSource.fromCode("interactive", source);
+ final TemplateSource templateSource = TemplateSource.fromCode(Location.INTERACTIVE, source);
final TemplateOutput templateOutput = templateOutput(out);
return singletonList(new TemplateTransformation(templateSource, templateOutput));
}
diff --git a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateTransformationsBuilderTest.java b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateTransformationsBuilderTest.java
index 3cc0545..0c082a0 100644
--- a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateTransformationsBuilderTest.java
+++ b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateTransformationsBuilderTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.freemarker.generator.template;
+import org.apache.freemarker.generator.base.FreeMarkerConstants.Location;
import org.apache.freemarker.generator.base.template.TemplateOutput;
import org.apache.freemarker.generator.base.template.TemplateSource;
import org.apache.freemarker.generator.base.template.TemplateSource.Origin;
@@ -42,7 +43,7 @@ public class TemplateTransformationsBuilderTest {
@Test
public void shouldCreateFromInteractiveTemplate() {
final TemplateTransformations transformations = builder()
- .setTemplate("interactive", "Hello World")
+ .setTemplate(Location.INTERACTIVE, "Hello World")
.setStdOut()
.build();
@@ -51,7 +52,7 @@ public class TemplateTransformationsBuilderTest {
final TemplateSource templateSource = transformations.get(0).getTemplateSource();
final TemplateOutput templateOutput = transformations.get(0).getTemplateOutput();
- assertEquals("interactive", templateSource.getName());
+ assertEquals(Location.INTERACTIVE, templateSource.getName());
assertEquals(Origin.CODE, templateSource.getOrigin());
assertEquals("Hello World", templateSource.getCode());
assertNull(templateSource.getPath());
@@ -64,7 +65,7 @@ public class TemplateTransformationsBuilderTest {
@Test(expected = IllegalArgumentException.class)
public void shouldThrowIllegalArgumentExceptionWheMixingInteractiveTemplateWithSources() {
builder()
- .setTemplate("interactive", "Hello World")
+ .setTemplate(Location.INTERACTIVE, "Hello World")
.addSource(ANY_TEMPLATE_FILE_NAME)
.setStdOut()
.build();
diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Suppliers.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Suppliers.java
index 6412b4d..251079f 100644
--- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Suppliers.java
+++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Suppliers.java
@@ -17,6 +17,7 @@
package org.apache.freemarker.generator.cli.config;
import freemarker.cache.TemplateLoader;
+import org.apache.freemarker.generator.base.FreeMarkerConstants.Location;
import org.apache.freemarker.generator.base.datasource.DataSourcesSupplier;
import org.apache.freemarker.generator.base.file.PropertiesClassPathSupplier;
import org.apache.freemarker.generator.base.file.PropertiesFileSystemSupplier;
@@ -69,7 +70,7 @@ public class Suppliers {
public static TemplateTransformationsSupplier templateTransformationsSupplier(Settings settings) {
return () -> TemplateTransformationsBuilder.builder()
- .setTemplate("interactive", settings.getInteractiveTemplate())
+ .setTemplate(Location.INTERACTIVE, settings.getInteractiveTemplate())
.addSources(settings.getTemplates())
.addInclude(settings.getTemplateFileIncludePattern())
.addExclude(settings.getTemplateFileExcludePattern())