demetrm
/
CR-MicroLabs-Streams-And-Lambdas
複製自 Cohort4.2/CR-MicroLabs-Streams-And-Lambdas
關注 1
收藏 0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

added predicate to MultiLine lambda methods

Demetrius Murray 6 年之前
父節點
9a5cf427ac
當前提交
f28d04ff1e
共有 5 個檔案被更改，包括 197111 行新增 和 197138 行删除
分割檢視 顯示文件統計
  1. 160
    195
      .idea/workspace.xml
  2. 16
    8
      src/main/java/com/zipcodewilmington/streams/StreamFilter.java
  3. 196934
    196934
      target/PersonWarehouse.leonlog
  4. 二進制
      target/classes/com/zipcodewilmington/streams/StreamFilter.class
  5. 1
    1
      target/global.leonlog

+ 160
- 195
.idea/workspace.xml 查看文件 

@@ -2,21 +2,9 @@
2 2 
 <project version="4">
3 3 
   <component name="ChangeListManager">
4 4 
     <list default="true" id="30b7e4a0-b899-49c3-865c-0311dfadae62" name="Default" comment="">
5 
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
6 5 
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
7 
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
8 6 
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamFilter.java" afterDir="false" />
9 
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamMap.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamMap.java" afterDir="false" />
10 
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java" afterDir="false" />
11 
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java" afterDir="false" />
12 
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ArrayConverter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ArrayConverter.java" afterDir="false" />
13 
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ListConverter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ListConverter.java" afterDir="false" />
14 
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/StreamConverter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/StreamConverter.java" afterDir="false" />
15 7 
       <change beforePath="$PROJECT_DIR$/target/PersonWarehouse.leonlog" beforeDir="false" afterPath="$PROJECT_DIR$/target/PersonWarehouse.leonlog" afterDir="false" />
16 
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zipcodewilmington/streams/anthropoid/PersonFactory.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/zipcodewilmington/streams/anthropoid/PersonFactory.class" afterDir="false" />
17 
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.class" afterDir="false" />
18 
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zipcodewilmington/streams/conversions/ArrayConverter.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/zipcodewilmington/streams/conversions/ArrayConverter.class" afterDir="false" />
19 
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zipcodewilmington/streams/conversions/ListConverter.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/zipcodewilmington/streams/conversions/ListConverter.class" afterDir="false" />
20 8 
       <change beforePath="$PROJECT_DIR$/target/global.leonlog" beforeDir="false" afterPath="$PROJECT_DIR$/target/global.leonlog" afterDir="false" />
21 9 
     </list>
22 10 
     <ignored path="$PROJECT_DIR$/out/" />
 
@@ -35,33 +23,35 @@
35 23 
     <session id="1757559033">
36 24 
       <usages-collector id="statistics.lifecycle.project">
37 25 
         <counts>
26 
+          <entry key="project.closed" value="1" />
27 
+          <entry key="project.open.time.2" value="1" />
38 28 
           <entry key="project.open.time.3" value="1" />
39 
-          <entry key="project.opened" value="1" />
29 
+          <entry key="project.opened" value="2" />
40 30 
         </counts>
41 31 
       </usages-collector>
42 32 
       <usages-collector id="statistics.file.extensions.open">
43 33 
         <counts>
44 34 
           <entry key="class" value="18" />
45 
-          <entry key="java" value="40" />
35 
+          <entry key="java" value="48" />
46 36 
           <entry key="xml" value="1" />
47 37 
         </counts>
48 38 
       </usages-collector>
49 39 
       <usages-collector id="statistics.file.types.open">
50 40 
         <counts>
51 41 
           <entry key="CLASS" value="18" />
52 
-          <entry key="JAVA" value="40" />
42 
+          <entry key="JAVA" value="48" />
53 43 
           <entry key="XML" value="1" />
54 44 
         </counts>
55 45 
       </usages-collector>
56 46 
       <usages-collector id="statistics.file.extensions.edit">
57 47 
         <counts>
58 
-          <entry key="java" value="4757" />
48 
+          <entry key="java" value="5396" />
59 49 
           <entry key="xml" value="1" />
60 50 
         </counts>
61 51 
       </usages-collector>
62 52 
       <usages-collector id="statistics.file.types.edit">
63 53 
         <counts>
64 
-          <entry key="JAVA" value="4757" />
54 
+          <entry key="JAVA" value="5396" />
65 55 
           <entry key="XML" value="1" />
66 56 
         </counts>
67 57 
       </usages-collector>
 
@@ -72,58 +62,55 @@
72 62 
       <file pinned="false" current-in-tab="true">
73 63 
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamFilter.java">
74 64 
           <provider selected="true" editor-type-id="text-editor">
75 
-            <state relative-caret-position="335">
76 
-              <caret line="90" column="40" lean-forward="true" selection-start-line="90" selection-start-column="40" selection-end-line="90" selection-end-column="40" />
65 
+            <state relative-caret-position="193">
66 
+              <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
77 67 
             </state>
78 68 
           </provider>
79 69 
         </entry>
80 70 
       </file>
