This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git commit 9b3d93461794bf1c0f337ee4ea004f314037cf9f Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Aug 21 11:42:11 2017 +0200 fixes #317: Update to java 8 --- pom.xml | 10 +++++----- .../java/org/nuiton/util/pagination/PaginationResult.java | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 16ffd51..68d0552 100644 --- a/pom.xml +++ b/pom.xml @@ -132,11 +132,11 @@ <ciViewId>nuiton-utils</ciViewId> <!-- Java level --> - <javaVersion>1.6</javaVersion> - <signatureArtifactId>java16</signatureArtifactId> + <javaVersion>1.8</javaVersion> + <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <nuitonI18nVersion>3.6.2</nuitonI18nVersion> + <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -160,7 +160,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.5</version> + <version>3.6</version> </dependency> <dependency> @@ -196,7 +196,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>19.0</version> + <version>23.0</version> </dependency> <dependency> diff --git a/src/main/java/org/nuiton/util/pagination/PaginationResult.java b/src/main/java/org/nuiton/util/pagination/PaginationResult.java index 75bf7f6..692ca9b 100644 --- a/src/main/java/org/nuiton/util/pagination/PaginationResult.java +++ b/src/main/java/org/nuiton/util/pagination/PaginationResult.java @@ -4,7 +4,7 @@ package org.nuiton.util.pagination; * #%L * Nuiton Utils * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2017 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -22,14 +22,13 @@ package org.nuiton.util.pagination; * #L% */ -import com.google.common.base.Function; import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.Serializable; import java.util.LinkedList; import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; /** * Represents the result of a pagination request. It contains the result elements together with the @@ -185,8 +184,9 @@ public class PaginationResult<O> implements Serializable { * Creates an instance of PaginationResult transforming the current one using the given function */ public <T> PaginationResult<T> transform(Function<? super O, ? extends T> function) { - Iterable<T> transformed = Iterables.transform(getElements(), function); - List<T> transformedElements = Lists.newLinkedList(transformed); + List<T> transformedElements = getElements().stream() + .map(function) + .collect(Collectors.toList()); PaginationResult<T> result = PaginationResult.of(transformedElements, getCount(), getCurrentPage()); return result; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.