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

bind instanceof to named variables (#2088)

Browse source 
* bind instanceof to named variables

* Update StashJavaAPITestActors.java

* Update InteractionPatternsTest.java
This commit is contained in:
PJ Fanning 2025-08-25 13:44:38 +01:00 • committed by GitHub
parent 5a7f7d2625
commit 18d7ff815a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 54 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

7
actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java
View file

@ -66,9 +66,10 @@ public class AsyncTestingExampleTest
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof Pong)) return false;
Pong pong = (Pong) o;
return message.equals(pong.message);
if (o instanceof Pong pong) {
return message.equals(pong.message);
}
return false;
}
@Override

9
actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPITestActors.java
View file

@ -23,9 +23,9 @@ public class StashJavaAPITestActors {
*/
private static int testReceive(
Object msg, int count, ActorRef sender, ActorRef self, UnrestrictedStash stash) {
if (msg instanceof String) {
if (msg instanceof String s) {
if (count < 0) {
sender.tell(((String) msg).length(), self);
sender.tell(s.length(), self);
} else if (count == 2) {
stash.unstashAll();
return -1;
@ -33,9 +33,8 @@ public class StashJavaAPITestActors {
stash.stash();
return count + 1;
}
} else if (msg instanceof Integer) {
int value = (Integer) msg;
assertEquals(5, value);
} else if (msg instanceof Integer value) {
assertEquals(5, value.intValue());
}
return count;
}

6
actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java
View file

@ -191,11 +191,9 @@ public class AggregatorTest extends JUnitSuite {
r -> {
// The hotels have different protocols with different replies,
// convert them to `HotelCustomer.Quote` that this actor understands.
if (r instanceof Hotel1.Quote) {
Hotel1.Quote q = (Hotel1.Quote) r;
if (r instanceof Hotel1.Quote q) {
return new Quote(q.hotel, q.price);
} else if (r instanceof Hotel2.Price) {
Hotel2.Price p = (Hotel2.Price) r;
} else if (r instanceof Hotel2.Price p) {
return new Quote(p.hotel, p.price);
} else {
throw new IllegalArgumentException("Unknown reply " + r);

26
actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java
View file

@ -220,14 +220,11 @@ public class InteractionPatternsTest extends JUnitSuite {
private Behavior<Command> onWrappedBackendResponse(WrappedBackendResponse wrapped) {
Backend.Response response = wrapped.response;
if (response instanceof Backend.JobStarted) {
Backend.JobStarted rsp = (Backend.JobStarted) response;
if (response instanceof Backend.JobStarted rsp) {
getContext().getLog().info("Started {}", rsp.taskId);
} else if (response instanceof Backend.JobProgress) {
Backend.JobProgress rsp = (Backend.JobProgress) response;
} else if (response instanceof Backend.JobProgress rsp) {
getContext().getLog().info("Progress {}", rsp.taskId);
} else if (response instanceof Backend.JobCompleted) {
Backend.JobCompleted rsp = (Backend.JobCompleted) response;
} else if (response instanceof Backend.JobCompleted rsp) {
getContext().getLog().info("Completed {}", rsp.taskId);
inProgress.get(rsp.taskId).tell(rsp.result);
inProgress.remove(rsp.taskId);
@ -712,11 +709,10 @@ public class InteractionPatternsTest extends JUnitSuite {
result.whenComplete(
(reply, failure) -> {
if (reply instanceof CookieFabric.Cookies)
System.out.println("Yay, " + ((CookieFabric.Cookies) reply).count + " cookies!");
else if (reply instanceof CookieFabric.InvalidRequest)
System.out.println(
"No cookies for me. " + ((CookieFabric.InvalidRequest) reply).reason);
if (reply instanceof CookieFabric.Cookies cookiesReply)
System.out.println("Yay, " + cookiesReply.count + " cookies!");
else if (reply instanceof CookieFabric.InvalidRequest invalidRequest)
System.out.println("No cookies for me. " + invalidRequest.reason);
else System.out.println("Boo! didn't get cookies in time. " + failure);
});
}
@ -736,12 +732,12 @@ public class InteractionPatternsTest extends JUnitSuite {
CompletionStage<CookieFabric.Cookies> cookies =
result.thenCompose(
(CookieFabric.Reply reply) -> {
if (reply instanceof CookieFabric.Cookies) {
return CompletableFuture.completedFuture((CookieFabric.Cookies) reply);
} else if (reply instanceof CookieFabric.InvalidRequest) {
if (reply instanceof CookieFabric.Cookies cookiesReply) {
return CompletableFuture.completedFuture(cookiesReply);
} else if (reply instanceof CookieFabric.InvalidRequest invalidRequest) {
CompletableFuture<CookieFabric.Cookies> failed = new CompletableFuture<>();
failed.completeExceptionally(
new IllegalArgumentException(((CookieFabric.InvalidRequest) reply).reason));
new IllegalArgumentException(invalidRequest.reason));
return failed;
} else {
throw new IllegalStateException("Unexpected reply: " + reply.getClass());

4
actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java
View file

@ -169,8 +169,8 @@ interface StashDocSample {
private static RuntimeException asRuntimeException(Throwable t) {
// can't throw Throwable in lambdas
if (t instanceof RuntimeException) {
return (RuntimeException) t;
if (t instanceof RuntimeException runtimeException) {
return runtimeException;
} else {
return new RuntimeException(t);
}

7
actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java
View file

@ -117,12 +117,11 @@ public class ActorCompile {
{
Behaviors.<MyMsg>receive(
(context, message) -> {
if (message instanceof MyMsgA) {
if (message instanceof MyMsgA msgA) {
return Behaviors.receive(
(ctx2, msg2) -> {
if (msg2 instanceof MyMsgB) {
((MyMsgA) message).replyTo.tell(((MyMsgB) msg2).greeting);
if (msg2 instanceof MyMsgB msgB) {
msgA.replyTo.tell(msgB.greeting);
ActorRef<String> adapter =
ctx2.messageAdapter(String.class, s -> new MyMsgB(s.toUpperCase()));
}

8
actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java
View file

@ -236,14 +236,14 @@ public class AdapterTest extends JUnitSuite {
static Behavior<Typed2Msg> typed2() {
return Behaviors.receive(
(context, message) -> {
if (message instanceof Ping) {
ActorRef<String> replyTo = ((Ping) message).replyTo;
if (message instanceof Ping ping) {
ActorRef<String> replyTo = ping.replyTo;
replyTo.tell("pong");
return same();
} else if (message instanceof StopIt) {
return stopped();
} else if (message instanceof ThrowIt) {
throw (ThrowIt) message;
} else if (message instanceof ThrowIt throwIt) {
throw throwIt;
} else {
return unhandled();
}

9
actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java
View file

@ -57,16 +57,14 @@ public class FSMStateFunctionBuilder<S, D> {
public boolean test(FSM.Event e) {
boolean res = true;
if (eventOrType != null) {
if (eventOrType instanceof Class) {
Class eventType = (Class) eventOrType;
if (eventOrType instanceof Class eventType) {
res = eventType.isInstance(e.event());
} else {
res = eventOrType.equals(e.event());
}
}
if (res && dataOrType != null) {
if (dataOrType instanceof Class) {
Class dataType = (Class) dataOrType;
if (dataOrType instanceof Class dataType) {
res = dataType.isInstance(e.stateData());
} else {
res = dataOrType.equals(e.stateData());
@ -191,8 +189,7 @@ public class FSMStateFunctionBuilder<S, D> {
boolean emMatch = false;
Object event = e.event();
for (Object em : eventMatches) {
if (em instanceof Class) {
Class emc = (Class) em;
if (em instanceof Class emc) {
emMatch = emc.isInstance(event);
} else {
emMatch = event.equals(em);

9
persistence/src/main/java/org/apache/pekko/persistence/fsm/japi/pf/FSMStateFunctionBuilder.java
View file

@ -67,16 +67,14 @@ public class FSMStateFunctionBuilder<S, D, E> {
public boolean test(org.apache.pekko.persistence.fsm.PersistentFSM.Event e) {
boolean res = true;
if (eventOrType != null) {
if (eventOrType instanceof Class) {
Class eventType = (Class) eventOrType;
if (eventOrType instanceof Class eventType) {
res = eventType.isInstance(e.event());
} else {
res = eventOrType.equals(e.event());
}
}
if (res && dataOrType != null) {
if (dataOrType instanceof Class) {
Class dataType = (Class) dataOrType;
if (dataOrType instanceof Class dataType) {
res = dataType.isInstance(e.stateData());
} else {
res = dataOrType.equals(e.stateData());
@ -208,8 +206,7 @@ public class FSMStateFunctionBuilder<S, D, E> {
boolean emMatch = false;
Object event = e.event();
for (Object em : eventMatches) {
if (em instanceof Class) {
Class emc = (Class) em;
if (em instanceof Class emc) {
emMatch = emc.isInstance(event);
} else {
emMatch = event.equals(em);

4
persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java
View file

@ -301,8 +301,8 @@ public class AbstractPersistentFSMTest {
// #customer-apply-event
@Override
public ShoppingCart applyEvent(DomainEvent event, ShoppingCart currentData) {
if (event instanceof ItemAdded) {
currentData.addItem(((ItemAdded) event).getItem());
if (event instanceof ItemAdded itemAdded) {
currentData.addItem(itemAdded.getItem());
return currentData;
} else if (event instanceof OrderExecuted) {
return currentData;

22
remote/src/main/java/org/apache/pekko/remote/artery/compress/CountMinSketch.java
View file

@ -163,23 +163,23 @@ public class CountMinSketch {
// this is not cryptographic one, anything which is stable and random is good enough
return o.hashCode();
}
if (o instanceof String) {
return hash(((String) o).getBytes());
if (o instanceof String s) {
return hash(s.getBytes());
}
if (o instanceof Long) {
return hashLong((Long) o, 0);
if (o instanceof Long l) {
return hashLong(l, 0);
}
if (o instanceof Integer) {
return hashLong((Integer) o, 0);
if (o instanceof Integer i) {
return hashLong(i, 0);
}
if (o instanceof Double) {
return hashLong(Double.doubleToRawLongBits((Double) o), 0);
if (o instanceof Double d) {
return hashLong(Double.doubleToRawLongBits(d), 0);
}
if (o instanceof Float) {
if (o instanceof Float f) {
return hashLong(Float.floatToRawIntBits((Float) o), 0);
}
if (o instanceof byte[]) {
return bytesHash((byte[]) o, 0);
if (o instanceof byte[] array) {
return bytesHash(array, 0);
}
return hash(o.toString());
}

6
stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceExample.java
View file

@ -57,7 +57,7 @@ public class ActorSourceExample {
final Source<Protocol, ActorRef<Protocol>> source =
ActorSource.actorRef(
(m) -> m instanceof Complete,
(m) -> (m instanceof Fail) ? Optional.of(((Fail) m).ex) : Optional.empty(),
(m) -> (m instanceof Fail fail) ? Optional.of(fail.ex) : Optional.empty(),
8,
OverflowStrategy.fail());
@ -66,8 +66,8 @@ public class ActorSourceExample {
.collect(
new JavaPartialFunction<Protocol, String>() {
public String apply(Protocol p, boolean isCheck) {
if (p instanceof Message) {
return ((Message) p).msg;
if (p instanceof Message message) {
return message.msg;
} else {
throw noMatch();
}

2
stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceWithBackpressureExample.java
View file

@ -89,7 +89,7 @@ class StreamFeeder extends AbstractBehavior<StreamFeeder.Emitted> {
else return Optional.empty();
},
(msg) -> {
if (msg instanceof FailureOccured) return Optional.of(((FailureOccured) msg).ex);
if (msg instanceof FailureOccured failure) return Optional.of(failure.ex);
else return Optional.empty();
});

2
stream-typed/src/test/java/org/apache/pekko/stream/typed/javadsl/ActorSourceSinkCompileTest.java
View file

@ -69,7 +69,7 @@ public class ActorSourceSinkCompileTest {
{
ActorSource.actorRef(
(m) -> false,
(m) -> (m instanceof Failure) ? Optional.of(((Failure) m).ex) : Optional.empty(),
(m) -> (m instanceof Failure failure) ? Optional.of(failure.ex) : Optional.empty(),
10,
OverflowStrategy.dropBuffer())
.to(Sink.seq());