This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new bb5310d11 no need to cast with instanceof (#1166)
bb5310d11 is described below
commit bb5310d11abc0cb2468feff62c4c217cc165532b
Author: PJ Fanning <[email protected]>
AuthorDate: Thu Sep 11 11:34:33 2025 +0100
no need to cast with instanceof (#1166)
* no need to cast with instanceof
* Update HdfsWriterTest.java
* Remove unused import in HdfsWriterTest
---
.../java/org/apache/commons/net/ftp/LegacyFtpsClient.java | 4 +---
geode/src/test/java/docs/javadsl/AnimalPdxSerializer.java | 3 +--
geode/src/test/java/docs/javadsl/PersonPdxSerializer.java | 3 +--
hdfs/src/test/java/docs/javadsl/HdfsWriterTest.java | 5 +++--
influxdb/src/test/java/docs/javadsl/TestUtils.java | 10 +++++-----
jakartams/src/test/java/docs/javadsl/JmsConnectorsTest.java | 7 +++----
.../src/test/java/docs/javadsl/JmsIbmmqConnectorsTest.java | 3 +--
jms/src/test/java/docs/javadsl/JmsConnectorsTest.java | 7 +++----
jms/src/test/java/docs/javadsl/JmsIbmmqConnectorsTest.java | 3 +--
mqtt-streaming/src/test/java/docs/javadsl/MqttFlowTest.java | 11 +++++------
10 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/ftp/src/main/java/org/apache/commons/net/ftp/LegacyFtpsClient.java
b/ftp/src/main/java/org/apache/commons/net/ftp/LegacyFtpsClient.java
index 28cfc63e2..218b7f95d 100644
--- a/ftp/src/main/java/org/apache/commons/net/ftp/LegacyFtpsClient.java
+++ b/ftp/src/main/java/org/apache/commons/net/ftp/LegacyFtpsClient.java
@@ -72,9 +72,7 @@ public final class LegacyFtpsClient extends FTPSClient {
protected Socket _openDataConnection_(final String command, final String
arg) throws IOException {
final Socket socket = _openFTPDataConnection_(command, arg);
_prepareDataSocket_(socket);
- if (socket instanceof SSLSocket) {
- final SSLSocket sslSocket = (SSLSocket) socket;
-
+ if (socket instanceof SSLSocket sslSocket) {
sslSocket.setUseClientMode(isClientMode());
sslSocket.setEnableSessionCreation(isCreation());
diff --git a/geode/src/test/java/docs/javadsl/AnimalPdxSerializer.java
b/geode/src/test/java/docs/javadsl/AnimalPdxSerializer.java
index 5b3f2f423..1343ecca7 100644
--- a/geode/src/test/java/docs/javadsl/AnimalPdxSerializer.java
+++ b/geode/src/test/java/docs/javadsl/AnimalPdxSerializer.java
@@ -26,8 +26,7 @@ public class AnimalPdxSerializer implements
PekkoPdxSerializer<Animal> {
@Override
public boolean toData(Object o, PdxWriter out) {
- if (o instanceof Animal) {
- Animal p = (Animal) o;
+ if (o instanceof Animal p) {
out.writeInt("id", p.getId());
out.writeString("name", p.getName());
out.writeInt("owner", p.getOwner());
diff --git a/geode/src/test/java/docs/javadsl/PersonPdxSerializer.java
b/geode/src/test/java/docs/javadsl/PersonPdxSerializer.java
index f776d5488..d359e283b 100644
--- a/geode/src/test/java/docs/javadsl/PersonPdxSerializer.java
+++ b/geode/src/test/java/docs/javadsl/PersonPdxSerializer.java
@@ -29,8 +29,7 @@ public class PersonPdxSerializer implements
PekkoPdxSerializer<Person> {
@Override
public boolean toData(Object o, PdxWriter out) {
- if (o instanceof Person) {
- Person p = (Person) o;
+ if (o instanceof Person p) {
out.writeInt("id", p.getId());
out.writeString("name", p.getName());
out.writeDate("birthDate", p.getBirthDate());
diff --git a/hdfs/src/test/java/docs/javadsl/HdfsWriterTest.java
b/hdfs/src/test/java/docs/javadsl/HdfsWriterTest.java
index 0a0af536a..ba5231ca0 100644
--- a/hdfs/src/test/java/docs/javadsl/HdfsWriterTest.java
+++ b/hdfs/src/test/java/docs/javadsl/HdfsWriterTest.java
@@ -36,6 +36,7 @@ import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.compress.DefaultCodec;
import org.junit.*;
+
import scala.concurrent.duration.Duration;
import java.io.IOException;
@@ -258,8 +259,8 @@ public class HdfsWriterTest {
.via(flow)
.map(
message -> {
- if (message instanceof WrittenMessage) {
- kafkaCommitter.commit(((WrittenMessage<KafkaOffset>)
message).passThrough());
+ if (message instanceof WrittenMessage<KafkaOffset>
writtenMessage) {
+ kafkaCommitter.commit(writtenMessage.passThrough());
return message;
} else {
return message;
diff --git a/influxdb/src/test/java/docs/javadsl/TestUtils.java
b/influxdb/src/test/java/docs/javadsl/TestUtils.java
index d4a1d2d10..1eecd9ca4 100644
--- a/influxdb/src/test/java/docs/javadsl/TestUtils.java
+++ b/influxdb/src/test/java/docs/javadsl/TestUtils.java
@@ -77,11 +77,11 @@ public class TestUtils {
} else if (column.equals("uptimesecs")) {
builder.addField(column, ((Double) value).longValue());
} else {
- if (value instanceof Long) builder.addField(column, (Long) value);
- else if (value instanceof Double) builder.addField(column, (Double)
value);
- else if (value instanceof Number) builder.addField(column, (Number)
value);
- else if (value instanceof String) builder.addField(column, (String)
value);
- else if (value instanceof Boolean) builder.addField(column, (Boolean)
value);
+ if (value instanceof Long longValue) builder.addField(column,
longValue);
+ else if (value instanceof Double doubleValue) builder.addField(column,
doubleValue);
+ else if (value instanceof Number numberValue) builder.addField(column,
numberValue);
+ else if (value instanceof String stringValue) builder.addField(column,
stringValue);
+ else if (value instanceof Boolean booleanValue)
builder.addField(column, booleanValue);
}
}
diff --git a/jakartams/src/test/java/docs/javadsl/JmsConnectorsTest.java
b/jakartams/src/test/java/docs/javadsl/JmsConnectorsTest.java
index b0643cd3a..283b7bd4c 100644
--- a/jakartams/src/test/java/docs/javadsl/JmsConnectorsTest.java
+++ b/jakartams/src/test/java/docs/javadsl/JmsConnectorsTest.java
@@ -75,8 +75,8 @@ final class DummyJavaTests implements java.io.Serializable {
return true;
}
- if (o instanceof DummyJavaTests) {
- return ((DummyJavaTests) o).value.equals(this.value);
+ if (o instanceof DummyJavaTests dummy) {
+ return dummy.value.equals(this.value);
}
return false;
}
@@ -308,8 +308,7 @@ public class JmsConnectorsTest {
.take(expectedMessages)
.map(
msg -> {
- if (msg instanceof
TextMessage) {
- TextMessage t =
(TextMessage) msg;
+ if (msg instanceof TextMessage
t) {
return t.getText();
} else
throw new
RuntimeException("unexpected message type " + msg.getClass());
diff --git a/jakartams/src/test/java/docs/javadsl/JmsIbmmqConnectorsTest.java
b/jakartams/src/test/java/docs/javadsl/JmsIbmmqConnectorsTest.java
index e282aea35..28c573214 100644
--- a/jakartams/src/test/java/docs/javadsl/JmsIbmmqConnectorsTest.java
+++ b/jakartams/src/test/java/docs/javadsl/JmsIbmmqConnectorsTest.java
@@ -125,8 +125,7 @@ public class JmsIbmmqConnectorsTest {
.map(
envelope -> {
envelope.commit();
- if (envelope.message() instanceof
TextMessage) {
- TextMessage message = (TextMessage)
envelope.message();
+ if (envelope.message() instanceof
TextMessage message) {
return message.getText();
} else {
throw new RuntimeException(
diff --git a/jms/src/test/java/docs/javadsl/JmsConnectorsTest.java
b/jms/src/test/java/docs/javadsl/JmsConnectorsTest.java
index 650e78bd0..0323d5d23 100644
--- a/jms/src/test/java/docs/javadsl/JmsConnectorsTest.java
+++ b/jms/src/test/java/docs/javadsl/JmsConnectorsTest.java
@@ -75,8 +75,8 @@ final class DummyJavaTests implements java.io.Serializable {
return true;
}
- if (o instanceof DummyJavaTests) {
- return ((DummyJavaTests) o).value.equals(this.value);
+ if (o instanceof DummyJavaTests dummy) {
+ return dummy.value.equals(this.value);
}
return false;
}
@@ -322,8 +322,7 @@ public class JmsConnectorsTest {
.take(expectedMessages)
.map(
msg -> {
- if (msg instanceof TextMessage) {
- TextMessage t = (TextMessage) msg;
+ if (msg instanceof TextMessage t) {
return t.getText();
} else
throw new RuntimeException("unexpected message type
" + msg.getClass());
diff --git a/jms/src/test/java/docs/javadsl/JmsIbmmqConnectorsTest.java
b/jms/src/test/java/docs/javadsl/JmsIbmmqConnectorsTest.java
index 417dc419f..0ce5a8022 100644
--- a/jms/src/test/java/docs/javadsl/JmsIbmmqConnectorsTest.java
+++ b/jms/src/test/java/docs/javadsl/JmsIbmmqConnectorsTest.java
@@ -124,8 +124,7 @@ public class JmsIbmmqConnectorsTest {
.map(
envelope -> {
envelope.commit();
- if (envelope.message() instanceof TextMessage) {
- TextMessage message = (TextMessage) envelope.message();
+ if (envelope.message() instanceof TextMessage message) {
return message.getText();
} else {
throw new RuntimeException(
diff --git a/mqtt-streaming/src/test/java/docs/javadsl/MqttFlowTest.java
b/mqtt-streaming/src/test/java/docs/javadsl/MqttFlowTest.java
index 4b0b5d614..3da38a2c0 100644
--- a/mqtt-streaming/src/test/java/docs/javadsl/MqttFlowTest.java
+++ b/mqtt-streaming/src/test/java/docs/javadsl/MqttFlowTest.java
@@ -123,8 +123,8 @@ public class MqttFlowTest {
new JavaPartialFunction<DecodeErrorOrEvent<Object>, Publish>()
{
@Override
public Publish apply(DecodeErrorOrEvent<Object> x, boolean
isCheck) {
- if (x.getEvent().isPresent() && x.getEvent().get().event()
instanceof Publish)
- return (Publish) x.getEvent().get().event();
+ if (x.getEvent().isPresent() && x.getEvent().get().event()
instanceof Publish publish)
+ return publish;
else throw noMatch();
}
})
@@ -224,8 +224,7 @@ public class MqttFlowTest {
new SubAck(subscribe.packetId(), flags),
Optional.of(subscribed),
Optional.empty()));
- } else if (cp instanceof Publish) {
- Publish publish = (Publish) cp;
+ } else if (cp instanceof Publish publish) {
if ((publish.flags() &
ControlPacketFlags.RETAIN()) != 0) {
int packetId =
publish.packetId().get().underlying();
queue.offer(new Command<>(new PubAck(packetId)));
@@ -265,8 +264,8 @@ public class MqttFlowTest {
new JavaPartialFunction<DecodeErrorOrEvent<Object>, Publish>()
{
@Override
public Publish apply(DecodeErrorOrEvent<Object> x, boolean
isCheck) {
- if (x.getEvent().isPresent() && x.getEvent().get().event()
instanceof Publish)
- return (Publish) x.getEvent().get().event();
+ if (x.getEvent().isPresent() && x.getEvent().get().event()
instanceof Publish publish)
+ return publish;
else throw noMatch();
}
})
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