81 71 
       <file pinned="false" current-in-tab="false">
82 
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamMap.java">
72 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/tools/StringUtils.java">
83 73 
           <provider selected="true" editor-type-id="text-editor">
84 
-            <state relative-caret-position="375">
85 
-              <caret line="32" column="7" lean-forward="true" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
74 
+            <state relative-caret-position="731">
75 
+              <caret line="53" selection-start-line="53" selection-end-line="53" />
86 76 
             </state>
87 77 
           </provider>
88 78 
         </entry>
89 79 
       </file>
90 80 
       <file pinned="false" current-in-tab="false">
91 
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java">
81 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/tools/RandomUtils.java">
92 82 
           <provider selected="true" editor-type-id="text-editor">
93 
-            <state relative-caret-position="277">
94 
-              <caret line="47" column="53" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="53" />
83 
+            <state relative-caret-position="677">
84 
+              <caret line="52" selection-start-line="52" selection-end-line="52" />
85 
+              <folding>
86 
+                <element signature="e#1151#1152#0" expanded="true" />
87 
+                <element signature="e#1212#1213#0" expanded="true" />
88 
+                <element signature="e#1365#1366#0" expanded="true" />
89 
+                <element signature="e#1420#1421#0" expanded="true" />
90 
+              </folding>
95 91 
             </state>
96 92 
           </provider>
97 93 
         </entry>
98 94 
       </file>
99 95 
       <file pinned="false" current-in-tab="false">
100 
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/StreamConverter.java">
96 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java">
101 97 
           <provider selected="true" editor-type-id="text-editor">
102 
-            <state relative-caret-position="525">
103 
-              <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
104 
-              <folding>
105 
-                <element signature="e#892#893#0" expanded="true" />
106 
-                <element signature="e#919#920#0" expanded="true" />
107 
-                <element signature="e#977#978#0" expanded="true" />
108 
-                <element signature="e#1020#1021#0" expanded="true" />
109 
-                <element signature="e#1094#1095#0" expanded="true" />
110 
-                <element signature="e#1150#1151#0" expanded="true" />
111 
-              </folding>
98 
+            <state relative-caret-position="630">
99 
+              <caret line="54" column="40" selection-start-line="54" selection-start-column="40" selection-end-line="54" selection-end-column="40" />
112 100 
             </state>
113 101 
           </provider>
114 102 
         </entry>
115 103 
       </file>
116 104 
       <file pinned="false" current-in-tab="false">
117 
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/TestStreamFilter.java">
105 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/StreamConverter.java">
118 106 
           <provider selected="true" editor-type-id="text-editor">
119 
-            <state relative-caret-position="210">
120 
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
107 
+            <state relative-caret-position="495">
108 
+              <caret line="40" selection-start-line="40" selection-end-line="40" />
121 109 
               <folding>
122 
-                <element signature="e#758#759#0" expanded="true" />
123 
-                <element signature="e#807#808#0" expanded="true" />
124 
-                <element signature="e#863#864#0" expanded="true" />
125 
-                <element signature="e#915#916#0" expanded="true" />
126 
-                <element signature="e#974#975#0" expanded="true" />
110 
+                <element signature="e#892#893#0" expanded="true" />
111 
+                <element signature="e#925#926#0" expanded="true" />
112 
+                <element signature="e#977#978#0" expanded="true" />
113 
+                <element signature="e#1019#1020#0" expanded="true" />
127 114 
               </folding>
128 115 
             </state>
129 116 
           </provider>
 
@@ -133,7 +120,7 @@
133 120 
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ArrayConverter.java">
134 121 
           <provider selected="true" editor-type-id="text-editor">
135 122 
             <state relative-caret-position="135">
136 
-              <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
123 
+              <caret line="18" selection-start-line="18" selection-end-line="18" />
137 124 
               <folding>
138 125 
                 <element signature="e#809#810#0" expanded="true" />
139 126 
                 <element signature="e#871#872#0" expanded="true" />
 
@@ -143,16 +130,10 @@
143 130 
         </entry>
144 131 
       </file>
145 132 
       <file pinned="false" current-in-tab="false">
146 
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ListConverter.java">
133 
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestSuiteConversionRegression.java">
147 134 
           <provider selected="true" editor-type-id="text-editor">
148 
-            <state relative-caret-position="360">
149 
-              <caret line="32" column="10" lean-forward="true" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" />
150 
-              <folding>
151 
-                <element signature="e#817#818#0" expanded="true" />
152 
-                <element signature="e#857#858#0" expanded="true" />
153 
-                <element signature="e#901#902#0" expanded="true" />
154 
-                <element signature="e#957#958#0" expanded="true" />
155 
-              </folding>
135 
+            <state relative-caret-position="225">
136 
+              <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
156 137 
             </state>
157 138 
           </provider>
158 139 
         </entry>
 
@@ -160,14 +141,14 @@
160 141 
       <file pinned="false" current-in-tab="false">
161 142 
         <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestConversionAgent.java">
162 143 
           <provider selected="true" editor-type-id="text-editor">
