From f87bb2bdb01a6007b8dec552ea860e88788b850c Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Sat, 10 Feb 2018 17:06:50 +0800
Subject: [PATCH] merge

---
 .../src/main/java/com/xwbing/demo/CollectionDemo.java  |  2 +-
 .../src/main/java/com/xwbing/demo/LambdaDemo.java      | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/demo/CollectionDemo.java b/boot-service/src/main/java/com/xwbing/demo/CollectionDemo.java
index c46bf2f..55b7606 100644
--- a/boot-service/src/main/java/com/xwbing/demo/CollectionDemo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/CollectionDemo.java
@@ -91,7 +91,7 @@ public class CollectionDemo {
         boolean isEmpty = list.isEmpty();// 是否为空
         boolean contains = list.contains(Integer.valueOf(1));// 是否包含元素
         // l.clear();//清除集合元素
-        Set<Integer> s = new HashSet<Integer>();// 无序
+        Set<Integer> s = new HashSet<>();// 无序
         s.add(111);
         s.add(222);
         s.add(333);
diff --git a/boot-service/src/main/java/com/xwbing/demo/LambdaDemo.java b/boot-service/src/main/java/com/xwbing/demo/LambdaDemo.java
index 092f39d..bcf687a 100644
--- a/boot-service/src/main/java/com/xwbing/demo/LambdaDemo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/LambdaDemo.java
@@ -87,7 +87,7 @@ public class LambdaDemo {
     }
 
     /**
-     * 遍历集合，集合里数据还要进行复杂操作，导致速度很慢
+     * 遍历集合，集合里数据还要进行复杂操作，导致速度很慢,用以下操作
      */
     public List<Integer> supplyAsync() {
         List<Integer> list = new ArrayList<>();
@@ -96,12 +96,12 @@ public class LambdaDemo {
         }
         int size = list.size();
         CompletableFuture[] futures = new CompletableFuture[size];
-        List<Integer> finalList = new ArrayList<>();
+        List<Integer> finalList = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {
             finalList.add(null);//必须有这步，否则会下标越界
             Integer integer = list.get(i);
             final int pos = i;
-            futures[i] = CompletableFuture.supplyAsync(() -> finalList.set(pos, integer),taskExecutor);//按原来顺序存
+            futures[i] = CompletableFuture.supplyAsync(() -> finalList.set(pos, integer), taskExecutor);//按原来顺序存
         }
         CompletableFuture.allOf(futures).join();//线程等待,效果等同于get(),会拋出CompletionException
 //        CompletableFuture<Void> completableFuture = CompletableFuture.allOf(futures);
@@ -146,10 +146,6 @@ public class LambdaDemo {
         return Collections.EMPTY_LIST;
     }
 
-    private JSONObject setData(JSONObject object) {
-        return object;
-    }
-
     private String isAdmin(String id) {
         return "Y";
     }