This is an automated email from the git hooks/post-receive script. New commit to branch feature/java8 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit ee249d27097fae94951d74d1ec0a18cd1e0338af Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 26 14:36:14 2016 +0200 passage à java 8 et remplacmeent de guava --- faxtomail-persistence/pom.xml | 5 ---- .../persistence/entities/BrandsForDomainImpl.java | 4 +-- .../persistence/entities/MailFolders.java | 26 +++++++++++++++++++ faxtomail-service/pom.xml | 5 ---- faxtomail-ui-swing/pom.xml | 5 ---- .../content/attachment/AttachmentCellEditor.java | 17 +++++++----- .../attachment/AttachmentEditorUIHandler.java | 14 ++++++---- .../attachment/AttachmentEditorUIModel.java | 10 ++------ .../content/demande/actions/ArchiveAction.java | 30 +++++----------------- .../demande/actions/ArchiveFromListAction.java | 27 +++++-------------- .../util/AbstractFaxToMailDemandListHandler.java | 6 ++--- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 16 ++++++++++-- .../ui/swing/util/CheckBoxComboBoxModel.java | 7 ++--- .../ui/swing/util/CheckBoxListCellRenderer.java | 22 ++++++++-------- faxtomail-ui-web/pom.xml | 5 ---- pom.xml | 12 +++------ 16 files changed, 97 insertions(+), 114 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index be13f19..3b0595e 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -84,11 +84,6 @@ </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/BrandsForDomainImpl.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/BrandsForDomainImpl.java index 6d8eec9..07f8156 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/BrandsForDomainImpl.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/BrandsForDomainImpl.java @@ -24,10 +24,10 @@ package com.franciaflex.faxtomail.persistence.entities; * #L% */ -import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -49,7 +49,7 @@ public class BrandsForDomainImpl extends BrandsForDomainAbstract { if (json == null) { brands = new ArrayList<>(); } else { - brands = Lists.newArrayList(json.split(",")); + brands = Arrays.asList(json.split(",")); } return brands; } diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolders.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolders.java new file mode 100644 index 0000000..6a47ead --- /dev/null +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolders.java @@ -0,0 +1,26 @@ +package com.franciaflex.faxtomail.persistence.entities; + +import java.util.Collection; +import java.util.Optional; + +/** + * @author Kevin Morin (Code Lutin) + * @since 2.1.3 + */ +public class MailFolders { + + public static Optional<MailFolder> getArchiveChild(MailFolder folder) { + Optional<MailFolder> archiveChild = Optional.empty(); + + do { + Collection<MailFolder> children = folder.getChildren(); + if (children != null) { + archiveChild = children.stream().filter(MailFolder::isArchiveFolder).findFirst(); + } + folder = folder.getParent(); + + } while (!archiveChild.isPresent() && folder != null); + + return archiveChild; + } +} diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index c11bbcd..d551b92 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -109,11 +109,6 @@ </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index e36ff35..d98911c 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -116,11 +116,6 @@ </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java index 0401a2e..06406d5 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java @@ -33,19 +33,22 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; -import com.google.common.base.Preconditions; -import com.google.common.collect.Sets; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.AbstractCellEditor; +import javax.swing.JTable; import javax.swing.border.LineBorder; import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; -import java.awt.*; +import java.awt.Color; +import java.awt.Component; import java.util.Date; import java.util.EventObject; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * To edit attachments from a table cell. @@ -124,7 +127,7 @@ public class AttachmentCellEditor extends AbstractCellEditor implements TableCel // different cas: // depuis la liste, on doit mettre à jour Email.PROPERTY_LAST_ATTACHMENT_OPENER // depuis l'edition d'une demande, Email.PROPERTY_HISTORY - model.fromEntityIncluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY, Email.PROPERTY_LAST_ATTACHMENT_OPENER)); + model.fromEntityIncluding(email, Stream.of(Email.PROPERTY_HISTORY, Email.PROPERTY_LAST_ATTACHMENT_OPENER).collect(Collectors.toSet())); } } @@ -141,7 +144,7 @@ public class AttachmentCellEditor extends AbstractCellEditor implements TableCel // different cas: // depuis la liste, on doit mettre à jour Email.PROPERTY_LAST_ATTACHMENT_OPENER // depuis l'edition d'une demande, Email.PROPERTY_HISTORY - model.fromEntityIncluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY, Email.PROPERTY_LAST_ATTACHMENT_OPENER)); + model.fromEntityIncluding(email, Stream.of(Email.PROPERTY_HISTORY, Email.PROPERTY_LAST_ATTACHMENT_OPENER).collect(Collectors.toSet())); } }; @@ -159,7 +162,7 @@ public class AttachmentCellEditor extends AbstractCellEditor implements TableCel public Object getCellEditorValue() { AttachmentEditorUIModel model = editorButton.getBean(); - Preconditions.checkNotNull(model, "No model found in editor."); + Objects.requireNonNull(model, "No model found in editor."); Object result = model.getAttachment(); if (log.isDebugEnabled()) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java index a8d4b0a..f637282 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java @@ -27,9 +27,8 @@ package com.franciaflex.faxtomail.ui.swing.content.attachment; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.ui.swing.content.attachment.actions.EditAttachmentAction; import com.franciaflex.faxtomail.ui.swing.content.attachment.actions.OpenAttachmentAction; -import com.franciaflex.faxtomail.ui.swing.util.toolbar.AbstractToolbarPopupHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; -import com.google.common.collect.Iterables; +import com.franciaflex.faxtomail.ui.swing.util.toolbar.AbstractToolbarPopupHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.HidorButton; import jaxx.runtime.validator.swing.SwingValidator; @@ -39,7 +38,12 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.HighlighterFactory; -import javax.swing.*; +import javax.swing.AbstractCellEditor; +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JTable; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.AbstractTableModel; @@ -49,7 +53,7 @@ import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; import javax.swing.table.TableModel; -import java.awt.*; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; @@ -111,7 +115,7 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<Attac @Override public Object getValueAt(int rowIndex, int columnIndex) { - return Iterables.get(attachmentList, rowIndex); + return CollectionUtils.get(attachmentList, rowIndex); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java index 7aabb5c..fe851da 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java @@ -26,8 +26,6 @@ package com.franciaflex.faxtomail.ui.swing.content.attachment; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; -import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.util.beans.Binder; @@ -37,6 +35,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; /** * @author Kevin Morin (Code Lutin) @@ -134,12 +133,7 @@ public class AttachmentEditorUIModel extends AbstractFaxToMailBeanUIModel<Attach if (attachments != null) { - inlineAttachments.addAll(Collections2.filter(attachments, new Predicate<Attachment>() { - @Override - public boolean apply(Attachment input) { - return input.isInlineAttachment(); - } - })); + inlineAttachments.addAll(attachments.stream().filter(Attachment::isInlineAttachment).collect(Collectors.toList())); this.attachments.addAll(attachments); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveAction.java index 0fad329..a7df9e3 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveAction.java @@ -26,15 +26,13 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.actions; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.MailFolders; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.google.common.base.Optional; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; -import javax.swing.*; -import java.util.Collection; +import javax.swing.JOptionPane; import java.util.Date; +import java.util.Optional; import static org.nuiton.i18n.I18n.t; @@ -83,28 +81,12 @@ public class ArchiveAction extends SaveDemandeAndExitAction { // les dossiers d'archive ne sont pas visible dans l'arbre des dossiers, mais les archives // peuvent être consultées dans la recherche MailFolder folder = model.getMailFolder(); - MailFolder archiveChild = null; - do { - Collection<MailFolder> children = folder.getChildren(); - if (children != null) { - Optional<MailFolder> optArchiveChild = Iterables.tryFind(children, new Predicate<MailFolder>() { - @Override - public boolean apply(MailFolder mailFolder) { - return mailFolder.isArchiveFolder(); - } - }); - if (optArchiveChild.isPresent()) { - archiveChild = optArchiveChild.get(); - } - } - folder = folder.getParent(); - - } while (archiveChild == null && folder != null); + Optional<MailFolder> archiveChild = MailFolders.getArchiveChild(folder); // le dossier d'archive peut ne pas exister. Dans ce cas on laisse le mail dans le dossier // d'origine - if (archiveChild != null) { - model.setMailFolder(archiveChild); + if (archiveChild.isPresent()) { + model.setMailFolder(archiveChild.get()); } model.setArchiveDate(new Date()); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java index 0bc0695..cfdcf49 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java @@ -28,16 +28,15 @@ import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.MailAction; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.MailFolders; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.google.common.base.Optional; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; -import javax.swing.*; +import javax.swing.JOptionPane; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Optional; import static org.nuiton.i18n.I18n.t; @@ -110,22 +109,8 @@ public class ArchiveFromListAction extends SaveDemandeFromListAction { // les dossiers d'archive ne sont pas visible dans l'arbre des dossiers, mais les archives // peuvent être consultées dans la recherche MailFolder folder = demandsToArchive.get(0).getMailFolder(); - MailFolder archiveChild = null; - do { - if (folder.getChildren() != null) { - Optional<MailFolder> optArchiveChild = Iterables.tryFind(folder.getChildren(), new Predicate<MailFolder>() { - @Override - public boolean apply(MailFolder mailFolder) { - return mailFolder.isArchiveFolder(); - } - }); - if (optArchiveChild.isPresent()) { - archiveChild = optArchiveChild.get(); - } - } - folder = folder.getParent(); - } while (archiveChild == null && folder != null); + Optional<MailFolder> archiveChild = MailFolders.getArchiveChild(folder); for (DemandeUIModel email : demandsToArchive) { email.setArchiveDate(new Date()); @@ -133,8 +118,8 @@ public class ArchiveFromListAction extends SaveDemandeFromListAction { email.setTakenBy(null); // le dossier d'archive peut ne pas exister. Dans ce cas on laisse le mail dans le dossier // d'origine - if (archiveChild != null) { - email.setMailFolder(archiveChild); + if (archiveChild.isPresent()) { + email.setMailFolder(archiveChild.get()); } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java index d1509d3..36acd11 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java @@ -40,8 +40,6 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupCellRenderer; import com.franciaflex.faxtomail.ui.swing.content.demande.replies.RepliesCellEditor; import com.franciaflex.faxtomail.ui.swing.content.demande.replies.RepliesCellRenderer; -import com.google.common.base.Function; -import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -72,9 +70,11 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.function.Function; /** * @author Kevin Morin (Code Lutin) @@ -150,7 +150,7 @@ public abstract class AbstractFaxToMailDemandListHandler<M, UI extends FaxToMail TableColumnModelExt columnModel = new DefaultTableColumnModelExt(); if (CollectionUtils.isEmpty(columns)) { - columns = Lists.newArrayList(MailField.getTableFields()); + columns = Arrays.asList(MailField.getTableFields()); } for (MailField columnName : columns) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java index 8898d99..414ddaa 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java @@ -56,10 +56,22 @@ import org.nuiton.jaxx.application.swing.util.CloseableUI; import org.nuiton.util.beans.BeanUtil; import org.nuiton.validator.bean.simple.SimpleBeanValidator; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.ComboBoxModel; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JOptionPane; +import javax.swing.JRootPane; +import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; import javax.swing.table.TableColumnModel; import javax.swing.text.JTextComponent; -import java.awt.*; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Frame; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java index 0afc687..cec6197 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java @@ -25,9 +25,10 @@ package com.franciaflex.faxtomail.ui.swing.util; */ import com.franciaflex.faxtomail.persistence.entities.HasLabel; -import com.google.common.collect.Iterables; +import org.apache.commons.collections4.CollectionUtils; -import javax.swing.*; +import javax.swing.AbstractListModel; +import javax.swing.ComboBoxModel; import java.util.ArrayList; import java.util.List; @@ -76,6 +77,6 @@ public class CheckBoxComboBoxModel<HL extends HasLabel> extends AbstractListMode @Override public HL getElementAt(int index) { - return Iterables.get(values, index); + return CollectionUtils.get(values, index); } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java index 6d8aee9..584d079 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java @@ -25,15 +25,22 @@ package com.franciaflex.faxtomail.ui.swing.util; */ import com.franciaflex.faxtomail.persistence.entities.HasLabel; -import com.google.common.base.Function; -import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; -import javax.swing.*; +import javax.swing.DefaultListCellRenderer; +import javax.swing.JCheckBox; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.ListCellRenderer; +import javax.swing.UIManager; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; -import java.awt.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.Rectangle; import java.io.Serializable; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -137,12 +144,7 @@ public abstract class CheckBoxListCellRenderer<HL extends HasLabel> } else { if (value != null && java.util.List.class.isAssignableFrom(value.getClass())) { java.util.List<HL> etats = (java.util.List<HL>) value; - java.util.List<String> e = Lists.transform(etats, new Function<HL, String>() { - @Override - public String apply(HL input) { - return input != null ? input.getLabel() : noneLabel; - } - }); + java.util.List<String> e = etats.stream().map(input -> input != null ? input.getLabel() : noneLabel).collect(Collectors.toList()); decorate = StringUtils.join(e, " ou "); label.setText(decorate); } diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 62849bc..47d1adf 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -108,11 +108,6 @@ </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> </dependency> diff --git a/pom.xml b/pom.xml index b38eee6..6625e64 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> <nuitonWebVersion>1.17</nuitonWebVersion> - <eugeneVersion>2.13</eugeneVersion> + <eugeneVersion>3.0-alpha-4</eugeneVersion> <topiaVersion>3.0-beta-13</topiaVersion> <hibernateVersion>4.3.6.Final</hibernateVersion> <h2Version>1.3.176</h2Version> @@ -137,8 +137,8 @@ <license.licenseName>gpl_v3</license.licenseName> <!-- Java version --> - <javaVersion>1.7</javaVersion> - <signatureArtifactId>java17</signatureArtifactId> + <javaVersion>1.8</javaVersion> + <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> <!-- issues status to include in changelog --> @@ -305,12 +305,6 @@ </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guavaVersion}</version> - </dependency> - - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.