163 
-            <state relative-caret-position="-153">
144 
+            <state relative-caret-position="135">
164 145 
               <caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
165 146 
             </state>
166 147 
           </provider>
167 148 
         </entry>
168 149 
       </file>
169 150 
       <file pinned="false" current-in-tab="false">
170 
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestConverterStream.java">
151 
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestConverterArray.java">
171 152 
           <provider selected="true" editor-type-id="text-editor">
172 153 
             <state relative-caret-position="90">
173 154 
               <caret line="6" column="69" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
 
@@ -176,10 +157,16 @@
176 157 
         </entry>
177 158 
       </file>
178 159 
       <file pinned="false" current-in-tab="false">
179 
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestConverterArray.java">
160 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ListConverter.java">
180 161 
           <provider selected="true" editor-type-id="text-editor">
181 
-            <state relative-caret-position="90">
182 
-              <caret line="6" column="69" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
162 
+            <state relative-caret-position="360">
163 
+              <caret line="32" column="10" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" />
164 
+              <folding>
165 
+                <element signature="e#817#818#0" expanded="true" />
166 
+                <element signature="e#857#858#0" expanded="true" />
167 
+                <element signature="e#901#902#0" expanded="true" />
168 
+                <element signature="e#957#958#0" expanded="true" />
169 
+              </folding>
183 170 
             </state>
184 171 
           </provider>
185 172 
         </entry>
 
@@ -270,11 +257,11 @@
270 257 
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/TestSuiteFullRegression.java" />
271 258 
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java" />
272 259 
         <option value="$PROJECT_DIR$/pom.xml" />
273 
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java" />
274 260 
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamMap.java" />
275 261 
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ListConverter.java" />
276 262 
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ArrayConverter.java" />
277 263 
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/StreamConverter.java" />
264 
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java" />
278 265 
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamFilter.java" />
279 266 
       </list>
280 267 
     </option>
 
@@ -293,10 +280,8 @@
293 280 
     </option>
294 281 
   </component>
295 282 
   <component name="ProjectFrameBounds" fullScreen="true">
296 
-    <option name="x" value="-333" />
297 
-    <option name="y" value="-1080" />
298 
-    <option name="width" value="1920" />
299 
-    <option name="height" value="1080" />
283 
+    <option name="width" value="1280" />
284 
+    <option name="height" value="800" />
300 285 
   </component>
301 286 
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
302 287 
   <component name="ProjectView">
 
@@ -304,6 +289,8 @@
304 289 
       <foldersAlwaysOnTop value="true" />
305 290 
     </navigator>
306 291 
     <panes>
292 
+      <pane id="Scope" />
293 
+      <pane id="PackagesPane" />
307 294 
       <pane id="ProjectPane">
308 295 
         <subPane>
309 296 
           <expand>
 
@@ -417,14 +404,12 @@
417 404 
           <select />
418 405 
         </subPane>
419 406 
       </pane>
420 
-      <pane id="Scope" />
421 
-      <pane id="PackagesPane" />
422 407 
     </panes>
423 408 
   </component>
424 409 
   <component name="PropertiesComponent">
425 410 
     <property name="WebServerToolWindowFactoryState" value="false" />
426 411 
     <property name="aspect.path.notification.shown" value="true" />
427 
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542567355732" />
412 
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542652521116" />
428 413 
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
429 414 
     <property name="project.structure.last.edited" value="Modules" />
430 415 
     <property name="project.structure.proportion" value="0.0" />
 
@@ -507,7 +492,7 @@
507 492 
         <option name="Make" enabled="true" />
508 493 
       </method>
509 494 
     </configuration>
510 
-    <configuration name="TestConverterList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
495 
+    <configuration name="TestConversionAgent" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
511 496 
       <module name="streamdemo" />
512 497 
       <extension name="coverage">
513 498 
         <pattern>
 
@@ -516,7 +501,7 @@
516 501 
         </pattern>
517 502 
       </extension>
518 503 
       <option name="PACKAGE_NAME" value="com.zipcodewilmington.streams.conversions" />
519 
-      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.streams.conversions.TestConverterList" />
504 
+      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.streams.conversions.TestConversionAgent" />
520 505 
       <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
521 506 
       <method v="2">
522 507 
         <option name="Make" enabled="true" />
 
@@ -641,18 +626,18 @@
641 626 
     </configuration>
642 627 
     <list>
643 628 
       <item itemvalue="JUnit.All in streamdemo" />
644 
-      <item itemvalue="JUnit.TestConverterList" />
645 629 
       <item itemvalue="JUnit.TestConverterStream" />
646 630 
       <item itemvalue="JUnit.TestStreamFilter" />
647 631 
       <item itemvalue="JUnit.TestStreamFilter.testToListMultiLine" />
632 
+      <item itemvalue="JUnit.TestConversionAgent" />
648 633 
     </list>
649 634 
     <recent_temporary>
650 635 
       <list>
651 636 
         <item itemvalue="JUnit.All in streamdemo" />
637 
+        <item itemvalue="JUnit.TestConversionAgent" />
652 638 
         <item itemvalue="JUnit.TestStreamFilter.testToListMultiLine" />
653 639 
         <item itemvalue="JUnit.TestStreamFilter" />
654 640 
         <item itemvalue="JUnit.TestConverterStream" />
655 
-        <item itemvalue="JUnit.TestConverterList" />
656 641 
       </list>
657 642 
     </recent_temporary>
658 643 
   </component>
 
@@ -666,20 +651,12 @@
666 651 
       <option name="number" value="Default" />
667 652 
       <option name="presentableId" value="Default" />
668 653 
       <updated>1493756132542</updated>
669 
-      <workItem from="1542503459722" duration="17471000" />
654 
+      <workItem from="1542503459722" duration="20091000" />
655 
+      <workItem from="1542577739654" duration="3531000" />
670 656 
     </task>
671 657 
     <servers />
672 658 
   </component>
673 659 
   <component name="TestHistory">
674 
-    <history-entry file="TestConverterList - 2018.11.18 at 13h 08m 42s.xml">
675 
-      <configuration name="TestConverterList" configurationId="JUnit" />
676 
-    </history-entry>
677 
-    <history-entry file="All_in_streamdemo - 2018.11.18 at 13h 08m 56s.xml">
678 
-      <configuration name="All in streamdemo" configurationId="JUnit" />
679 
-    </history-entry>
680 
-    <history-entry file="All_in_streamdemo - 2018.11.18 at 13h 12m 39s.xml">
681 
-      <configuration name="All in streamdemo" configurationId="JUnit" />
682 
-    </history-entry>
683 660 
     <history-entry file="All_in_streamdemo - 2018.11.18 at 13h 17m 48s.xml">
684 661 
       <configuration name="All in streamdemo" configurationId="JUnit" />
685 662 
     </history-entry>
 
@@ -701,9 +678,18 @@
701 678 
     <history-entry file="All_in_streamdemo - 2018.11.18 at 13h 39m 27s.xml">
702 679 
       <configuration name="All in streamdemo" configurationId="JUnit" />
703 680 
     </history-entry>
681 
+    <history-entry file="All_in_streamdemo - 2018.11.18 at 15h 06m 07s.xml">
682 
+      <configuration name="All in streamdemo" configurationId="JUnit" />
683 
+    </history-entry>
684 
+    <history-entry file="TestConversionAgent - 2018.11.18 at 16h 53m 00s.xml">
685 
+      <configuration name="TestConversionAgent" configurationId="JUnit" />
686 
+    </history-entry>
687 
+    <history-entry file="All_in_streamdemo - 2018.11.19 at 11h 40m 10s.xml">
688 
+      <configuration name="All in streamdemo" configurationId="JUnit" />
689 
+    </history-entry>
704 690 
   </component>
705 691 
   <component name="TimeTrackingManager">
706 
-    <option name="totallyTimeSpent" value="17471000" />
692 
+    <option name="totallyTimeSpent" value="23622000" />
707 693 
   </component>
708 694 
   <component name="TodoView">
709 695 
     <todo-panel id="selected-file">
 
@@ -715,10 +701,10 @@
715 701 
     </todo-panel>
716 702 
   </component>
717 703 
   <component name="ToolWindowManager">
718 
-    <frame x="-333" y="-1080" width="1920" height="1080" extended-state="0" />
704 
+    <frame x="0" y="0" width="1280" height="800" extended-state="0" />
719 705 
     <editor active="true" />
720 706 
     <layout>
721 
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.31576145" />
707 
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18578352" />
722 708 
       <window_info id="Structure" order="1" weight="0.25" />
723 709 
       <window_info id="Designer" order="2" />
724 710 
       <window_info id="Nl-Palette" order="3" />
 
@@ -726,20 +712,18 @@
726 712 
       <window_info id="Image Layers" order="5" />
727 713 
       <window_info id="Capture Tool" order="6" />
728 714 
       <window_info id="UI Designer" order="7" />
729 
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
730 715 
       <window_info anchor="bottom" id="Message" order="0" />
731 716 
       <window_info anchor="bottom" id="Find" order="1" weight="0.3298647" />
732 
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.44680852" />
717 
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.28854313" />
733 718 
       <window_info anchor="bottom" id="Debug" order="3" weight="0.29179332" />
734 719 
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
735 720 
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
736 721 
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3272543" />
737 722 
       <window_info anchor="bottom" id="Version Control" order="7" />
738 
-      <window_info anchor="bottom" id="Terminal" order="8" weight="0.264308" />
723 
+      <window_info anchor="bottom" id="Terminal" order="8" weight="0.26342452" />
739 724 
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
740 725 
       <window_info anchor="bottom" id="Messages" order="10" weight="0.3272543" />
741 
-      <window_info anchor="right" id="Database" />
742 
-      <window_info anchor="right" id="Coverage" side_tool="true" weight="0.32960597" />
726 
+      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
743 727 
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
744 728 
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
745 729 
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
 
@@ -749,6 +733,8 @@
749 733 
       <window_info anchor="right" id="Properties" order="6" />
750 734 
       <window_info anchor="right" id="Palette&#9;" order="7" />
751 735 
       <window_info anchor="right" id="Maven Projects" order="8" />
736 
+      <window_info anchor="right" id="Database" order="9" />
737 
+      <window_info anchor="right" id="Coverage" order="10" side_tool="true" weight="0.32960597" />
752 738 
     </layout>
753 739 
   </component>
754 740 
   <component name="TypeScriptGeneratedFilesManager">
 
@@ -762,13 +748,6 @@
762 748 
     <option name="FILTER_TARGETS" value="false" />
763 749 
   </component>
764 750 
   <component name="editorHistoryManager">
765 
-    <entry file="file://$PROJECT_DIR$/target/global.leonlog.1">
766 
-      <provider selected="true" editor-type-id="LargeFileEditor">
767 
-        <state relative-caret-position="146">
768 
-          <caret line="10" column="90" lean-forward="true" selection-start-line="10" selection-start-column="90" selection-end-line="10" selection-end-column="90" />
769 
-        </state>
770 
-      </provider>
771 
-    </entry>
772 751 
     <entry file="file://$PROJECT_DIR$/Test Results - TestSuiteFullRegression.html" />
773 752 
     <entry file="file://$PROJECT_DIR$/target/global.leonlog">
774 753 
       <provider editor-type-id="text-editor" />
 
@@ -863,16 +842,6 @@
863 842 
         </state>
864 843 
       </provider>
865 844 
     </entry>
866 
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/anthropoid/TestPersonWarehouse.java">
867 
-      <provider selected="true" editor-type-id="text-editor">
868 
-        <state relative-caret-position="96">
869 
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
870 
-          <folding>
871 
-            <element signature="imports" expanded="true" />
872 
-          </folding>
873 
-        </state>
874 
-      </provider>
875 
-    </entry>
876 845 
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/src.zip!/java/util/Set.java">
877 846 
       <provider selected="true" editor-type-id="text-editor">
878 847 
         <state relative-caret-position="328">
 
@@ -901,13 +870,6 @@
901 870 
         </state>
902 871 
       </provider>
903 872 
     </entry>
904 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/tools/StringUtils.java">
905 
-      <provider selected="true" editor-type-id="text-editor">
906 
-        <state relative-caret-position="433">
907 
-          <caret line="53" selection-start-line="53" selection-end-line="53" />
908 
-        </state>
909 
-      </provider>
910 
-    </entry>
911 873 
     <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/runner/notification/Failure.class">
912 874 
       <provider selected="true" editor-type-id="text-editor">
913 875 
         <state relative-caret-position="210">
 
@@ -915,19 +877,6 @@
915 877 
         </state>
916 878 
       </provider>
917 879 
     </entry>
918 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/tools/RandomUtils.java">
919 
-      <provider selected="true" editor-type-id="text-editor">
920 
-        <state relative-caret-position="182">
921 
-          <caret line="52" selection-start-line="52" selection-end-line="52" />
922 
-          <folding>
923 
-            <element signature="e#1151#1152#0" expanded="true" />
924 
-            <element signature="e#1212#1213#0" expanded="true" />
925 
-            <element signature="e#1365#1366#0" expanded="true" />
926 
-            <element signature="e#1420#1421#0" expanded="true" />
927 
-          </folding>
928 
-        </state>
929 
-      </provider>
930 
-    </entry>
931 880 
     <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/internal/runners/statements/InvokeMethod.class">
932 881 
       <provider selected="true" editor-type-id="text-editor">
933 882 
         <state relative-caret-position="255">
 
@@ -946,10 +895,6 @@
946 895 
       <provider selected="true" editor-type-id="text-editor">
947 896 
         <state relative-caret-position="248">
948 897 
           <caret line="114" selection-start-line="114" selection-end-line="114" />
949 
-          <folding>
950 
-            <element signature="e#3647#3830#0" expanded="true" />
951 
-            <element signature="e#3829#3830#0" expanded="true" />
952 
-          </folding>
953 898 
         </state>
954 899 
       </provider>
955 900 
     </entry>
 
@@ -957,9 +902,6 @@
957 902 
       <provider selected="true" editor-type-id="text-editor">
958 903 
         <state relative-caret-position="388">
959 904 
           <caret line="48" selection-start-line="48" selection-end-line="48" />
960 
-          <folding>
961 
-            <element signature="e#1491#1492#0" expanded="true" />
962 
-          </folding>
963 905 
         </state>
964 906 
       </provider>
965 907 
     </entry>
 
@@ -981,14 +923,6 @@
981 923 
       <provider selected="true" editor-type-id="text-editor">
982 924 
         <state relative-caret-position="173">
983 925 
           <caret line="226" column="16" selection-start-line="226" selection-start-column="16" selection-end-line="226" selection-end-column="16" />
984 
-          <folding>
985 
-            <element signature="e#2111#2112#0" expanded="true" />
986 
-            <element signature="e#2155#2156#0" expanded="true" />
987 
-            <element signature="e#5951#6086#0" expanded="true" />
988 
-            <element signature="e#6085#6086#0" expanded="true" />
989 
-            <element signature="e#6484#6648#0" expanded="true" />
990 
-            <element signature="e#6647#6648#0" expanded="true" />
991 
-          </folding>
992 926 
         </state>
993 927 
       </provider>
994 928 
     </entry>
 
@@ -996,10 +930,6 @@
996 930 
       <provider selected="true" editor-type-id="text-editor">
997 931 
         <state relative-caret-position="300">
998 932 
           <caret line="29" selection-start-line="29" selection-end-line="29" />
999 
-          <folding>
1000 
-            <element signature="e#870#1063#0" expanded="true" />
1001 
-            <element signature="e#1062#1063#0" expanded="true" />
1002 
-          </folding>
1003 933 
         </state>
1004 934 
       </provider>
1005 935 
     </entry>
 
@@ -1034,13 +964,6 @@
1034 964 
         </state>
1035 965 
       </provider>
1036 966 
     </entry>
1037 
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestSuiteConversionRegression.java">
1038 
-      <provider selected="true" editor-type-id="text-editor">
1039 
-        <state relative-caret-position="225">
1040 
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
1041 
-        </state>
1042 
-      </provider>
1043 
-    </entry>
1044 967 
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ConversionAgent.java">
1045 968 
       <provider selected="true" editor-type-id="text-editor">
1046 969 
         <state relative-caret-position="27">
 
@@ -1059,45 +982,75 @@
1059 982 
         </state>
1060 983 
       </provider>
1061 984 
     </entry>
1062 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java">
985 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestConverterStream.java">
1063 986 
       <provider selected="true" editor-type-id="text-editor">
1064 
-        <state relative-caret-position="30">
1065 
-          <caret line="34" selection-start-line="34" selection-end-line="34" />
987 
+        <state relative-caret-position="90">
988 
+          <caret line="6" column="69" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
1066 989 
         </state>
1067 990 
       </provider>
1068 991 
     </entry>
1069 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java">
992 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/TestStreamFilter.java">
1070 993 
       <provider selected="true" editor-type-id="text-editor">
1071 
-        <state relative-caret-position="277">
1072 
-          <caret line="47" column="53" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="53" />
994 
+        <state relative-caret-position="210">
995 
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
996 
+          <folding>
997 
+            <element signature="e#758#759#0" expanded="true" />
998 
+            <element signature="e#807#808#0" expanded="true" />
999 
+            <element signature="e#863#864#0" expanded="true" />
1000 
+            <element signature="e#915#916#0" expanded="true" />
1001 
+            <element signature="e#974#975#0" expanded="true" />
1002 
+          </folding>
1073 1003 
         </state>
1074 1004 
       </provider>
1075 1005 
     </entry>
1076 
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestConverterStream.java">
1006 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/anthropoid/TestPersonWarehouse.java">
1077 1007 
       <provider selected="true" editor-type-id="text-editor">
1078 
-        <state relative-caret-position="90">
1079 
-          <caret line="6" column="69" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
1008 
+        <state relative-caret-position="765">
1009 
+          <caret line="51" column="91" selection-start-line="51" selection-start-column="91" selection-end-line="51" selection-end-column="91" />
1010 
+          <folding>
1011 
+            <element signature="imports" expanded="true" />
1012 
+          </folding>
1080 1013 
         </state>
1081 1014 
       </provider>
1082 1015 
     </entry>
1083 
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestConverterArray.java">
1016 
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/src.zip!/java/util/stream/Stream.java">
1084 1017 
       <provider selected="true" editor-type-id="text-editor">
1085 
-        <state relative-caret-position="90">
1086 
-          <caret line="6" column="69" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
1018 
+        <state relative-caret-position="12105">
1019 
+          <caret line="853" column="9" selection-start-line="853" selection-start-column="9" selection-end-line="853" selection-end-column="9" />
1087 1020 
         </state>
1088 1021 
       </provider>
1089 1022 
     </entry>
1090 
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestConversionAgent.java">
1023 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamMap.java">
1091 1024 
       <provider selected="true" editor-type-id="text-editor">
1092 
-        <state relative-caret-position="-153">
1093 
-          <caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
1025 
+        <state relative-caret-position="375">
1026 
+          <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
1027 
+        </state>
1028 
+      </provider>
1029 
+    </entry>
1030 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java">
1031 
+      <provider selected="true" editor-type-id="text-editor">
1032 
+        <state relative-caret-position="1440">
1033 
+          <caret line="110" selection-start-line="110" selection-end-line="110" />
1034 
+        </state>
1035 
+      </provider>
1036 
+    </entry>
1037 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/StreamConverter.java">
1038 
+      <provider selected="true" editor-type-id="text-editor">
1039 
+        <state relative-caret-position="495">
1040 
+          <caret line="40" selection-start-line="40" selection-end-line="40" />
1041 
+          <folding>
1042 
+            <element signature="e#892#893#0" expanded="true" />
1043 
+            <element signature="e#925#926#0" expanded="true" />
1044 
+            <element signature="e#977#978#0" expanded="true" />
1045 
+            <element signature="e#1019#1020#0" expanded="true" />
1046 
+          </folding>
1094 1047 
         </state>
