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 1a761edcc299da3af1e3862d493f50db3cedbcb9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 7 18:58:53 2016 +0200 Remove guava from api dependency + optimize dependencies --- nuiton-config-io-ini/pom.xml | 11 +++++---- .../java/org/nuiton/config/ApplicationConfig.java | 27 +++++++++++----------- .../config/io/ApplicationConfigIOHelper.java | 10 ++++---- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/nuiton-config-io-ini/pom.xml b/nuiton-config-io-ini/pom.xml index ee920a3..e435d62 100644 --- a/nuiton-config-io-ini/pom.xml +++ b/nuiton-config-io-ini/pom.xml @@ -15,14 +15,10 @@ <description>Nuiton Config IO Ini</description> <inceptionYear>2016</inceptionYear> - <properties> - - </properties> - <dependencies> <dependency> - <groupId>org.nuiton</groupId> + <groupId>${project.groupId}</groupId> <artifactId>nuiton-config</artifactId> <version>${project.version}</version> </dependency> @@ -33,6 +29,11 @@ </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> 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 003e481..f594eb5 100644 --- a/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java +++ b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java @@ -22,7 +22,6 @@ package org.nuiton.config; * #L% */ -import com.google.common.base.Preconditions; import org.apache.commons.beanutils.ConstructorUtils; import org.apache.commons.collections4.EnumerationUtils; import org.apache.commons.io.FileUtils; @@ -407,6 +406,7 @@ public class ApplicationConfig { /** * suport of config modification. + * * @deprecated since 3.1, we should no more use property change support on ApplicationConfig */ @Deprecated @@ -419,6 +419,7 @@ public class ApplicationConfig { /** * Pour gérer la lecture/écriture des properties. + * * @since 3.1 */ protected ApplicationConfigIOHelper applicationIOHelper; @@ -488,8 +489,8 @@ public class ApplicationConfig { */ protected void init(ApplicationConfigInit init) { - Preconditions.checkNotNull(init,"Can't init ApplicationConfig without an init paramter"); - Preconditions.checkNotNull(init.getReadFormat(), "Can't init Application without an init.readFormat parameter"); + if (init == null) throw new NullPointerException("Can't init ApplicationConfig without an init paramter"); + applicationIOHelper = new ApplicationConfigIOHelper(init.getReadFormat()); Set<ApplicationConfigScope> scopes = init.getScopes(); @@ -1957,7 +1958,7 @@ public class ApplicationConfig { // add a listener if (log.isDebugEnabled()) { log.debug("register saveUserAction on property [" + - propertyKey + ']'); + propertyKey + ']'); } addPropertyChangeListener(propertyKey, saveUserAction); } @@ -2181,7 +2182,7 @@ public class ApplicationConfig { for (URL inClasspath : urlsInClasspath) { if (log.isInfoEnabled()) { log.info("Loading configuration file (classpath) : " + - inClasspath); + inClasspath); } loadResource(inClasspath.toURI(), classpath); } @@ -2200,7 +2201,7 @@ public class ApplicationConfig { } else { if (log.isDebugEnabled()) { log.debug("No configuration file found in system : " + - etcConfig.getAbsolutePath()); + etcConfig.getAbsolutePath()); } } @@ -2217,13 +2218,13 @@ public class ApplicationConfig { if (homeConfig.exists()) { if (log.isInfoEnabled()) { log.info("Loading configuration file (home) : " + - homeConfig); + homeConfig); } loadResource(homeConfig.toURI(), homefile); } else { if (log.isDebugEnabled()) { log.debug("No configuration file found in user home : " + - homeConfig.getAbsolutePath()); + homeConfig.getAbsolutePath()); } } } @@ -2240,7 +2241,7 @@ public class ApplicationConfig { } else { if (log.isDebugEnabled()) { log.debug("No configuration file found in current" + - " directory : " + config.getAbsolutePath()); + " directory : " + config.getAbsolutePath()); } } } @@ -2460,8 +2461,8 @@ public class ApplicationConfig { } if (log.isDebugEnabled()) { log.debug("Saving configuration fired by property [" + - evt.getPropertyName() + "] at " + - new Date()); + evt.getPropertyName() + "] at " + + new Date()); } saveForUser(); } @@ -2545,8 +2546,8 @@ public class ApplicationConfig { protected <T> List<T> convertListOption(Class<T> type) { List<T> result = (List<T>) config.convertOption(type, key, - value, - true + value, + true ); return result; } diff --git a/nuiton-config/src/main/java/org/nuiton/config/io/ApplicationConfigIOHelper.java b/nuiton-config/src/main/java/org/nuiton/config/io/ApplicationConfigIOHelper.java index a81bf3b..92880e5 100644 --- a/nuiton-config/src/main/java/org/nuiton/config/io/ApplicationConfigIOHelper.java +++ b/nuiton-config/src/main/java/org/nuiton/config/io/ApplicationConfigIOHelper.java @@ -22,8 +22,6 @@ package org.nuiton.config.io; * #L% */ -import com.google.common.base.Preconditions; - import java.io.File; import java.net.URL; import java.util.Properties; @@ -40,7 +38,9 @@ public class ApplicationConfigIOHelper implements ApplicationConfigIO { private final ApplicationConfigIO delegate; public ApplicationConfigIOHelper(ApplicationConfigReadFormat readFormat) { - Preconditions.checkNotNull(readFormat, "Can't init with null readFormat"); + if (readFormat == null) { + throw new NullPointerException("Can't init with null readFormat"); + } ServiceLoader<ApplicationConfigIO> loader = ServiceLoader.load(ApplicationConfigIO.class); ApplicationConfigIO delegate = null; for (ApplicationConfigIO applicationConfigIO : loader) { @@ -48,7 +48,9 @@ public class ApplicationConfigIOHelper implements ApplicationConfigIO { delegate = applicationConfigIO; } } - Preconditions.checkState(delegate != null, "Could not find ApplicationConfigIO implementation for format: " + readFormat); + if (delegate == null) { + throw new IllegalStateException("Could not find ApplicationConfigIO implementation for format: " + readFormat); + } this.delegate = delegate; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.