Skip to content

Commit 2f38b98

Browse files
mperrymperry
committed
functionaljava#66: Renamed foreach methods that had effects as parameters to foreachDoEffect
1 parent 9e0a6a1 commit 2f38b98

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ allprojects {
2020

2121
snapshotAppendix = "-SNAPSHOT"
2222
fjVersion = fjBaseVersion + (isSnapshot ? snapshotAppendix : "")
23-
fjConsumeVersion = "4.1"
23+
fjConsumeVersion = "4.2-beta-1"
2424

2525
signModule = false
2626

‎core/src/main/java/fj/data/Array.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public Unit foreach(final F<A, Unit> f) {
230230
* @param f The side-effect to perform for the given element.
231231
*/
232232
@SuppressWarnings("unchecked")
233-
public void foreach(final Effect1<A> f) {
233+
public void foreachDoEffect(final Effect1<A> f) {
234234
for (final Object x : a) {
235235
f.f((A) x);
236236
}

‎core/src/main/java/fj/data/Conversions.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public Either<A, B> f(final Array<B> bs) {
179179
public static final F<Array<Character>, String> Array_String = new F<Array<Character>, String>() {
180180
public String f(final Array<Character> cs) {
181181
final StringBuilder sb = new StringBuilder();
182-
cs.foreach(new Effect1<Character>() {
182+
cs.foreachDoEffect(new Effect1<Character>() {
183183
public void f(final Character c) {
184184
sb.append(c);
185185
}
@@ -194,7 +194,7 @@ public void f(final Character c) {
194194
public static final F<Array<Character>, StringBuffer> Array_StringBuffer = new F<Array<Character>, StringBuffer>() {
195195
public StringBuffer f(final Array<Character> cs) {
196196
final StringBuffer sb = new StringBuffer();
197-
cs.foreach(new Effect1<Character>() {
197+
cs.foreachDoEffect(new Effect1<Character>() {
198198
public void f(final Character c) {
199199
sb.append(c);
200200
}
@@ -210,7 +210,7 @@ public void f(final Character c) {
210210
new F<Array<Character>, StringBuilder>() {
211211
public StringBuilder f(final Array<Character> cs) {
212212
final StringBuilder sb = new StringBuilder();
213-
cs.foreach((Character c) -> sb.append(c));
213+
cs.foreachDoEffect((Character c) -> sb.append(c));
214214
return sb;
215215
}
216216
};
@@ -281,7 +281,7 @@ public Either<A, B> f(final Stream<B> bs) {
281281
public static final F<Stream<Character>, String> Stream_String = new F<Stream<Character>, String>() {
282282
public String f(final Stream<Character> cs) {
283283
final StringBuilder sb = new StringBuilder();
284-
cs.foreach((Character c) -> sb.append(c));
284+
cs.foreachDoEffect((Character c) -> sb.append(c));
285285
return sb.toString();
286286
}
287287
};
@@ -293,7 +293,7 @@ public String f(final Stream<Character> cs) {
293293
new F<Stream<Character>, StringBuffer>() {
294294
public StringBuffer f(final Stream<Character> cs) {
295295
final StringBuffer sb = new StringBuffer();
296-
cs.foreach((Character c) -> sb.append(c));
296+
cs.foreachDoEffect((Character c) -> sb.append(c));
297297
return sb;
298298
}
299299
};
@@ -305,7 +305,7 @@ public StringBuffer f(final Stream<Character> cs) {
305305
new F<Stream<Character>, StringBuilder>() {
306306
public StringBuilder f(final Stream<Character> cs) {
307307
final StringBuilder sb = new StringBuilder();
308-
cs.foreach((Character c) -> sb.append(c));
308+
cs.foreachDoEffect((Character c) -> sb.append(c));
309309
return sb;
310310
}
311311
};

‎core/src/main/java/fj/data/Either.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public Unit foreach(final F<A, Unit> f) {
232232
*
233233
* @param f The side-effect to execute.
234234
*/
235-
public void foreach(final Effect1<A> f) {
235+
public void foreachDoEffect(final Effect1<A> f) {
236236
if (isLeft())
237237
f.f(value());
238238
}
@@ -465,7 +465,7 @@ public Unit foreach(final F<B, Unit> f) {
465465
*
466466
* @param f The side-effect to execute.
467467
*/
468-
public void foreach(final Effect1<B> f) {
468+
public void foreachDoEffect(final Effect1<B> f) {
469469
if (isRight())
470470
f.f(value());
471471
}

‎core/src/main/java/fj/data/HashMap.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ public <B> HashMap<K, B> mapValues(F<V, B> function) {
291291
return map(Function.<K>identity(), function, e, h);
292292
}
293293

294-
public void foreach(Effect1<P2<K, V>> effect) {
295-
toStream().foreach(effect);
294+
public void foreachDoEffect(Effect1<P2<K, V>> effect) {
295+
toStream().foreachDoEffect(effect);
296296
}
297297

298298
public void foreach(F<P2<K, V>, Unit> function) {

‎core/src/main/java/fj/data/Java.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public ArrayList<A> f(final Array<A> as) {
317317
public BitSet f(final Array<Boolean> bs) {
318318
final BitSet s = new BitSet(bs.length());
319319

320-
bs.zipIndex().foreach(new Effect1<P2<Boolean, Integer>>() {
320+
bs.zipIndex().foreachDoEffect(new Effect1<P2<Boolean, Integer>>() {
321321
public void f(final P2<Boolean, Integer> bi) {
322322
s.set(bi._2(), bi._1());
323323
}
@@ -601,7 +601,7 @@ public ArrayList<A> f(final Stream<A> as) {
601601
public static final F<Stream<Boolean>, BitSet> Stream_BitSet = new F<Stream<Boolean>, BitSet>() {
602602
public BitSet f(final Stream<Boolean> bs) {
603603
final BitSet s = new BitSet(bs.length());
604-
bs.zipIndex().foreach(new Effect1<P2<Boolean, Integer>>() {
604+
bs.zipIndex().foreachDoEffect(new Effect1<P2<Boolean, Integer>>() {
605605
public void f(final P2<Boolean, Integer> bi) {
606606
s.set(bi._2(), bi._1());
607607
}
@@ -849,7 +849,7 @@ public ArrayList<A> f(final Option<A> as) {
849849
public BitSet f(final Option<Boolean> bs) {
850850
final BitSet s = new BitSet(bs.length());
851851

852-
bs.foreach(new Effect1<Boolean>() {
852+
bs.foreachDoEffect(new Effect1<Boolean>() {
853853
public void f(final Boolean b) {
854854
if (b)
855855
s.set(0);

‎core/src/main/java/fj/data/Option.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public final Unit foreach(final F<A, Unit> f) {
226226
*
227227
* @param f The side-effect to perform for the given element.
228228
*/
229-
public final void foreach(final Effect1<A> f) {
229+
public final void foreachDoEffect(final Effect1<A> f) {
230230
if (isSome())
231231
f.f(some());
232232
}

‎core/src/main/java/fj/data/Stream.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public final Unit foreach(final F<A, Unit> f) {
292292
*
293293
* @param f The side-effect to perform for the given element.
294294
*/
295-
public final void foreach(final Effect1<A> f) {
295+
public final void foreachDoEffect(final Effect1<A> f) {
296296
for (Stream<A> xs = this; xs.isNotEmpty(); xs = xs.tail()._1())
297297
f.f(xs.head());
298298
}

‎core/src/main/java/fj/data/Validation.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ public Unit foreach(final F<T, Unit> f) {
161161
*
162162
* @param f The side-effect to execute.
163163
*/
164-
public void foreach(final Effect1<T> f) {
165-
e.right().foreach(f);
164+
public void foreachDoEffect(final Effect1<T> f) {
165+
e.right().foreachDoEffect(f);
166166
}
167167

168168
/**
@@ -927,8 +927,8 @@ public Unit foreach(final F<E, Unit> f) {
927927
*
928928
* @param f The side-effect to execute.
929929
*/
930-
public void foreach(final Effect1<E> f) {
931-
v.toEither().left().foreach(f);
930+
public void foreachDoEffect(final Effect1<E> f) {
931+
v.toEither().left().foreachDoEffect(f);
932932
}
933933

934934
/**

‎core/src/main/java/fj/test/Gen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public Unit foreach(final Integer i, final Rand r, final F<A, Unit> f) {
157157
* @param r The random generator to generate the result to apply the side-effect to.
158158
* @param f The side-effect to execute on the generated value.
159159
*/
160-
public void foreach(final Integer i, final Rand r, final Effect1<A> f) {
160+
public void foreachDoEffect(final Integer i, final Rand r, final Effect1<A> f) {
161161
f.f(this.f.f(i).f(r));
162162
}
163163

0 commit comments

Comments
 (0)