You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/02/25 12:58:16 UTC
[isis] branch master updated: ISIS-1841 refactor: remove guava
idioms
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new c8edfae ISIS-1841 refactor: remove guava idioms
c8edfae is described below
commit c8edfaeed86b61fdd8d5e9db679aab1c8a1d9532
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Feb 25 13:58:14 2018 +0100
ISIS-1841 refactor: remove guava idioms
---
.../isis/applib/annotation/MemberGroupLayout.java | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java
index 5721a1d..d072cc0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java
@@ -24,11 +24,11 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.util.ArrayList;
import java.util.List;
-import com.google.common.base.Function;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import java.util.stream.Collectors;
+
+import org.apache.isis.applib.internal.base._Strings;
/**
* Specifies the positioning of an entity's (groups of) properties and of its collections, on a page, column by column.
@@ -62,21 +62,17 @@ public @interface MemberGroupLayout {
private final int collections;
public static ColumnSpans valueOf(String str) {
- final Iterable<String> split = Splitter.on(",").split(str);
try {
- final List<Integer> list = Lists.newArrayList(Iterables.transform(split, new Function<String,Integer>() {
- @Override
- public Integer apply(String input) {
- return Integer.parseInt(input);
- }
- }));
+ final List<Integer> list = _Strings.splitThenStream(str, ",")
+ .map(Integer::parseInt)
+ .collect(Collectors.toList());
return asSpans(list);
} catch(RuntimeException ex) {
return null;
}
}
public static ColumnSpans asSpans(int... columnSpans) {
- List<Integer> list = Lists.<Integer>newArrayList();
+ final List<Integer> list = new ArrayList<>();
for (int i : columnSpans) {
list.add(i);
}
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.