raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #28027 from akka/wip-revert-25822-patriknw

Browse source 
Revert "Add external predicate to matchEquals and matchAny in ReceiverBuilder (#25822)"
This commit is contained in:
Patrik Nordwall 2019-10-17 17:00:34 +02:00 • committed by GitHub
commit 5b68871c36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

51
akka-actor/src/main/java/akka/japi/pf/ReceiveBuilder.java
View file

@ -4,9 +4,10 @@
package akka.japi.pf;
import akka.actor.AbstractActor.Receive;
import scala.PartialFunction;
import scala.runtime.BoxedUnit;
import akka.actor.AbstractActor;
import akka.actor.AbstractActor.Receive;
/**
* Used for building a partial function for {@link akka.actor.AbstractActor#createReceive()
@ -168,7 +169,7 @@ public class ReceiveBuilder {
* List.class</code> and <code>(List&lt;String&gt; list) -> {}</code>.
*
* @param type a type to match the argument against
* @param externalPredicate an external predicate that will be evaluated if the type matches
* @param externalPredicate a external predicate that will be evaluated if the type matches
* @param apply an action to apply to the argument if the type matches and the predicate returns
* true
* @return a builder with the case statement added
@ -239,27 +240,6 @@ public class ReceiveBuilder {
return this;
}
/**
* Add a new case statement to this builder.
*
* @param object the object to compare equals with
* @param externalPredicate an external predicate that will be evaluated if the object compares
* equal
* @param apply an action to apply to the argument if the object compares equal
* @return a builder with the case statement added
*/
@SuppressWarnings("unchecked")
public <P> ReceiveBuilder matchEquals(
final P object,
final java.util.function.BooleanSupplier externalPredicate,
final FI.UnitApply<P> apply) {
final FI.Predicate predicate = o -> object.equals(o) && externalPredicate.getAsBoolean();
addStatement(new UnitCaseStatement<>(predicate, (FI.UnitApply<Object>) apply));
return this;
}
private static final FI.Predicate ALWAYS_TRUE = (input) -> true;
/**
* Add a new case statement to this builder, that matches any argument.
*
@ -267,22 +247,15 @@ public class ReceiveBuilder {
* @return a builder with the case statement added
*/
public ReceiveBuilder matchAny(final FI.UnitApply<Object> apply) {
addStatement(new UnitCaseStatement<>(ALWAYS_TRUE, apply));
return this;
}
/**
* Add a new case statement to this builder, that pass the test of the predicate.
*
* @param externalPredicate an external predicate that will always be evaluated.
* @param apply an action to apply to the argument
* @return a builder with the case statement added
*/
public ReceiveBuilder matchAny(
final java.util.function.BooleanSupplier externalPredicate,
final FI.UnitApply<Object> apply) {
final FI.Predicate predicate = o -> externalPredicate.getAsBoolean();
addStatement(new UnitCaseStatement<>(predicate, apply));
addStatement(
new UnitCaseStatement<Object, Object>(
new FI.Predicate() {
@Override
public boolean defined(Object o) {
return true;
}
},
apply));
return this;
}
}