From 1ffcf1a1d2c60f48ce7da046be40948faca523ab Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 4 Jan 2019 10:21:35 +0300
Subject: minimum Java version is 11

---
 build.gradle                                       |  3 ++
 .../java/com/juick/service/TagServiceImpl.java     |  5 ++-
 src/main/java/com/juick/util/StreamUtils.java      | 38 ----------------------
 3 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 src/main/java/com/juick/util/StreamUtils.java

diff --git a/build.gradle b/build.gradle
index 7ba95475..872c3dc4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -186,6 +186,9 @@ bootRun.dependsOn ':generateDebugKey'
 compileFrontend.dependsOn 'yarn'
 processResources.dependsOn 'compileFrontend'
 
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
+
 class GenKey extends DefaultTask {
     @OutputFile
     String keystore
diff --git a/src/main/java/com/juick/service/TagServiceImpl.java b/src/main/java/com/juick/service/TagServiceImpl.java
index 42159d3b..2a7928e7 100644
--- a/src/main/java/com/juick/service/TagServiceImpl.java
+++ b/src/main/java/com/juick/service/TagServiceImpl.java
@@ -20,7 +20,6 @@ package com.juick.service;
 import com.juick.Tag;
 import com.juick.User;
 import com.juick.model.TagStats;
-import com.juick.util.StreamUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -212,8 +211,8 @@ public class TagServiceImpl extends BaseJdbcService implements TagService {
     @Override
     public Pair<String, List<Tag>> fromString(final String txt) {
         String firstLine = txt.split("\\n", 2)[0];
-        Supplier<Stream<String>> tagsStream = () -> StreamUtils.takeWhile(Arrays.stream(firstLine.split("\\ ")),
-                t -> !t.equals("*") && t.startsWith("*"));
+        Supplier<Stream<String>> tagsStream = () -> Arrays.stream(firstLine.split("\\ "))
+                .takeWhile(t -> !t.equals("*") && t.startsWith("*"));
         int tagsLength = tagsStream.get().collect(Collectors.joining(" ")).length();
         String body = txt.substring(tagsLength);
         List<Tag> tags = tagsStream.get().map(t -> getTag(t.substring(1), true))
diff --git a/src/main/java/com/juick/util/StreamUtils.java b/src/main/java/com/juick/util/StreamUtils.java
deleted file mode 100644
index 576107af..00000000
--- a/src/main/java/com/juick/util/StreamUtils.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.juick.util;
-
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-/**
- * @deprecated switch to JDK9+ Stream API when possible
- */
-@Deprecated
-public class StreamUtils {
-    private static <T> Spliterator<T> takeWhile(
-            Spliterator<T> splitr, Predicate<? super T> predicate) {
-        return new Spliterators.AbstractSpliterator<T>(splitr.estimateSize(), 0) {
-            boolean stillGoing = true;
-            @Override public boolean tryAdvance(Consumer<? super T> consumer) {
-                if (stillGoing) {
-                    boolean hadNext = splitr.tryAdvance(elem -> {
-                        if (predicate.test(elem)) {
-                            consumer.accept(elem);
-                        } else {
-                            stillGoing = false;
-                        }
-                    });
-                    return hadNext && stillGoing;
-                }
-                return false;
-            }
-        };
-    }
-
-    public static <T> Stream<T> takeWhile(Stream<T> stream, Predicate<? super T> predicate) {
-        return StreamSupport.stream(takeWhile(stream.spliterator(), predicate), false);
-    }
-}
-- 
cgit v1.2.3