branch develop updated (38f0633 -> 6691833)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git from 38f0633 optimize dependencies new ada87bb Improve doc new 6691833 [ApplicationConfig] NullPointerException when saving file (Fixes #855) 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 6691833736c80509e454213f278945d2ba7e6c27 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 2 10:06:57 2016 +0200 [ApplicationConfig] NullPointerException when saving file (Fixes #855) commit ada87bb2ab87ff1c4892a68becc34ba11e4198b8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 2 10:06:37 2016 +0200 Improve doc Summary of changes: nuiton-config-maven-plugin/src/site/apt/index.apt | 12 ++++++++++-- .../java/org/nuiton/config/ApplicationConfig.java | 21 +++++++++++++++++---- ...cationConfigFileNameNotInitializedException.java | 14 ++++++++++++++ .../org/nuiton/config/ApplicationConfigInit.java | 10 ++++++++++ src/site/apt/usage.apt.vm | 2 ++ src/site/apt/versions.apt | 2 +- 6 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 nuiton-config/src/main/java/org/nuiton/config/ApplicationConfigFileNameNotInitializedException.java -- 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 nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit ada87bb2ab87ff1c4892a68becc34ba11e4198b8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 2 10:06:37 2016 +0200 Improve doc --- nuiton-config-maven-plugin/src/site/apt/index.apt | 12 ++++++++++-- src/site/apt/usage.apt.vm | 2 ++ src/site/apt/versions.apt | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/nuiton-config-maven-plugin/src/site/apt/index.apt b/nuiton-config-maven-plugin/src/site/apt/index.apt index ab02dbe..a1ecbab 100644 --- a/nuiton-config-maven-plugin/src/site/apt/index.apt +++ b/nuiton-config-maven-plugin/src/site/apt/index.apt @@ -30,9 +30,17 @@ Présentation - Le plugin permet de générer une configuration à partir de la description de ces options (goal <<generate>>). + Le plugin propose quatre goal : - Il permet aussi de générer la documentation d'une configuration (goal <<report>> et <<aggregate-report>>). + * Goal {{{./generate-mojo.html/}generate}} : permet de générer les classes java de la configuration à partir d'un modèle de description ; + + * Goal {{{./describe-mojo.html}describe}} : permet de générer le modèle de description à partir des classes java de la configuration ; + + * Goal {{{./report-mojo.html}report}} : permet de générer la documentation des configurations d'un module ; + + * Goal {{{./aggregate-report-mojo.html}aggregate-report}} : permet de générer la documentation de tous les configurations d'un projet multi-module. + + [] Utilisation diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm index 2a12fcd..09e359c 100644 --- a/src/site/apt/usage.apt.vm +++ b/src/site/apt/usage.apt.vm @@ -221,6 +221,8 @@ Générer la configuration Si vous voulez utiliser un autre nom, ajouter la propriété de configuration <<modelName>>. + Pour plus de détails ce le plugin, consulter la page de {{{./generate-mojo.html/}détail}}. + * Utilisation de Nuiton-I18n Il est possible d'utiliser {{{http://nuiton-i18n.nuiton.org/v/latest}Nuiton-I18n}} pour externaliser les descriptions diff --git a/src/site/apt/versions.apt b/src/site/apt/versions.apt index 3da4674..f90f48d 100644 --- a/src/site/apt/versions.apt +++ b/src/site/apt/versions.apt @@ -20,7 +20,7 @@ ~~ #L% ~~~ ---- - Nuiton config + Nuiton Config Migration ---- ---- 2013-07-23 -- 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 nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit 6691833736c80509e454213f278945d2ba7e6c27 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 2 10:06:57 2016 +0200 [ApplicationConfig] NullPointerException when saving file (Fixes #855) --- .../java/org/nuiton/config/ApplicationConfig.java | 21 +++++++++++++++++---- ...cationConfigFileNameNotInitializedException.java | 14 ++++++++++++++ .../org/nuiton/config/ApplicationConfigInit.java | 10 ++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java index c5fa43f..6af8fb4 100644 --- a/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java +++ b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java @@ -851,9 +851,14 @@ public class ApplicationConfig { * Obtain the system config file location. * * @return the system config file location + * @throws ApplicationConfigFileNameNotInitializedException if no config file name found in configuration */ - public File getSystemConfigFile() { - File file = new File(getConfigPath(), getConfigFileName()); + public File getSystemConfigFile() throws ApplicationConfigFileNameNotInitializedException{ + String configFileName = getConfigFileName(); + if (configFileName == null) { + throw new ApplicationConfigFileNameNotInitializedException(); + } + File file = new File(getConfigPath(), configFileName); return file; } @@ -861,9 +866,14 @@ public class ApplicationConfig { * Obtain the user config file location. * * @return the user config file location + * @throws ApplicationConfigFileNameNotInitializedException if no config file name found in configuration */ - public File getUserConfigFile() { - return new File(getUserConfigDirectory(), getConfigFileName()); + public File getUserConfigFile() throws ApplicationConfigFileNameNotInitializedException{ + String configFileName = getConfigFileName(); + if (configFileName == null) { + throw new ApplicationConfigFileNameNotInitializedException(); + } + return new File(getUserConfigDirectory(), configFileName); } /** @@ -2102,6 +2112,9 @@ public class ApplicationConfig { } String filename = getConfigFileName(); + if (filename == null) { + throw new ApplicationConfigFileNameNotInitializedException(); + } // classpath Properties classpath = getProperties(ApplicationConfigScope.CLASS_PATH); diff --git a/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfigFileNameNotInitializedException.java b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfigFileNameNotInitializedException.java new file mode 100644 index 0000000..a2ace35 --- /dev/null +++ b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfigFileNameNotInitializedException.java @@ -0,0 +1,14 @@ +package org.nuiton.config; + +/** + * Thrown when the config file name is required (to perform save action) on ApplicationConfig and the config file + * name is not found in configuration. + * + * Created on 02/10/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.0 + */ +public class ApplicationConfigFileNameNotInitializedException extends RuntimeException { + +} diff --git a/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfigInit.java b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfigInit.java index daa94a1..cc99d9a 100644 --- a/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfigInit.java +++ b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfigInit.java @@ -25,6 +25,8 @@ package org.nuiton.config; import java.util.Arrays; import java.util.Collections; import java.util.EnumSet; +import java.util.LinkedList; +import java.util.List; import java.util.Properties; import java.util.Set; @@ -39,6 +41,14 @@ public class ApplicationConfigInit { return new ApplicationConfigInit(ApplicationConfigScope.values()); } + public static ApplicationConfigInit forAllScopesWithout(ApplicationConfigScope... excludedScopes) { + List<ApplicationConfigScope> allScopes = new LinkedList<>(Arrays.asList(ApplicationConfigScope.values())); + for (ApplicationConfigScope scope : excludedScopes) { + allScopes.remove(scope); + } + return new ApplicationConfigInit(allScopes.toArray(new ApplicationConfigScope[allScopes.size()])); + } + public static ApplicationConfigInit forScopes(ApplicationConfigScope... scopes) { return new ApplicationConfigInit(scopes); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm