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 7827ab439c6512a0bee56cd7208761e0085b2caf Author: Siegfried Goeschl <[email protected]> AuthorDate: Sun Sep 26 18:48:18 2021 +0200 FREEMARKER-188 Add "toString" method for Picocli classes --- .../generator/cli/picocli/DataModelDefinition.java | 7 +++++++ .../generator/cli/picocli/DataSourceDefinition.java | 7 +++++++ .../generator/cli/picocli/GitVersionProvider.java | 9 +++++++++ .../generator/cli/picocli/OutputGeneratorDefinition.java | 13 +++++++++++++ .../generator/cli/picocli/OutputMapperDefinition.java | 7 +++++++ .../generator/cli/picocli/OutputSeedDefinition.java | 7 +++++++ .../generator/cli/picocli/TemplateOutputDefinition.java | 7 +++++++ .../generator/cli/picocli/TemplateSourceDefinition.java | 8 ++++++++ .../cli/picocli/TemplateSourceFilterDefinition.java | 12 +++++++++++- 9 files changed, 76 insertions(+), 1 deletion(-) diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/DataModelDefinition.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/DataModelDefinition.java index 0c4ffcf..f586feb 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/DataModelDefinition.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/DataModelDefinition.java @@ -27,4 +27,11 @@ public class DataModelDefinition { @Option(names = { "-m", "--data-model" }, description = "data model used for rendering") public List<String> dataModels; + + @Override + public String toString() { + return "DataModelDefinition{" + + "dataModels=" + dataModels + + '}'; + } } diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/DataSourceDefinition.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/DataSourceDefinition.java index 61e9924..0adc292 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/DataSourceDefinition.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/DataSourceDefinition.java @@ -27,4 +27,11 @@ public class DataSourceDefinition { @Option(names = { "-s", "--data-source" }, description = "data source used for rendering") public List<String> dataSources; + + @Override + public String toString() { + return "DataSourceDefinition{" + + "dataSources=" + dataSources + + '}'; + } } diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/GitVersionProvider.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/GitVersionProvider.java index bfa3f3d..ce8555e 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/GitVersionProvider.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/GitVersionProvider.java @@ -53,4 +53,13 @@ public class GitVersionProvider implements IVersionProvider { } return properties; } + + @Override + public String toString() { + return "GitVersionProvider{" + + "gitBuildVersion='" + gitBuildVersion + '\'' + + ", gitCommitId='" + gitCommitId + '\'' + + ", gitCommitTime='" + gitCommitTime + '\'' + + '}'; + } } diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputGeneratorDefinition.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputGeneratorDefinition.java index d824524..728d6a7 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputGeneratorDefinition.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputGeneratorDefinition.java @@ -121,6 +121,19 @@ public class OutputGeneratorDefinition { return (outputMapperDefinition != null) ? outputMapperDefinition.outputMapper : null; } + @Override + public String toString() { + return "OutputGeneratorDefinition{" + + "templateSourceDefinition=" + templateSourceDefinition + + ", templateSourceFilterDefinition=" + templateSourceFilterDefinition + + ", templateOutputDefinition=" + templateOutputDefinition + + ", dataSourceDefinition=" + dataSourceDefinition + + ", dataModelDefinition=" + dataModelDefinition + + ", outputSeedDefinition=" + outputSeedDefinition + + ", outputMapperDefinition=" + outputMapperDefinition + + '}'; + } + private static boolean isFileSource(String source) { if (source.contains("file://")) { return true; diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputMapperDefinition.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputMapperDefinition.java index d23ec74..c4bed1a 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputMapperDefinition.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputMapperDefinition.java @@ -22,4 +22,11 @@ public class OutputMapperDefinition { @Option(names = { "--output-mapper" }, description = "maps the name of the output file") public String outputMapper; + + @Override + public String toString() { + return "OutputMapperDefinition{" + + "outputMapper='" + outputMapper + '\'' + + '}'; + } } diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputSeedDefinition.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputSeedDefinition.java index f897cbb..50cea95 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputSeedDefinition.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/OutputSeedDefinition.java @@ -25,4 +25,11 @@ public class OutputSeedDefinition { @Option(names = { "--seed" }, defaultValue = "template", description = "seed mode: [template|datasource]") public String type; + + @Override + public String toString() { + return "OutputSeedDefinition{" + + "type='" + type + '\'' + + '}'; + } } diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateOutputDefinition.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateOutputDefinition.java index 59627e3..3f3244f 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateOutputDefinition.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateOutputDefinition.java @@ -28,4 +28,11 @@ public class TemplateOutputDefinition { public boolean hasOutput() { return outputs != null && !outputs.isEmpty(); } + + @Override + public String toString() { + return "TemplateOutputDefinition{" + + "outputs=" + outputs + + '}'; + } } diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateSourceDefinition.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateSourceDefinition.java index 6193c7b..0d35752 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateSourceDefinition.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateSourceDefinition.java @@ -29,4 +29,12 @@ public class TemplateSourceDefinition { public boolean isInteractiveTemplate() { return interactiveTemplate != null && !interactiveTemplate.isEmpty(); } + + @Override + public String toString() { + return "TemplateSourceDefinition{" + + "template='" + template + '\'' + + ", interactiveTemplate='" + interactiveTemplate + '\'' + + '}'; + } } diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateSourceFilterDefinition.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateSourceFilterDefinition.java index 68cce4e..0a3bb4b 100644 --- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateSourceFilterDefinition.java +++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/TemplateSourceFilterDefinition.java @@ -20,7 +20,9 @@ import picocli.CommandLine.Option; import java.util.List; -/** Include/exclude pattern when processing template directories */ +/** + * Include/exclude pattern when processing template directories + */ public class TemplateSourceFilterDefinition { @Option(names = { "--template-include" }, description = "template include pattern") @@ -28,4 +30,12 @@ public class TemplateSourceFilterDefinition { @Option(names = { "--template-exclude" }, description = "template exclude pattern") public List<String> templateExcludePatterns; + + @Override + public String toString() { + return "TemplateSourceFilterDefinition{" + + "templateIncludePatterns=" + templateIncludePatterns + + ", templateExcludePatterns=" + templateExcludePatterns + + '}'; + } }
