This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a commit to branch FREEMARKER-188 in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit cf67373559bde06c6df2c782d59010b0cf8fc65a Author: Siegfried Goeschl <[email protected]> AuthorDate: Mon Sep 27 20:27:37 2021 +0200 FREEMARKER-188 Move some template seeding code to "freemarker-generator-cli" --- .../cli/config/output/TemplateSeedingOutputGenerator.java | 2 -- .../generator/cli/config/output}/TemplateTransformation.java | 5 ++++- .../cli/config/output}/TemplateTransformationsBuilder.java | 4 +++- .../src/test/data}/template/application.properties | 0 .../src/test/data}/template/nginx/nginx.conf.ftl | 0 .../{ => output}/DataSourceSeedingOutputGeneratorTest.java | 11 ++++++++--- .../config/output}/TemplateTransformationsBuilderTest.java | 9 +++------ 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateSeedingOutputGenerator.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateSeedingOutputGenerator.java index 7bb59a0..8dfa8bb 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateSeedingOutputGenerator.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateSeedingOutputGenerator.java @@ -18,8 +18,6 @@ package org.apache.freemarker.generator.cli.config.output; import org.apache.freemarker.generator.base.output.OutputGenerator; import org.apache.freemarker.generator.base.output.OutputGenerator.SeedType; -import org.apache.freemarker.generator.base.template.TemplateTransformation; -import org.apache.freemarker.generator.base.template.TemplateTransformationsBuilder; import org.apache.freemarker.generator.cli.config.Settings; import org.apache.freemarker.generator.cli.picocli.OutputGeneratorDefinition; import org.apache.freemarker.generator.cli.picocli.TemplateOutputDefinition; diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformation.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformation.java similarity index 89% rename from freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformation.java rename to freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformation.java index 6f0ed90..74a1522 100644 --- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformation.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformation.java @@ -14,7 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.freemarker.generator.base.template; +package org.apache.freemarker.generator.cli.config.output; + +import org.apache.freemarker.generator.base.template.TemplateOutput; +import org.apache.freemarker.generator.base.template.TemplateSource; import static java.util.Objects.requireNonNull; diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilder.java similarity index 98% rename from freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java rename to freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilder.java index c9b0814..2e9d04b 100644 --- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilder.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.freemarker.generator.base.template; +package org.apache.freemarker.generator.cli.config.output; import org.apache.freemarker.generator.base.FreeMarkerConstants.Location; import org.apache.freemarker.generator.base.datasource.DataSource; import org.apache.freemarker.generator.base.datasource.DataSourceLoader; import org.apache.freemarker.generator.base.datasource.DataSourceLoaderFactory; import org.apache.freemarker.generator.base.file.RecursiveFileSupplier; +import org.apache.freemarker.generator.base.template.TemplateOutput; +import org.apache.freemarker.generator.base.template.TemplateSource; import org.apache.freemarker.generator.base.util.NonClosableWriterWrapper; import org.apache.freemarker.generator.base.util.StringUtils; import org.apache.freemarker.generator.base.util.Validate; diff --git a/freemarker-generator-base/src/test/template/application.properties b/freemarker-generator-cli/src/test/data/template/application.properties similarity index 100% rename from freemarker-generator-base/src/test/template/application.properties rename to freemarker-generator-cli/src/test/data/template/application.properties diff --git a/freemarker-generator-base/src/test/template/nginx/nginx.conf.ftl b/freemarker-generator-cli/src/test/data/template/nginx/nginx.conf.ftl similarity index 100% rename from freemarker-generator-base/src/test/template/nginx/nginx.conf.ftl rename to freemarker-generator-cli/src/test/data/template/nginx/nginx.conf.ftl diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataSourceSeedingOutputGeneratorTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputGeneratorTest.java similarity index 94% rename from freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataSourceSeedingOutputGeneratorTest.java rename to freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputGeneratorTest.java index fa72c2f..0f03c52 100644 --- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataSourceSeedingOutputGeneratorTest.java +++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputGeneratorTest.java @@ -1,7 +1,10 @@ -package org.apache.freemarker.generator.cli.config; +package org.apache.freemarker.generator.cli.config.output; import org.apache.freemarker.generator.base.FreeMarkerConstants.SeedType; import org.apache.freemarker.generator.base.output.OutputGenerator; +import org.apache.freemarker.generator.cli.config.AbstractOutputGeneratorTest; +import org.apache.freemarker.generator.cli.config.OutputGeneratorsSupplier; +import org.apache.freemarker.generator.cli.config.Settings; import org.apache.freemarker.generator.cli.picocli.OutputGeneratorDefinition; import org.junit.Test; @@ -69,7 +72,8 @@ public class DataSourceSeedingOutputGeneratorTest extends AbstractOutputGenerato assertEquals(1, outputGenerator_01.getDataSources().size()); assertEquals(OutputGenerator.SeedType.DATASOURCE, outputGenerator_01.getSeedType()); assertEquals(ANY_TEMPLATE_NAME, outputGenerator_01.getTemplateSource().getName()); - assertEquals(new File(ANY_OUTPUT_DIRECTORY, "environments.txt"), outputGenerator_01.getTemplateOutput().getFile()); + assertEquals(new File(ANY_OUTPUT_DIRECTORY, "environments.txt"), outputGenerator_01.getTemplateOutput() + .getFile()); assertEquals("environments.json", outputGenerator_01.getDataSources().get(0).getFileName()); assertEquals(1, outputGenerator_02.getDataSources().size()); @@ -102,7 +106,8 @@ public class DataSourceSeedingOutputGeneratorTest extends AbstractOutputGenerato assertEquals(1, outputGenerator_01.getDataSources().size()); assertEquals(OutputGenerator.SeedType.DATASOURCE, outputGenerator_01.getSeedType()); assertEquals(ANY_TEMPLATE_NAME, outputGenerator_01.getTemplateSource().getName()); - assertEquals(new File(ANY_OUTPUT_DIRECTORY, "environments.txt"), outputGenerator_01.getTemplateOutput().getFile()); + assertEquals(new File(ANY_OUTPUT_DIRECTORY, "environments.txt"), outputGenerator_01.getTemplateOutput() + .getFile()); assertEquals("environments.json", outputGenerator_01.getDataSources().get(0).getFileName()); assertEquals(1, outputGenerator_02.getDataSources().size()); diff --git a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateTransformationsBuilderTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilderTest.java similarity index 96% rename from freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateTransformationsBuilderTest.java rename to freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilderTest.java index 7170cd7..6755404 100644 --- a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateTransformationsBuilderTest.java +++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilderTest.java @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.freemarker.generator.template; +package org.apache.freemarker.generator.cli.config.output; 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; -import org.apache.freemarker.generator.base.template.TemplateTransformation; -import org.apache.freemarker.generator.base.template.TemplateTransformationsBuilder; import org.apache.freemarker.generator.base.util.NonClosableWriterWrapper; import org.junit.Ignore; import org.junit.Test; @@ -41,10 +39,9 @@ import static org.junit.Assert.assertTrue; public class TemplateTransformationsBuilderTest { - private static final String ANY_TEMPLATE_FILE_NAME = "src/test/template/application.properties"; - private static final String OTHER_TEMPLATE_FILE_NAME = "src/test/template/nginx/nginx.conf.ftl"; + private static final String ANY_TEMPLATE_FILE_NAME = "src/test/data/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 ANY_TEMPLATE_DIRECTORY_NAME = "src/test/data/template"; private static final String ANY_TEMPLATE_URL = "https://raw.githubusercontent.com/apache/freemarker-generator/master/freemarker-generator-cli/src/app/templates/freemarker-generator/info.ftl";; private static final String ANY_ENV_URI = "env:///JAVA_HOME";
