branch develop updated (5b9c110 -> 819eb0e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git from 5b9c110 Improve application configuration generation (See #4036) new 50e3cf3 Let's also init default values in generated application configuration (See #4036) new 819eb0e Simplify application configuration generation mojo (See #4036) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 819eb0e6bebded83d1b98d6c20cddb64f37f4cff Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 15 19:53:53 2016 +0200 Simplify application configuration generation mojo (See #4036) commit 50e3cf31d822ef19c3f1f1d47f1768edccade159 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 15 19:51:09 2016 +0200 Let's also init default values in generated application configuration (See #4036) Summary of changes: .../config/templates/ApplicationConfigTransformer.java | 6 ++++-- .../eugene/plugin/GenerateApplicationConfigMojo.java | 14 ++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit 50e3cf31d822ef19c3f1f1d47f1768edccade159 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 15 19:51:09 2016 +0200 Let's also init default values in generated application configuration (See #4036) --- .../eugene/config/templates/ApplicationConfigTransformer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eugene-config-templates/src/main/java/org/nuiton/eugene/config/templates/ApplicationConfigTransformer.java b/eugene-config-templates/src/main/java/org/nuiton/eugene/config/templates/ApplicationConfigTransformer.java index e1e3d24..e1eff3a 100644 --- a/eugene-config-templates/src/main/java/org/nuiton/eugene/config/templates/ApplicationConfigTransformer.java +++ b/eugene-config-templates/src/main/java/org/nuiton/eugene/config/templates/ApplicationConfigTransformer.java @@ -29,6 +29,7 @@ import java.util.Set; public class ApplicationConfigTransformer extends ObjectModelTransformerToJava { private static final Log log = LogFactory.getLog(ApplicationConfigTransformer.class); + public static final String PROP_OPTION_CLASS_NAME = "optionClassName"; @Override public void transformFromClass(ObjectModelClass clazz) { @@ -64,8 +65,8 @@ public class ApplicationConfigTransformer extends ObjectModelTransformerToJava { protected void generateAbstractClass(String packageName, String abstractClassName, ObjectModelClass input) { - String optionClassName = getProperty("optionClassName"); - + String optionClassName = getProperty(PROP_OPTION_CLASS_NAME); + String optionClassSimpleName = GeneratorUtil.getSimpleName(optionClassName); ObjectModelClass output = createAbstractClass(abstractClassName, packageName); addImport(output, optionClassName); @@ -79,6 +80,7 @@ public class ApplicationConfigTransformer extends ObjectModelTransformerToJava { setOperationBody(constructor, "" /*{ this.applicationConfig = new ApplicationConfig(); + this.applicationConfig.loadDefaultOptions(<%=optionClassSimpleName%>.values()); }*/ ); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit 819eb0e6bebded83d1b98d6c20cddb64f37f4cff Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 15 19:53:53 2016 +0200 Simplify application configuration generation mojo (See #4036) --- .../eugene/plugin/GenerateApplicationConfigMojo.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateApplicationConfigMojo.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateApplicationConfigMojo.java index cc1edf7..31f7116 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateApplicationConfigMojo.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateApplicationConfigMojo.java @@ -29,7 +29,6 @@ import org.antlr.v4.runtime.misc.NotNull; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -39,7 +38,6 @@ import org.nuiton.eugene.DefaultTemplateConfiguration; import org.nuiton.eugene.Template; import org.nuiton.eugene.config.templates.ApplicationConfigTransformer; import org.nuiton.eugene.java.JavaGeneratorUtil; -import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; import org.nuiton.eugene.models.object.xml.ObjectModelImpl; @@ -145,13 +143,9 @@ public class GenerateApplicationConfigMojo extends AbstractPlugin { @Parameter(defaultValue = "${project}", readonly = true) protected MavenProject project; - /** All available templates introspects via plexus. */ - @Component(role = Template.class) - protected Map<String, Template<?>> modelTemplates; + protected ObjectModelImpl model; - private ObjectModelImpl model; - - protected Template<Model> template; + protected ApplicationConfigTransformer template; @Override protected void init() throws Exception { @@ -236,9 +230,9 @@ public class GenerateApplicationConfigMojo extends AbstractPlugin { templateProperties.put(Template.PROP_VERBOSE, verbose); templateProperties.put(Template.PROP_OVERWRITE, true); templateProperties.put(Template.PROP_CLASS_LOADER, loader); - templateProperties.put("optionClassName", inputClassName); + templateProperties.put(ApplicationConfigTransformer.PROP_OPTION_CLASS_NAME, inputClassName); - template = (Template<Model>) modelTemplates.get(ApplicationConfigTransformer.class.getName()); + template = new ApplicationConfigTransformer(); template.setConfiguration(new DefaultTemplateConfiguration(templateProperties)); if (!project.getCompileSourceRoots().contains(outputdirectory.getPath())) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm