Skip to content

Commit 22bf673

Browse files
brianburtonbrianburton
committed
Simplifies method names.
1 parent 547d097 commit 22bf673

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎src/main/java/org/javimmutable/collections/IterableStreamable.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ default Holder<T> first(@Nonnull Predicate<T> predicate)
177177
* @param collection collection to accumulate the values
178178
* @return the collection after all elements have been processed
179179
*/
180-
default <C extends Insertable<T, C>> C collectAll(@Nonnull C collection)
180+
default <C extends Insertable<T, C>> C collect(@Nonnull C collection)
181181
{
182182
for (T value : this) {
183183
collection = collection.insert(value);
@@ -191,8 +191,8 @@ default <C extends Insertable<T, C>> C collectAll(@Nonnull C collection)
191191
* @param collection collection to accumulate the values
192192
* @return the collection after all elements have been processed
193193
*/
194-
default <C extends Insertable<T, C>> C collectAtMost(int maxToCollect,
195-
@Nonnull C collection)
194+
default <C extends Insertable<T, C>> C collect(int maxToCollect,
195+
@Nonnull C collection)
196196
{
197197
final Iterator<T> iterator = iterator();
198198
for (int i = 0; i < maxToCollect && iterator.hasNext(); ++i) {
@@ -209,8 +209,8 @@ default <C extends Insertable<T, C>> C collectAtMost(int maxToCollect,
209209
* @param predicate predicate applied to each element
210210
* @return the collection after all elements have been processed
211211
*/
212-
default <C extends Insertable<T, C>> C collectAll(@Nonnull C collection,
213-
@Nonnull Predicate<T> predicate)
212+
default <C extends Insertable<T, C>> C collect(@Nonnull C collection,
213+
@Nonnull Predicate<T> predicate)
214214
{
215215
for (T value : this) {
216216
if (predicate.test(value)) {
@@ -229,9 +229,9 @@ default <C extends Insertable<T, C>> C collectAll(@Nonnull C collection,
229229
* @param predicate predicate applied to each element
230230
* @return the collection after all elements have been processed
231231
*/
232-
default <C extends Insertable<T, C>> C collectAtMost(int maxToCollect,
233-
@Nonnull C collection,
234-
@Nonnull Predicate<T> predicate)
232+
default <C extends Insertable<T, C>> C collect(int maxToCollect,
233+
@Nonnull C collection,
234+
@Nonnull Predicate<T> predicate)
235235
{
236236
final Iterator<T> iterator = iterator();
237237
while (maxToCollect > 0 && iterator.hasNext()) {
@@ -252,8 +252,8 @@ default <C extends Insertable<T, C>> C collectAtMost(int maxToCollect,
252252
* @param transform transformation applied to each element
253253
* @return the collection after all elements have been processed
254254
*/
255-
default <A, C extends Insertable<A, C>> C transformAll(@Nonnull C collection,
256-
@Nonnull Func1<T, A> transform)
255+
default <A, C extends Insertable<A, C>> C transform(@Nonnull C collection,
256+
@Nonnull Func1<T, A> transform)
257257
{
258258
for (T value : this) {
259259
collection = collection.insert(transform.apply(value));
@@ -271,9 +271,9 @@ default <A, C extends Insertable<A, C>> C transformAll(@Nonnull C collection,
271271
* @param transform transformation applied to each element
272272
* @return the collection after all elements have been processed
273273
*/
274-
default <A, C extends Insertable<A, C>> C transformAtMost(int maxToCollect,
275-
@Nonnull C collection,
276-
@Nonnull Func1<T, A> transform)
274+
default <A, C extends Insertable<A, C>> C transform(int maxToCollect,
275+
@Nonnull C collection,
276+
@Nonnull Func1<T, A> transform)
277277
{
278278
final Iterator<T> iterator = iterator();
279279
while (maxToCollect > 0 && iterator.hasNext()) {
@@ -314,9 +314,9 @@ default <A, C extends Insertable<A, C>> C transformSome(@Nonnull C collection,
314314
* @param transform transformation applied to each element
315315
* @return the collection after all elements have been processed
316316
*/
317-
default <A, C extends Insertable<A, C>> C transformAtMostSome(int maxToCollect,
318-
@Nonnull C collection,
319-
@Nonnull Func1<T, Holder<A>> transform)
317+
default <A, C extends Insertable<A, C>> C transformSome(int maxToCollect,
318+
@Nonnull C collection,
319+
@Nonnull Func1<T, Holder<A>> transform)
320320
{
321321
final Iterator<T> iterator = iterator();
322322
while (maxToCollect > 0 && iterator.hasNext()) {

‎src/test/java/org/javimmutable/collections/util/IterableStreamableTest.java‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -89,50 +89,50 @@ public void testFirst()
8989

9090
public void testCollectAll()
9191
{
92-
assertSame(set(), list().collectAll(set()));
93-
assertEquals(set(1), list(1).collectAll(set()));
94-
assertEquals(set(1, 2, 3, 4, 5), list(1, 2, 3, 4, 5).collectAll(set()));
92+
assertSame(set(), list().collect(set()));
93+
assertEquals(set(1), list(1).collect(set()));
94+
assertEquals(set(1, 2, 3, 4, 5), list(1, 2, 3, 4, 5).collect(set()));
9595
}
9696

9797
public void testCollectAtMost()
9898
{
99-
assertSame(set(), list().collectAtMost(100, set()));
100-
assertSame(set(), list(1).collectAtMost(0, set()));
101-
assertEquals(set(1), list(1).collectAtMost(1, set()));
102-
assertEquals(set(1), list(1).collectAtMost(100, set()));
103-
assertEquals(set(1), list(1, 2, 3, 4, 5).collectAtMost(1, set()));
104-
assertEquals(set(1, 2, 3), list(1, 2, 3, 4, 5).collectAtMost(3, set()));
105-
assertEquals(set(1, 2, 3, 4, 5), list(1, 2, 3, 4, 5).collectAtMost(5, set()));
99+
assertSame(set(), list().collect(100, set()));
100+
assertSame(set(), list(1).collect(0, set()));
101+
assertEquals(set(1), list(1).collect(1, set()));
102+
assertEquals(set(1), list(1).collect(100, set()));
103+
assertEquals(set(1), list(1, 2, 3, 4, 5).collect(1, set()));
104+
assertEquals(set(1, 2, 3), list(1, 2, 3, 4, 5).collect(3, set()));
105+
assertEquals(set(1, 2, 3, 4, 5), list(1, 2, 3, 4, 5).collect(5, set()));
106106
}
107107

108108
public void testCollectAllMatching()
109109
{
110-
assertEquals(list(), list().collectAll(list(), x -> true));
111-
assertEquals(list(1, 3, 5), list(1, 3, 5).collectAll(list(), x -> true));
112-
assertEquals(list(1, 5), list(1, 3, 5).collectAll(list(), x -> x != 3));
110+
assertEquals(list(), list().collect(list(), x -> true));
111+
assertEquals(list(1, 3, 5), list(1, 3, 5).collect(list(), x -> true));
112+
assertEquals(list(1, 5), list(1, 3, 5).collect(list(), x -> x != 3));
113113
}
114114

115115
public void testCollectAtMostMatching()
116116
{
117-
assertEquals(list(), list().collectAtMost(3, list(), x -> true));
118-
assertEquals(list(), list(1, 3, 5).collectAtMost(0, list(), x -> true));
119-
assertEquals(list(), list(1, 3, 5).collectAtMost(-10, list(), x -> true));
120-
assertEquals(list(1), list(1, 3, 5).collectAtMost(1, list(), x -> true));
121-
assertEquals(list(1, 3), list(1, 3, 5).collectAtMost(2, list(), x -> true));
122-
assertEquals(list(1, 5), list(1, 3, 5, 7).collectAtMost(2, list(), x -> x != 3));
117+
assertEquals(list(), list().collect(3, list(), x -> true));
118+
assertEquals(list(), list(1, 3, 5).collect(0, list(), x -> true));
119+
assertEquals(list(), list(1, 3, 5).collect(-10, list(), x -> true));
120+
assertEquals(list(1), list(1, 3, 5).collect(1, list(), x -> true));
121+
assertEquals(list(1, 3), list(1, 3, 5).collect(2, list(), x -> true));
122+
assertEquals(list(1, 5), list(1, 3, 5, 7).collect(2, list(), x -> x != 3));
123123
}
124124

125125
public void testTransformAll()
126126
{
127-
assertEquals(list(), list().transformAll(list(), x -> x));
128-
assertEquals(list(-1), list(1).transformAll(list(), x -> -x));
129-
assertEquals(list(-1, -3, -5), list(1, 3, 5).transformAll(list(), x -> -x));
127+
assertEquals(list(), list().transform(list(), x -> x));
128+
assertEquals(list(-1), list(1).transform(list(), x -> -x));
129+
assertEquals(list(-1, -3, -5), list(1, 3, 5).transform(list(), x -> -x));
130130
}
131131

132132
public void testTransformAtMost()
133133
{
134-
assertEquals(list(), list().transformAtMost(10, list(), x -> x));
135-
assertEquals(list(-1, -3), list(1, 3, 5).transformAtMost(2, list(), x -> -x));
134+
assertEquals(list(), list().transform(10, list(), x -> x));
135+
assertEquals(list(-1, -3), list(1, 3, 5).transform(2, list(), x -> -x));
136136
}
137137

138138
public void testTransformSome()
@@ -143,9 +143,9 @@ public void testTransformSome()
143143

144144
public void testTransformAtMostSome()
145145
{
146-
assertEquals(list(), list().transformAtMostSome(10, list(), x -> Holders.of(x)));
147-
assertEquals(list(9, -1, -5), list(1, 3, 5).transformAtMostSome(10, list(9), x -> x == 3 ? Holders.of() : Holders.of(-x)));
148-
assertEquals(list(9, -1), list(1, 3, 5).transformAtMostSome(1, list(9), x -> x == 3 ? Holders.of() : Holders.of(-x)));
146+
assertEquals(list(), list().transformSome(10, list(), x -> Holders.of(x)));
147+
assertEquals(list(9, -1, -5), list(1, 3, 5).transformSome(10, list(9), x -> x == 3 ? Holders.of() : Holders.of(-x)));
148+
assertEquals(list(9, -1), list(1, 3, 5).transformSome(1, list(9), x -> x == 3 ? Holders.of() : Holders.of(-x)));
149149
}
150150

151151
public void testPartition()
@@ -178,9 +178,9 @@ public void testInject()
178178

179179
public void testConversions()
180180
{
181-
assertEquals(set(3, 5), list(5, 3, 3, 5).transformAll(JImmutables.<Integer>sortedSet(), x -> x));
182-
assertEquals(JImmutables.multiset(3, 3, 5, 5), list(5, 3, 3, 5).transformAll(JImmutables.<Integer>sortedMultiset(), x -> x));
183-
assertEquals(JImmutables.map().assign(3, 6).assign(5, 10), list(5, 3, 3, 5).transformAll(JImmutables.sortedMap(), x -> MapEntry.of(x, 2 * x)));
184-
assertEquals(JImmutables.listMap().assign(3, list(3, 3)).assign(5, list(5)), list(3, 5, 3).transformAll(JImmutables.sortedListMap(), x -> MapEntry.of(x, x)));
181+
assertEquals(set(3, 5), list(5, 3, 3, 5).transform(JImmutables.<Integer>sortedSet(), x -> x));
182+
assertEquals(JImmutables.multiset(3, 3, 5, 5), list(5, 3, 3, 5).transform(JImmutables.<Integer>sortedMultiset(), x -> x));
183+
assertEquals(JImmutables.map().assign(3, 6).assign(5, 10), list(5, 3, 3, 5).transform(JImmutables.sortedMap(), x -> MapEntry.of(x, 2 * x)));
184+
assertEquals(JImmutables.listMap().assign(3, list(3, 3)).assign(5, list(5)), list(3, 5, 3).transform(JImmutables.sortedListMap(), x -> MapEntry.of(x, x)));
185185
}
186186
}

0 commit comments

Comments
 (0)