1095 1048 
       </provider>
1096 1049 
     </entry>
1097 1050 
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ListConverter.java">
1098 1051 
       <provider selected="true" editor-type-id="text-editor">
1099 1052 
         <state relative-caret-position="360">
1100 
-          <caret line="32" column="10" lean-forward="true" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" />
1053 
+          <caret line="32" column="10" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" />
1101 1054 
           <folding>
1102 1055 
             <element signature="e#817#818#0" expanded="true" />
1103 1056 
             <element signature="e#857#858#0" expanded="true" />
 
@@ -1107,10 +1060,17 @@
1107 1060 
         </state>
1108 1061 
       </provider>
1109 1062 
     </entry>
1063 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java">
1064 
+      <provider selected="true" editor-type-id="text-editor">
1065 
+        <state relative-caret-position="630">
1066 
+          <caret line="54" column="40" selection-start-line="54" selection-start-column="40" selection-end-line="54" selection-end-column="40" />
1067 
+        </state>
1068 
+      </provider>
1069 
+    </entry>
1110 1070 
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/ArrayConverter.java">
1111 1071 
       <provider selected="true" editor-type-id="text-editor">
1112 1072 
         <state relative-caret-position="135">
1113 
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
1073 
+          <caret line="18" selection-start-line="18" selection-end-line="18" />
1114 1074 
           <folding>
1115 1075 
             <element signature="e#809#810#0" expanded="true" />
1116 1076 
             <element signature="e#871#872#0" expanded="true" />
 
@@ -1118,46 +1078,51 @@
1118 1078 
         </state>
1119 1079 
       </provider>
1120 1080 
     </entry>
1121 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/conversions/StreamConverter.java">
1081 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestConverterArray.java">
1122 1082 
       <provider selected="true" editor-type-id="text-editor">
1123 
-        <state relative-caret-position="525">
1124 
-          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
1125 
-          <folding>
1126 
-            <element signature="e#892#893#0" expanded="true" />
1127 
-            <element signature="e#919#920#0" expanded="true" />
1128 
-            <element signature="e#977#978#0" expanded="true" />
1129 
-            <element signature="e#1020#1021#0" expanded="true" />
1130 
-            <element signature="e#1094#1095#0" expanded="true" />
1131 
-            <element signature="e#1150#1151#0" expanded="true" />
1132 
-          </folding>
1083 
+        <state relative-caret-position="90">
1084 
+          <caret line="6" column="69" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
1133 1085 
         </state>
1134 1086 
       </provider>
1135 1087 
     </entry>
1136 
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/TestStreamFilter.java">
1088 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestSuiteConversionRegression.java">
1137 1089 
       <provider selected="true" editor-type-id="text-editor">
1138 
-        <state relative-caret-position="210">
1139 
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
1140 
-          <folding>
1141 
-            <element signature="e#758#759#0" expanded="true" />
1142 
-            <element signature="e#807#808#0" expanded="true" />
1143 
-            <element signature="e#863#864#0" expanded="true" />
1144 
-            <element signature="e#915#916#0" expanded="true" />
1145 
-            <element signature="e#974#975#0" expanded="true" />
1146 
-          </folding>
1090 
+        <state relative-caret-position="225">
1091 
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
1147 1092 
         </state>
1148 1093 
       </provider>
1149 1094 
     </entry>
1150 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamMap.java">
1095 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/conversions/TestConversionAgent.java">
1151 1096 
       <provider selected="true" editor-type-id="text-editor">
1152 
-        <state relative-caret-position="375">
1153 
-          <caret line="32" column="7" lean-forward="true" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
1097 
+        <state relative-caret-position="135">
1098 
+          <caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
1099 
+        </state>
1100 
+      </provider>
1101 
+    </entry>
1102 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/tools/StringUtils.java">
1103 
+      <provider selected="true" editor-type-id="text-editor">
1104 
+        <state relative-caret-position="731">
1105 
+          <caret line="53" selection-start-line="53" selection-end-line="53" />
1106 
+        </state>
1107 
+      </provider>
1108 
+    </entry>
1109 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/tools/RandomUtils.java">
1110 
+      <provider selected="true" editor-type-id="text-editor">
1111 
+        <state relative-caret-position="677">
1112 
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
1113 
+          <folding>
1114 
+            <element signature="e#1151#1152#0" expanded="true" />
1115 
+            <element signature="e#1212#1213#0" expanded="true" />
1116 
+            <element signature="e#1365#1366#0" expanded="true" />
1117 
+            <element signature="e#1420#1421#0" expanded="true" />
1118 
+          </folding>
1154 1119 
         </state>
1155 1120 
       </provider>
1156 1121 
     </entry>
1157 1122 
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamFilter.java">
1158 1123 
       <provider selected="true" editor-type-id="text-editor">
1159 
-        <state relative-caret-position="335">
1160 
-          <caret line="90" column="40" lean-forward="true" selection-start-line="90" selection-start-column="40" selection-end-line="90" selection-end-column="40" />
1124 
+        <state relative-caret-position="193">
1125 
+          <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
1161 1126 
         </state>
1162 1127 
       </provider>
1163 1128 
     </entry>

+ 16
- 8
src/main/java/com/zipcodewilmington/streams/StreamFilter.java 查看文件 

@@ -9,9 +9,12 @@ import com.zipcodewilmington.streams.tools.StringUtils;
9 9 
 import java.util.ArrayList;
10 10 
 import java.util.Arrays;
11 11 
 import java.util.List;
12 
+import java.util.function.Predicate;
12 13 
 import java.util.stream.Collectors;
13 14 
 import java.util.stream.Stream;
14 15
16 
+import static java.util.function.Predicate.isEqual;
17 
+
15 18 
 /**
16 19 
  * Created by leon on 5/2/17.
17 20 
  */
 
@@ -23,12 +26,12 @@ public class StreamFilter {
23 26 
      * No arg constructor
24 27 
      */ //TODO - construct person stream of 100 person objects; startingCharacter is a random capital letter
25 28 
     public StreamFilter() {
26 
-        this(PersonFactory.createPersonStream(100), new Character((char) (Math.random()*(90-65) + 65)));
29 
+        this(PersonFactory.createPersonStream(100), new Character((char) (Math.random() * (90 - 65) + 65)));
27 30
28 31 
     }
29 32
30 33 
     /**
31 
-     * @param people - Array of person objects
34 
+     * @param people            - Array of person objects
32 35 
      * @param startingCharacter - character to filter by
33 36 
      */ //TODO
34 37 
     public StreamFilter(Person[] people, Character startingCharacter) {
 
@@ -37,7 +40,7 @@ public class StreamFilter {
37 40 
     }
38 41
39 42 
     /**
40 
-     * @param people - List of person objects
43 
+     * @param people            - List of person objects
41 44 
      * @param startingCharacter - character to filter by
42 45 
      */ //TODO
43 46 
     public StreamFilter(List<Person> people, Character startingCharacter) {
 
@@ -46,7 +49,7 @@ public class StreamFilter {
46 49
47 50
48 51 
     /**
49 
-     * @param people - Stream of person objects
52 
+     * @param people            - Stream of person objects
50 53 
      * @param startingCharacter - character to filter by
51 54 
      */ // I took care of the easy constructor (͡° ͜ʖ ͡°)
52 55 
     public StreamFilter(Stream<Person> people, Character startingCharacter) {
 
@@ -57,17 +60,20 @@ public class StreamFilter {
57 60
58 61 
     /**
59 62 
      * Using multi-line lambda syntax
63 
+     *
60 64 
      * @return a list of person object whose name starts with `this.startingCharacter`
61 65 
      */ //TODO
62 66 
     public List<Person> toListMultiLine() {
63 
-        return personStream.filter(e -> e.getName()
64 
-                .equals(startingCharacter))
67 
+        Predicate<Person> predicate = e -> e.getName().equals(startingCharacter);
68 
+        return personStream
69 
+                .filter(predicate)
65 70 
                 .collect(Collectors.toList());
66 71 
     }
67 72
68 73
69 74 
     /**
70 75 
      * Using one-line lambda syntax
76 
+     *
71 77 
      * @return a list of person objects whose name starts with `this.startingCharacter`
72 78 
      */ //TODO
73 79 
     public List<Person> toListOneLine() {
 
@@ -77,6 +83,7 @@ public class StreamFilter {
77 83
78 84 
     /**
79 85 
      * Using one-line lambda syntax
86 
+     *
80 87 
      * @return an array of person object whose name starts with `this.startingCharacter`
81 88 
      */ //TODO
82 89 
     public Person[] toArrayOneLine() {
 
@@ -86,11 +93,12 @@ public class StreamFilter {
86 93
87 94 
     /**
88 95 
      * Using multi-line lambda syntax
96 
+     *
89 97 
      * @return an array of person object whose name starts with `this.startingCharacter`
90 98 
      */ //TODO
91 99 
     public Person[] toArrayMultiLine() {
92 
-        return personStream.filter(e -> e.getName()
93 
-                .equals(startingCharacter))
100 
+        Predicate<Person> predicate = e -> e.getName().equals(startingCharacter);
101 
+        return personStream.filter(predicate)
94 102 
                 .toArray(Person[]::new);
95 103 
     }
96 104

+ 196934
- 196934
target/PersonWarehouse.leonlog
文件差異過大導致無法顯示
查看文件


二進制
target/classes/com/zipcodewilmington/streams/StreamFilter.class 查看文件


+ 1
- 1
target/global.leonlog 查看文件 

@@ -1,2 +1,2 @@
1 
-Nov 18, 2018 1:39:19 PM com.zipcodewilmington.streams.tools.logging.LoggerHandler log
1 
+Nov 19, 2018 2:16:00 PM com.zipcodewilmington.streams.tools.logging.LoggerHandler log
2 2 
 INFO: Instantiating logger for [ com.zipcodewilmington.streams.anthropoid.PersonWarehouse ] ...