This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 7134ff150bd71a891caaf7d3d37bd8aa46a623c1 Author: jcouteau <couteau@codelutin.com> Date: Mon Sep 23 16:06:25 2019 +0200 Sonar --- .../faxtomail/FaxToMailConfiguration.java | 49 +++++----------------- .../persistence/entities/ClientTopiaDao.java | 2 +- 2 files changed, 12 insertions(+), 39 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java index 629b0744..7ada292c 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java @@ -24,7 +24,6 @@ package com.franciaflex.faxtomail; * #L% */ -import com.google.common.base.Charsets; import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -44,6 +43,7 @@ import java.awt.*; import java.io.File; import java.io.IOException; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Locale; import java.util.Map; @@ -67,7 +67,7 @@ public class FaxToMailConfiguration extends ApplicationConfiguration { public FaxToMailConfiguration(String file, String... args) { super(new ApplicationConfig()); - applicationConfig.setEncoding(Charsets.UTF_8.name()); + applicationConfig.setEncoding(StandardCharsets.UTF_8.name()); // get all config providers Set<ApplicationConfigProvider> providers = @@ -120,20 +120,6 @@ public class FaxToMailConfiguration extends ApplicationConfiguration { applicationConfig.setOption( FaxToMailConfigurationOption.BASEDIR.getKey(), faxToMailBasedir.getAbsolutePath()); - -// if (log.isInfoEnabled()) { -// StringBuilder builder = new StringBuilder(); -// List<FaxToMailConfigurationOption> options = -// Lists.newArrayList(FaxToMailConfigurationOption.values()); -// for (FaxToMailConfigurationOption option : options) { -// String key = option.getKey(); -// Object value = applicationConfig.getOption(option); -// builder.append(String.format("\n%1$-40s = %2$s", -// key, -// value)); -// } -// log.info("faxtomail: " + builder.toString()); -// } } public void prepareDirectories() { @@ -176,22 +162,17 @@ public class FaxToMailConfiguration extends ApplicationConfiguration { } // OPTION SETTERS - public void setCsvSeparator(char c) { - applicationConfig.setOption( - FaxToMailConfigurationOption.CSV_SEPARATOR.getKey(), c + ""); + applicationConfig.setOption(FaxToMailConfigurationOption.CSV_SEPARATOR.getKey(), c + ""); } // OPTION GETTERS - public boolean isDevMode() { - boolean isDevMode = applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.DEV_MODE.getKey()); - return isDevMode; + return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.DEV_MODE.getKey()); } public boolean isUseFolderCache() { - boolean isUseFolderCache = applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.USE_FOLDER_CACHE.getKey()); - return isUseFolderCache; + return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.USE_FOLDER_CACHE.getKey()); } /** @@ -289,9 +270,7 @@ public class FaxToMailConfiguration extends ApplicationConfiguration { } public boolean isLogConfigurationProvided() { - boolean logConfigurationProvided = - StringUtils.isNotBlank(applicationConfig.getOption(FaxToMailConfigurationOption.LOG_CONFIGURATION_FILE.getKey())); - return logConfigurationProvided; + return StringUtils.isNotBlank(applicationConfig.getOption(FaxToMailConfigurationOption.LOG_CONFIGURATION_FILE.getKey())); } public File getLogConfigurationFile() { @@ -326,25 +305,21 @@ public class FaxToMailConfiguration extends ApplicationConfiguration { /** @return {@link FaxToMailConfigurationOption#BASEDIR} value */ public File getBasedir() { - File result = applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.BASEDIR.getKey()); - return result; + return applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.BASEDIR.getKey()); } /** @return {@link FaxToMailConfigurationOption#DEMO_DIRECTORY} value */ public File getDemoDirectory() { - File result = applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.DEMO_DIRECTORY.getKey()); - return result; + return applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.DEMO_DIRECTORY.getKey()); } /** @return {@link FaxToMailConfigurationOption#DATA_DIRECTORY} value */ public File getDataDirectory() { - File result = applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.DATA_DIRECTORY.getKey()); - return result; + return applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.DATA_DIRECTORY.getKey()); } public char getCsvSeparator() { - return applicationConfig.getOption( - FaxToMailConfigurationOption.CSV_SEPARATOR.getKey()).charAt(0); + return applicationConfig.getOption(FaxToMailConfigurationOption.CSV_SEPARATOR.getKey()).charAt(0); } public String getDefaultImageIfMalformedUrl() { @@ -370,9 +345,7 @@ public class FaxToMailConfiguration extends ApplicationConfiguration { } public KeyStroke getShortCut(String actionName) { - KeyStroke result = applicationConfig.getOptionAsKeyStroke( - "faxtomail.ui." + actionName); - return result; + return applicationConfig.getOptionAsKeyStroke("faxtomail.ui." + actionName); } public boolean isAutoPopupNumberEditor() { diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java index 15c1746a..a7909ccc 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java @@ -63,7 +63,7 @@ public class ClientTopiaDao extends AbstractClientTopiaDao<Client> { String query = MessageFormat.format("FROM {0} WHERE UPPER({1}) LIKE :propValue", Client.class.getName(), Client.PROPERTY_NAME); Map<String, Object> args = new HashMap<>(); - args.put("propValue", nameQuery.toUpperCase() + "%"); + args.put(PROP_VALUE, nameQuery.toUpperCase() + "%"); return findAll(query, args); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.