branch develop updated (7b6caa6a -> e483ed12)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 7b6caa6a Sonar new e483ed12 Sonar The 1 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 e483ed120852c6e4aec626c4a5f21bf7cb72f54f Author: jcouteau <couteau@codelutin.com> Date: Mon Sep 23 15:39:28 2019 +0200 Sonar Summary of changes: .gitlab-ci.yml | 1 + .../faxtomail/FaxToMailConfigurationOption.java | 15 +++++--- .../persistence/RessourceClassLoader.java | 10 ++--- .../persistence/entities/ClientTopiaDao.java | 40 ++++++++++++-------- .../persistence/entities/EmailTopiaDao.java | 10 ++--- .../services/service/ConfigurationServiceImpl.java | 43 ++++++++++----------- .../services/service/EmailServiceImpl.java | 44 +++++++++++----------- .../services/service/ReferentielServiceImpl.java | 3 +- .../services/service/ldap/LdapServiceMock.java | 3 +- .../swing/content/demande/DemandeListUIModel.java | 3 +- .../swing/content/pdfeditor/PDFEditorUIModel.java | 1 + pom.xml | 2 +- 12 files changed, 97 insertions(+), 78 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 e483ed120852c6e4aec626c4a5f21bf7cb72f54f Author: jcouteau <couteau@codelutin.com> Date: Mon Sep 23 15:39:28 2019 +0200 Sonar --- .gitlab-ci.yml | 1 + .../faxtomail/FaxToMailConfigurationOption.java | 15 +++++--- .../persistence/RessourceClassLoader.java | 10 ++--- .../persistence/entities/ClientTopiaDao.java | 40 ++++++++++++-------- .../persistence/entities/EmailTopiaDao.java | 10 ++--- .../services/service/ConfigurationServiceImpl.java | 43 ++++++++++----------- .../services/service/EmailServiceImpl.java | 44 +++++++++++----------- .../services/service/ReferentielServiceImpl.java | 3 +- .../services/service/ldap/LdapServiceMock.java | 3 +- .../swing/content/demande/DemandeListUIModel.java | 3 +- .../swing/content/pdfeditor/PDFEditorUIModel.java | 1 + pom.xml | 2 +- 12 files changed, 97 insertions(+), 78 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 376818e8..54db7e2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,6 +35,7 @@ sonar_job: image: registry.nuiton.org/codelutin/dockerfiles:maven-release stage: sonar script: + - export MAVEN_OPTS="-Xmx1024m" - mvn -e -U clean verify -DskipRelease org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.1.1688:sonar -Dsonar.host.url=https://qa.codelutin.com -Dsonar.projectKey=com.franciaflex:faxtomail -Dsonar.binaries='**/target/classes' -Dsonar.exclusions='**/js/libs/*','**/target/*','**/generated*/*' only: - schedules diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java index 12847b73..b37d92bb 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java @@ -61,27 +61,27 @@ public enum FaxToMailConfigurationOption implements ConfigOptionDef { SMTP_SSL( "faxtomail.smtp.ssl", "Utilisation on non du mode ssl pour le stmp", - "false", Boolean.class), + Constants.FALSE, Boolean.class), MAIL_DELETE( "faxtomail.mail.delete", "Marque les mails comme étant supprimé sur le serveur", - "false", Boolean.class), + Constants.FALSE, Boolean.class), MAIL_EXPUNGE( "faxtomail.mail.expunge", "Supprime définitivement les mails marqués comme supprimés", - "false", Boolean.class), + Constants.FALSE, Boolean.class), DEV_MODE( "faxtomail.devMode", "Mode développement, court-circuite l'envoi de mail", - "false", Boolean.class), + Constants.FALSE, Boolean.class), USE_FOLDER_CACHE( "faxtomail.useFolderCache", "Utilisation du cache des emails des dossiers, pour éviter de recharger les éléments quand on revient sur un dossier", - "false", Boolean.class), + Constants.FALSE, Boolean.class), LOG_CONFIGURATION_FILE( "logConfigurationFile", @@ -95,7 +95,7 @@ public enum FaxToMailConfigurationOption implements ConfigOptionDef { LDAP_MOCK( "faxtomail.ldap.mock", - "Utilisation d'un service ldap mock", "false", Boolean.class), + "Utilisation d'un service ldap mock", Constants.FALSE, Boolean.class), LDAP_HOST( "faxtomail.ldap.host", @@ -453,4 +453,7 @@ defaults.put("Table.alternateRowColor", new Color(217, 217, 217)); // not used } + private static class Constants { + protected static final String FALSE = "false"; + } } diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java index e7b30f4e..593d6c02 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java @@ -38,6 +38,7 @@ import java.io.File; import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; +import java.text.MessageFormat; import java.util.Enumeration; import java.util.List; @@ -118,7 +119,7 @@ public class RessourceClassLoader extends ClassLoader { URL result = null; if (searchInDirectoriesPredicate.apply(name)) { if (log.isDebugEnabled()) { - log.debug("findResource [" + name + "] in " + directories); + log.debug(MessageFormat.format("findResource [{0}] in {1}", name, directories)); } result = getLoader().findResource(name); } @@ -133,7 +134,7 @@ public class RessourceClassLoader extends ClassLoader { Enumeration<URL> result = null; if (searchInDirectoriesPredicate.apply(name)) { if (log.isDebugEnabled()) { - log.debug("findResources [" + name + "] in " + directories); + log.debug(MessageFormat.format("findResources [{0}] in {1}", name, directories)); } result = getLoader().findResources(name); } @@ -148,8 +149,7 @@ public class RessourceClassLoader extends ClassLoader { URL result = null; if (searchInDirectoriesPredicate.apply(name)) { if (log.isDebugEnabled()) { - log.debug("getResource [" + name + "] in " + - directories); + log.debug(MessageFormat.format("getResource [{0}] in {1}", name, directories)); } result = getLoader().getResource(name); } @@ -164,7 +164,7 @@ public class RessourceClassLoader extends ClassLoader { Enumeration<URL> result = null; if (searchInDirectoriesPredicate.apply(name)) { if (log.isDebugEnabled()) { - log.debug("getResources [" + name + "] in " + directories); + log.debug(MessageFormat.format("getResources [{0}] in {1}", name, directories)); } result = getLoader().getResources(name); } 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 fa142b96..15c1746a 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 @@ -27,6 +27,7 @@ package com.franciaflex.faxtomail.persistence.entities; import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; +import java.text.MessageFormat; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -34,13 +35,15 @@ import java.util.Set; public class ClientTopiaDao extends AbstractClientTopiaDao<Client> { + public static final String PROP_VALUE = "propValue"; + protected List<Client> forPropertyJsonLike(String property, String value) { Preconditions.checkArgument(StringUtils.isNotBlank(value), "Empty value can produce unexcepted results"); - String query = "FROM " + Client.class.getName() + " WHERE " + property + " LIKE :propValue"; + String query = MessageFormat.format("FROM {0} WHERE {1} LIKE :propValue", Client.class.getName(), property); Map<String, Object> args = new HashMap<>(); - args.put("propValue", "%\"" + value + "\"%"); + args.put(PROP_VALUE, "%\"" + value + "\"%"); List<Client> result = findAll(query, args); return result; } @@ -57,7 +60,7 @@ public class ClientTopiaDao extends AbstractClientTopiaDao<Client> { public List<Client> forNameStartsWith(String nameQuery) { - String query = "FROM " + Client.class.getName() + " WHERE UPPER(" + Client.PROPERTY_NAME + ") LIKE :propValue"; + 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() + "%"); @@ -65,22 +68,26 @@ public class ClientTopiaDao extends AbstractClientTopiaDao<Client> { } public List<Client> forCompanyFiltered(String company, String filter) { - String query = "FROM " + Client.class.getName() + - " WHERE " + Client.PROPERTY_COMPANY + "= :companyValue " + - " AND (UPPER(" + Client.PROPERTY_NAME + ") LIKE :propValue" + - " OR UPPER(" + Client.PROPERTY_CODE + ") LIKE :propValue )"; + String query = MessageFormat.format( + "FROM {0} WHERE {1}= :companyValue AND (UPPER({2}) LIKE :propValue OR UPPER({3}) LIKE :propValue )", + Client.class.getName(), + Client.PROPERTY_COMPANY, + Client.PROPERTY_NAME, + Client.PROPERTY_CODE); Map<String, Object> args = new HashMap<>(); - args.put("propValue", "%" + filter.toUpperCase() + "%"); + args.put(PROP_VALUE, "%" + filter.toUpperCase() + "%"); args.put("companyValue", company); return findAll(query, args); } public List<Client> forCompanyInFiltered(Set<String> companies, String filter) { - String query = "FROM " + Client.class.getName() + - " WHERE " + Client.PROPERTY_COMPANY + " IN ( :companyValues ) " + - " AND (UPPER(" + Client.PROPERTY_NAME + ") LIKE :propValue" + - " OR UPPER(" + Client.PROPERTY_CODE + ") LIKE :propValue )"; + String query = MessageFormat.format( + "FROM {0} WHERE {1} IN ( :companyValues ) AND (UPPER({2}) LIKE :propValue OR UPPER({3}) LIKE :propValue )", + Client.class.getName(), + Client.PROPERTY_COMPANY, + Client.PROPERTY_NAME, + Client.PROPERTY_CODE); StringBuilder companyValuesBuilder = new StringBuilder(); @@ -94,7 +101,7 @@ public class ClientTopiaDao extends AbstractClientTopiaDao<Client> { Map<String, Object> args = new HashMap<>(); - args.put("propValue", "%" + filter.toUpperCase() + "%"); + args.put(PROP_VALUE, "%" + filter.toUpperCase() + "%"); args.put("companyValues", companyValuesBuilder.toString()); return findAll(query, args); } @@ -103,9 +110,10 @@ public class ClientTopiaDao extends AbstractClientTopiaDao<Client> { public List<Client> forEmailAddressOrCodeLike(String searchQuery) { Preconditions.checkArgument(StringUtils.isNotBlank(searchQuery), "Empty query can produce unexcepted results"); - String query = "FROM " + Client.class.getName() + - " WHERE LOWER(" + Client.PROPERTY_EMAIL_ADDRESSES_JSON + ") LIKE :searchEmail" + - " OR UPPER(" + Client.PROPERTY_CODE + ") LIKE :searchCode"; + String query = MessageFormat.format("FROM {0} WHERE LOWER({1}) LIKE :searchEmail OR UPPER({2}) LIKE :searchCode", + Client.class.getName(), + Client.PROPERTY_EMAIL_ADDRESSES_JSON, + Client.PROPERTY_CODE); Map<String, Object> args = new HashMap<>(); args.put("searchEmail", "%" + searchQuery.toLowerCase() + "%"); diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java index 8586f357..d6c38ecd 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java @@ -577,11 +577,11 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { } hqlForFetchStep1.append(" ").append(query).append(" GROUP BY ") - .append(EMAIL_IDENTIFIER).append(".").append(Email.PROPERTY_TOPIA_ID); + .append(EMAIL_IDENTIFIER).append(".").append(TopiaEntity.PROPERTY_TOPIA_ID); // on ajoute les autres colones d'ordre dans le groupe by for (int indexClause = 1; indexClause < pagination.getOrderClauses().size(); indexClause++) { String clause = pagination.getOrderClauses().get(indexClause).getClause(); - if (!(EMAIL_IDENTIFIER + "." + Email.PROPERTY_TOPIA_ID).equals(clause)) + if (!(EMAIL_IDENTIFIER + "." + TopiaEntity.PROPERTY_TOPIA_ID).equals(clause)) hqlForFetchStep1.append(", ").append(clause); } if (orderClause != null && !orderByWithSum && !orderByWithSize) { @@ -1092,7 +1092,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { // do to bug https://hibernate.atlassian.net/browse/HHH-1615 that can be reproduced // on sql server - String inProgressQuantitiesByRangeQuery = "SELECT range." + Range.PROPERTY_TOPIA_ID + "," + + String inProgressQuantitiesByRangeQuery = "SELECT range." + TopiaEntity.PROPERTY_TOPIA_ID + "," + " SUM(rangeRow." + RangeRow.PROPERTY_PRODUCT_QUANTITY + ") AS prodQ," + " SUM(rangeRow." + RangeRow.PROPERTY_SAV_QUANTITY + ") AS savQ," + " SUM(rangeRow." + RangeRow.PROPERTY_QUOTATION_QUANTITY + ") AS quotQ" + @@ -1165,7 +1165,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { // do to bug https://hibernate.atlassian.net/browse/HHH-1615 that can be reproduced // on sql server - String waitingQuantitiesByRangeQuery = "SELECT range." + Range.PROPERTY_TOPIA_ID + "," + + String waitingQuantitiesByRangeQuery = "SELECT range." + TopiaEntity.PROPERTY_TOPIA_ID + "," + " SUM(rangeRow." + RangeRow.PROPERTY_PRODUCT_QUANTITY + ") AS prodQ," + " SUM(rangeRow." + RangeRow.PROPERTY_SAV_QUANTITY + ") AS savQ," + " SUM(rangeRow." + RangeRow.PROPERTY_QUOTATION_QUANTITY + ") AS quotQ" + @@ -1324,7 +1324,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { query.append(folderAndStatusCondition); if (sum) { - query.append(" GROUP BY email." + Email.PROPERTY_TOPIA_ID); + query.append(" GROUP BY email." + TopiaEntity.PROPERTY_TOPIA_ID); } List<Object> queryResults = findAll(query.toString(), args); diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java index af8fb883..a4d9751b 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java @@ -69,6 +69,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntities; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -201,9 +202,9 @@ public class ConfigurationServiceImpl extends FaxToMailServiceSupport implements // copy binderDemandType.copyExcluding(demandType, currentDemandType, - DemandType.PROPERTY_TOPIA_ID, - DemandType.PROPERTY_TOPIA_CREATE_DATE, - DemandType.PROPERTY_TOPIA_VERSION); + TopiaEntity.PROPERTY_TOPIA_ID, + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, + TopiaEntity.PROPERTY_TOPIA_VERSION); // persist if (currentDemandType.isPersisted()) { @@ -232,9 +233,9 @@ public class ConfigurationServiceImpl extends FaxToMailServiceSupport implements // copy binderStamp.copyExcluding(stamp, currentStamp, - Stamp.PROPERTY_TOPIA_ID, - Stamp.PROPERTY_TOPIA_CREATE_DATE, - Stamp.PROPERTY_TOPIA_VERSION); + TopiaEntity.PROPERTY_TOPIA_ID, + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, + TopiaEntity.PROPERTY_TOPIA_VERSION); // persist if (currentStamp.isPersisted()) { @@ -271,9 +272,9 @@ public class ConfigurationServiceImpl extends FaxToMailServiceSupport implements // copy binderEtatAttente.copyExcluding(waitingState, currentWaitingState, - WaitingState.PROPERTY_TOPIA_ID, - WaitingState.PROPERTY_TOPIA_CREATE_DATE, - WaitingState.PROPERTY_TOPIA_VERSION); + TopiaEntity.PROPERTY_TOPIA_ID, + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, + TopiaEntity.PROPERTY_TOPIA_VERSION); // persist if (currentWaitingState.isPersisted()) { @@ -345,9 +346,9 @@ public class ConfigurationServiceImpl extends FaxToMailServiceSupport implements } binderMailFolder.copyExcluding(mailFolder, currentMailFolder, - MailFolder.PROPERTY_TOPIA_ID, - MailFolder.PROPERTY_TOPIA_CREATE_DATE, - MailFolder.PROPERTY_TOPIA_VERSION, + TopiaEntity.PROPERTY_TOPIA_ID, + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, + TopiaEntity.PROPERTY_TOPIA_VERSION, MailFolder.PROPERTY_CHILDREN, MailFolder.PROPERTY_WAITING_STATES, MailFolder.PROPERTY_PARENT); @@ -475,9 +476,9 @@ public class ConfigurationServiceImpl extends FaxToMailServiceSupport implements } binder.copyExcluding(newEmailAccount, emailAccount, - EmailAccount.PROPERTY_TOPIA_ID, - EmailAccount.PROPERTY_TOPIA_CREATE_DATE, - EmailAccount.PROPERTY_TOPIA_VERSION, + TopiaEntity.PROPERTY_TOPIA_ID, + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, + TopiaEntity.PROPERTY_TOPIA_VERSION, EmailAccount.PROPERTY_PASSWORD); // password is only present for new account (not for edited ones) @@ -510,9 +511,9 @@ public class ConfigurationServiceImpl extends FaxToMailServiceSupport implements } binder.copyExcluding(newBrandsForDomain, brandsForDomain, - BrandsForDomain.PROPERTY_TOPIA_ID, - BrandsForDomain.PROPERTY_TOPIA_CREATE_DATE, - BrandsForDomain.PROPERTY_TOPIA_VERSION); + TopiaEntity.PROPERTY_TOPIA_ID, + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, + TopiaEntity.PROPERTY_TOPIA_VERSION); if (brandsForDomain.isPersisted()) { @@ -542,9 +543,9 @@ public class ConfigurationServiceImpl extends FaxToMailServiceSupport implements } binder.copyExcluding(newSigningForDomain, signingForDomain, - SigningForDomain.PROPERTY_TOPIA_ID, - SigningForDomain.PROPERTY_TOPIA_CREATE_DATE, - SigningForDomain.PROPERTY_TOPIA_VERSION); + TopiaEntity.PROPERTY_TOPIA_ID, + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, + TopiaEntity.PROPERTY_TOPIA_VERSION); if (signingForDomain.isPersisted()) { diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 7af4673a..16ad82f3 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -146,6 +146,8 @@ import static org.nuiton.i18n.I18n.t; public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailService { private static final Log log = LogFactory.getLog(EmailServiceImpl.class); + public static final String SEMICOLON_SPLIT_PATTERN = "\\s*;\\s*"; + public static final String DD_MM_YYYY_HH_MM = "dd/MM/yyyy HH:mm"; protected Binder<Attachment, Attachment> attachmentBinder = BinderFactory.newBinder(Attachment.class, Attachment.class); @@ -535,15 +537,15 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe // copy new data attachmentBinder.copyExcluding(attachment, currentAttachment, - Attachment.PROPERTY_EMAIL, - Attachment.PROPERTY_EDITED_FILE, - Attachment.PROPERTY_EDITED_FILE_NAME, - Attachment.PROPERTY_ORIGINAL_FILE, - Attachment.PROPERTY_ORIGINAL_FILE_NAME, - Attachment.PROPERTY_TOPIA_CREATE_DATE, - Attachment.PROPERTY_TOPIA_ID, - Attachment.PROPERTY_TOPIA_VERSION, - Attachment.PROPERTY_GENERATED_PDFPAGES); + Attachment.PROPERTY_EMAIL, + Attachment.PROPERTY_EDITED_FILE, + Attachment.PROPERTY_EDITED_FILE_NAME, + Attachment.PROPERTY_ORIGINAL_FILE, + Attachment.PROPERTY_ORIGINAL_FILE_NAME, + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, + TopiaEntity.PROPERTY_TOPIA_ID, + TopiaEntity.PROPERTY_TOPIA_VERSION, + Attachment.PROPERTY_GENERATED_PDFPAGES); currentAttachment.setEmail(email); currentAttachment.setEditedFile(editedFile); @@ -1022,7 +1024,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe @Override public void unlockEmail(String emailId) { MailLockTopiaDao mailLockDao = getPersistenceContext().getMailLockDao(); - MailLock mailLock = mailLockDao.forAll().addEquals(MailLock.PROPERTY_LOCK_ON + "." + Email.PROPERTY_TOPIA_ID, emailId).findUniqueOrNull(); + MailLock mailLock = mailLockDao.forAll().addEquals(MailLock.PROPERTY_LOCK_ON + "." + TopiaEntity.PROPERTY_TOPIA_ID, emailId).findUniqueOrNull(); // ca peut être null si c'est un emailId qui est valorisé suite à une creation et donc // qui n'a pas été vérrouillé avant if (mailLock != null) { @@ -1198,14 +1200,14 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe message.setCharset(EmailConstants.UTF_8); message.setFrom(from); - String[] tos = to.split("\\s*;\\s*"); + String[] tos = to.split(SEMICOLON_SPLIT_PATTERN); message.addTo(tos); if (StringUtils.isNotBlank(cc)) { - String[] ccs = cc.split("\\s*;\\s*"); + String[] ccs = cc.split(SEMICOLON_SPLIT_PATTERN); message.addCc(ccs); } if (StringUtils.isNotBlank(bcc)) { - String[] bccs = bcc.split("\\s*;\\s*"); + String[] bccs = bcc.split(SEMICOLON_SPLIT_PATTERN); message.addBcc(bccs); } message.setSubject(subject); @@ -1415,7 +1417,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe message.setCharset(EmailConstants.UTF_8); message.setFrom(from); - String[] tos = to.split("\\s*;\\s*"); + String[] tos = to.split(SEMICOLON_SPLIT_PATTERN); message.addTo(tos); message.setSubject(subject); @@ -1617,7 +1619,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe Map<String, Object> scopes = new HashMap<String, Object>(); scopes.put("title", email.getTitle()); - scopes.put("receivedDate", DateFormatUtils.format(email.getReceptionDate(), "dd/MM/yyyy HH:mm")); + scopes.put("receivedDate", DateFormatUtils.format(email.getReceptionDate(), DD_MM_YYYY_HH_MM)); scopes.put("sender", email.getSender()); scopes.put("object", email.getObject()); scopes.put("client", email.getClient()); @@ -1629,22 +1631,22 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe scopes.put("status", email.getDemandStatus()); scopes.put("takenBy", email.getTakenBy() == null ? "" : userDecorator.toString(email.getTakenBy())); scopes.put("message", email.getComment()); - scopes.put("date", DateFormatUtils.format(serviceContext.getNow(), "dd/MM/yyyy HH:mm")); + scopes.put("date", DateFormatUtils.format(serviceContext.getNow(), DD_MM_YYYY_HH_MM)); scopes.put("firstOpeningUser", email.getFirstOpeningUser() == null ? "" : userDecorator.toString(email.getFirstOpeningUser())); scopes.put("firstOpeningDate", email.getFirstOpeningDate() == null ? - "" : DateFormatUtils.format(email.getFirstOpeningDate(), "dd/MM/yyyy HH:mm")); + "" : DateFormatUtils.format(email.getFirstOpeningDate(), DD_MM_YYYY_HH_MM)); scopes.put("lastModificationUser", email.getLastModificationUser() == null ? "" : userDecorator.toString(email.getLastModificationUser())); scopes.put("lastModificationDate", email.getLastModificationDate() == null ? - "" : DateFormatUtils.format(email.getLastModificationDate(), "dd/MM/yyyy HH:mm")); + "" : DateFormatUtils.format(email.getLastModificationDate(), DD_MM_YYYY_HH_MM)); scopes.put("lastAttachmentOpeningInFolderUser", email.getLastAttachmentOpeningInFolderUser() == null ? "" : userDecorator.toString(email.getLastAttachmentOpeningInFolderUser())); scopes.put("lastAttachmentOpeningInFolderDate", email.getLastAttachmentOpeningInFolderDate() == null ? - "" : DateFormatUtils.format(email.getLastAttachmentOpeningInFolderDate(), "dd/MM/yyyy HH:mm")); + "" : DateFormatUtils.format(email.getLastAttachmentOpeningInFolderDate(), DD_MM_YYYY_HH_MM)); scopes.put("hasRangeRows", email.sizeRangeRow() > 0); scopes.put("rangeRows", email.getRangeRow()); @@ -2370,7 +2372,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe //On remplace les font-size:0 pour éviter les font-size too small //cf #10123 - content = content.replaceAll("font-size:0", "font-size:1"); + content = content.replace("font-size:0", "font-size:1"); content = content.replaceAll("(.+) width=([\"])(.+)([\"])", "$1"); @@ -2379,7 +2381,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe content = content.replaceAll("(.+) height=(['])(.+)(['])", "$1"); content = content.replaceAll("(.+) style=([\"])(.+)([\"])", "$1"); content = content.replaceAll("(.+) style=(['])(.+)(['])", "$1"); - content = content.replaceAll(" ",""); + content = content.replace(" ",""); contents.add(content); } diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java index 076deafc..66092eaa 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java @@ -59,6 +59,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Import; import org.nuiton.csv.ImportRuntimeException; import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -138,7 +139,7 @@ public class ReferentielServiceImpl extends FaxToMailServiceSupport implements R } clientBinder.copyExcluding(client, current, - Client.PROPERTY_TOPIA_ID, + TopiaEntity.PROPERTY_TOPIA_ID, Client.PROPERTY_TOPIA_CREATE_DATE, Client.PROPERTY_TOPIA_VERSION); diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java index 6de2dfd2..99d6ff7b 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java @@ -32,6 +32,7 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserImpl; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; import com.franciaflex.faxtomail.services.service.LdapServiceImpl; import org.apache.commons.collections4.CollectionUtils; +import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; @@ -46,7 +47,7 @@ public class LdapServiceMock extends LdapServiceImpl { FaxToMailUserTopiaDao userDao = getPersistenceContext().getFaxToMailUserDao(); FaxToMailUserGroupTopiaDao groupDao = getPersistenceContext().getFaxToMailUserGroupDao(); - FaxToMailUser fakeUser = userDao.forAll().setOrderByArguments(FaxToMailUser.PROPERTY_TOPIA_ID).findFirstOrNull(); + FaxToMailUser fakeUser = userDao.forAll().setOrderByArguments(TopiaEntity.PROPERTY_TOPIA_ID).findFirstOrNull(); // create user if (fakeUser == null) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java index 05b971cc..5158ae7d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java @@ -28,6 +28,7 @@ import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import org.jdesktop.beans.AbstractSerializableBean; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -175,7 +176,7 @@ public class DemandeListUIModel extends AbstractSerializableBean { builder.addOrder(MailField.RECEPTION_DATE.getOrderProperty()); } - builder.addOrder(EmailTopiaDao.EMAIL_IDENTIFIER + "." + Email.PROPERTY_TOPIA_ID); + builder.addOrder(EmailTopiaDao.EMAIL_IDENTIFIER + "." + TopiaEntity.PROPERTY_TOPIA_ID); setPaginationParameter(builder.build()); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java index afd3be14..65951b68 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java @@ -30,6 +30,7 @@ import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; import com.franciaflex.faxtomail.persistence.entities.Stamp; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; diff --git a/pom.xml b/pom.xml index ab3fb99e..44e93c3b 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.44-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.43</jaxxVersion> <!-- do not upgrade to 1.6.5-1 --> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm