This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit f293181e99e187b38f595bcc936710a6484068c8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:31:49 2016 +0100 Replace some deprecated api calls --- .../src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java | 2 +- .../main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java | 2 +- .../java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java | 2 +- .../main/java/fr/ifremer/echobase/services/service/UserService.java | 2 +- .../main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java | 2 +- .../fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java | 2 +- .../ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java | 2 +- .../main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java b/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java index 316a7cf..1783a33 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java @@ -23,7 +23,7 @@ package fr.ifremer.echobase; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; import org.apache.commons.beanutils.converters.DateTimeConverter; -import org.nuiton.util.converter.ConverterUtil; +import org.nuiton.converter.ConverterUtil; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java index 39f7e32..1f0dd98 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java @@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.FileUtil; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.io.IOException; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java index 90c7a95..c6812db 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.config; import org.nuiton.config.ConfigOptionDef; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.net.URL; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java index 0cef03b..d80e327 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java @@ -69,7 +69,7 @@ public class UserService extends EchoBaseServiceSupport { Preconditions.checkNotNull(email); try { EchoBaseUserTopiaDao dao = getDao(); - EchoBaseUser user = dao.findByEmail(email); + EchoBaseUser user = dao.forEmailEquals(email).findAnyOrNull(); return user; } catch (TopiaException eee) { throw new EchoBaseTechnicalException(eee); diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java index 70a36d9..e9c293a 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java @@ -59,7 +59,7 @@ import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.RecursiveProperties; import org.nuiton.util.SortedProperties; -import org.nuiton.util.converter.ConverterUtil; +import org.nuiton.converter.ConverterUtil; import javax.servlet.ServletContext; import java.beans.Introspector; diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java index 0be3894..dd8a616 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java @@ -29,7 +29,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.io.IOException; diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java index 512ca43..1081a7d 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java @@ -52,7 +52,7 @@ public abstract class EchoBaseFieldValidatorSupport extends NuitonFieldValidator * @param args the optional arguments of the sentence * @return the translated sentence */ - protected String _(String key, Object... args) { + protected String translate(String key, Object... args) { String text = getValidatorContext().getText(key, Arrays.asList(args)); return text; } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java index dff8027..b874670 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java @@ -55,14 +55,14 @@ public class LoginValidator extends EchoBaseFieldValidatorSupport { if (user == null) { // user not found - addFieldError("email", _("echobase.error.login.unknown")); + addFieldError("email", translate("echobase.error.login.unknown")); return; } boolean passwordOk = userService.checkPassword(user, password); if (!passwordOk) { - addFieldError("password", _("echobase.error.bad.password")); + addFieldError("password", translate("echobase.error.bad.password")); } } catch (Exception e) { if (log.isErrorEnabled()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.