This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 03c1b05de945705883fa6e41f14076f67157f676 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Mon Dec 12 22:39:39 2016 +0100 refs #1308: Replace deprecated apis --- .../org/chorem/pollen/PollenConfiguration.java | 30 +++++++++------------- .../business/persistence/CommentDAOImpl.java | 6 ++--- .../chorem/pollen/services/impl/PollService.java | 9 +++---- .../pollen/services/impl/SecurityService.java | 6 ++--- .../pollen/services/impl/FavoriteServiceTest.java | 7 ++--- .../pollen/ui/PollenStaticContentLoader.java | 3 ++- .../chorem/pollen/ui/actions/poll/GetPollFeed.java | 3 ++- .../pollen/ui/actions/poll/admin/ExportPoll.java | 3 ++- 8 files changed, 32 insertions(+), 35 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java index c7dfc25..8d30751 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java @@ -22,15 +22,8 @@ */ package org.chorem.pollen; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.Collections; -import java.util.Comparator; -import java.util.Enumeration; -import java.util.List; -import java.util.Properties; - +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; @@ -42,10 +35,15 @@ import org.chorem.pollen.business.persistence.PollVoteVisibility; 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 com.google.common.base.Preconditions; -import com.google.common.collect.Lists; +import java.io.File; +import java.net.URL; +import java.util.Collections; +import java.util.Comparator; +import java.util.Enumeration; +import java.util.List; +import java.util.Properties; /** * Pollen configuration. @@ -371,12 +369,8 @@ public class PollenConfiguration { if (log.isInfoEnabled()) { log.info(key + " = " + directory); } - try { - FileUtil.createDirectoryIfNecessary(directory); - } catch (IOException e) { - throw new PollenTechnicalException( - "Could not create directory " + directory, e); - } + + FileUtil.createDirectoryIfNecessary(directory); } public static final Comparator<PollenConfigurationOption> POLLEN_CONFIGURATION_OPTION_COMPARATOR = new Comparator<PollenConfigurationOption>() { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java index 36be5ed..7050471 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java @@ -22,7 +22,7 @@ */ package org.chorem.pollen.business.persistence; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import org.chorem.pollen.entities.PollenDAOHelper; import org.nuiton.topia.TopiaException; @@ -39,8 +39,8 @@ public class CommentDAOImpl<E extends Comment> extends CommentDAOAbstract<E> { @Override public int compare(Comment o1, Comment o2) { // AThimel 26/11/2014: For backward compatibility, in case some comment does not have a postDate (there is no notnull constraint) - Date d1 = Objects.firstNonNull(o1.getPostDate(), o1.getTopiaCreateDate()); - Date d2 = Objects.firstNonNull(o2.getPostDate(), o2.getTopiaCreateDate()); + Date d1 = MoreObjects.firstNonNull(o1.getPostDate(), o1.getTopiaCreateDate()); + Date d2 = MoreObjects.firstNonNull(o2.getPostDate(), o2.getTopiaCreateDate()); return d1.compareTo(d2); } }; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java index 42e9ca7..d2760b6 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java @@ -23,12 +23,10 @@ package org.chorem.pollen.services.impl; import com.google.common.base.Function; -import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; @@ -73,6 +71,7 @@ import java.util.Date; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import static org.nuiton.i18n.I18n.l; @@ -735,7 +734,7 @@ public class PollService extends PollenServiceSupport { PollImageChoice imageChoice = (PollImageChoice) choice; if (newChoice || - !ObjectUtils.equals(choice.getName(), + !Objects.equals(choice.getName(), choiceLoaded.getName())) { // copy image where it belong and generate the thumb // only if choice is to create or name has change (so image too...) @@ -935,7 +934,7 @@ public class PollService extends PollenServiceSupport { String accountId = pollAccount.getAccountId(); String accountEmail = pollAccount.getEmail(); - if (ObjectUtils.equals(creatorEmail, pollAccount.getEmail())) { + if (Objects.equals(creatorEmail, pollAccount.getEmail())) { // use the creator account pollAccountLoaded = pollAccountDAO.findByAccountId( @@ -978,7 +977,7 @@ public class PollService extends PollenServiceSupport { personToListLoaded.setWeight(personToList.getWeight()); pollAccountLoaded.setVotingId(pollAccount.getVotingId()); - boolean emailChanged = !Objects.equal(pollAccountLoaded.getEmail(), + boolean emailChanged = !Objects.equals(pollAccountLoaded.getEmail(), pollAccount.getEmail()); pollAccountLoaded.setEmail(pollAccount.getEmail()); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java index 78e9b02..882365e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java @@ -24,7 +24,6 @@ package org.chorem.pollen.services.impl; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.PollenUserSecurityContext; @@ -41,6 +40,7 @@ import org.nuiton.topia.TopiaException; import java.util.Date; import java.util.EnumSet; import java.util.List; +import java.util.Objects; import java.util.Set; import static org.chorem.pollen.PollenUserSecurityContext.PollenUserSecurityRole; @@ -462,7 +462,7 @@ public class SecurityService extends PollenServiceSupport { boolean result; - if (ObjectUtils.equals(poll.getCreator().getAccountId(), accountId)) { + if (Objects.equals(poll.getCreator().getAccountId(), accountId)) { // creator found by account id result = true; @@ -477,7 +477,7 @@ public class SecurityService extends PollenServiceSupport { //FIXME-tchemit-2012-08-28 : voir http://chorem.org/issues/796 // try to link bo user account email - result = ObjectUtils.equals(poll.getCreator().getEmail(), + result = Objects.equals(poll.getCreator().getEmail(), userAccount.getEmail()); } } else { diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java index 1e831cf..9203d54 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java @@ -33,6 +33,7 @@ import org.junit.Ignore; import org.junit.Test; import java.io.File; +import java.nio.charset.StandardCharsets; import java.util.List; /** @@ -128,7 +129,7 @@ public class FavoriteServiceTest extends AbstractPollenServiceTest { String importContent = "badEmail@ voterId"; - FileUtils.write(importFile, importContent); + FileUtils.write(importFile, importContent, StandardCharsets.UTF_8); service.importFromCsvfile(importFile.getName(), importFile); } @@ -141,7 +142,7 @@ public class FavoriteServiceTest extends AbstractPollenServiceTest { File importFile = getCsvImportFile(); String importContent = ""; - FileUtils.write(importFile, importContent); + FileUtils.write(importFile, importContent, StandardCharsets.UTF_8); List<PollAccount> importedAccount = service.importFromCsvfile(importFile.getName(), importFile); @@ -157,7 +158,7 @@ public class FavoriteServiceTest extends AbstractPollenServiceTest { File importFile = getCsvImportFile(); String importContent = "myemail@mydomain.uk voterId \n\t\t myemail2@mydomain.uk\r\r\n#Comment\n\n "; - FileUtils.write(importFile, importContent); + FileUtils.write(importFile, importContent, StandardCharsets.UTF_8); List<PollAccount> importedAccount = service.importFromCsvfile(importFile.getName(), importFile); diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java index 74abc8c..286abc0 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java @@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.charset.StandardCharsets; import java.util.Calendar; /** @@ -114,7 +115,7 @@ public class PollenStaticContentLoader extends DefaultStaticContentLoader { String path) throws IOException { if (path.contains(".js")) { - String content = IOUtils.toString(input); + String content = IOUtils.toString(input, StandardCharsets.UTF_8); if (content.indexOf("/") == 1) { // fix nasty first strange caracter for ckeditor (only on firefox :() content = content.substring(1); diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java index 251eec7..fea09ef 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java @@ -28,6 +28,7 @@ import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.ui.actions.PollenActionSupport; import java.io.InputStream; +import java.nio.charset.StandardCharsets; /** * Obtain the feed of a given poll. @@ -68,7 +69,7 @@ public class GetPollFeed extends PollenActionSupport { contentLength = content.length(); - inputStream = IOUtils.toInputStream(content); + inputStream = IOUtils.toInputStream(content, StandardCharsets.UTF_8); return SUCCESS; } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java index a8ba0aa..c1d35ed 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java @@ -27,6 +27,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; import org.chorem.pollen.ui.actions.PollenUserSecurityAware; import java.io.InputStream; +import java.nio.charset.StandardCharsets; /** * Exports an existing poll. @@ -67,7 +68,7 @@ public class ExportPoll extends PollenActionSupport implements PollenUserSecurit contentLength = exportContent.length() * 2; - inputStream = IOUtils.toInputStream(exportContent); + inputStream = IOUtils.toInputStream(exportContent, StandardCharsets.UTF_8); return SUCCESS; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.