This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 28dc623f6cd9c4b02d30906f848e9bf99549069d Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Tue Jan 27 06:06:59 2026 +0000 (chores): modernize instanceof checks in camel-milo --- .../org/apache/camel/component/milo/KeyStoreLoader.java | 4 ++-- .../java/org/apache/camel/component/milo/NodeIds.java | 16 ++++++++-------- .../component/milo/client/MiloClientConnection.java | 16 ++++++++-------- .../milo/client/internal/SubscriptionManager.java | 3 +-- .../camel/component/milo/server/MiloServerComponent.java | 4 ++-- .../component/milo/server/internal/CamelServerItem.java | 8 ++++---- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java index e91947ae254c..61ddf47e9577 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java @@ -131,14 +131,14 @@ public class KeyStoreLoader { final Key privateKey = keyStore.getKey(effectiveKeyAlias, this.keyPassword != null ? this.keyPassword.toCharArray() : null); - if (privateKey instanceof PrivateKey) { + if (privateKey instanceof PrivateKey pk) { final X509Certificate certificate = (X509Certificate) keyStore.getCertificate(effectiveKeyAlias); if (certificate == null) { return null; } final PublicKey publicKey = certificate.getPublicKey(); - final KeyPair keyPair = new KeyPair(publicKey, (PrivateKey) privateKey); + final KeyPair keyPair = new KeyPair(publicKey, pk); return new Result(certificate, keyPair); } diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/NodeIds.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/NodeIds.java index 845507a08371..5307e8289128 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/NodeIds.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/NodeIds.java @@ -42,14 +42,14 @@ public final class NodeIds { final Object id = nodeId.getIdentifier(); - if (id instanceof String) { - return new NodeId(namespaceIndex, (String) id); - } else if (id instanceof UInteger) { - return new NodeId(namespaceIndex, (UInteger) id); - } else if (id instanceof ByteString) { - return new NodeId(namespaceIndex, (ByteString) id); - } else if (id instanceof UUID) { - return new NodeId(namespaceIndex, (UUID) id); + if (id instanceof String str) { + return new NodeId(namespaceIndex, str); + } else if (id instanceof UInteger uInteger) { + return new NodeId(namespaceIndex, uInteger); + } else if (id instanceof ByteString byteString) { + return new NodeId(namespaceIndex, byteString); + } else if (id instanceof UUID uuid) { + return new NodeId(namespaceIndex, uuid); } throw new IllegalStateException("Invalid id type: " + id); diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConnection.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConnection.java index 9bd1b9342704..bf21bace3584 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConnection.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConnection.java @@ -133,11 +133,11 @@ public class MiloClientConnection implements AutoCloseable { return new Variant[0]; } - if (value instanceof Variant[]) { - return (Variant[]) value; + if (value instanceof Variant[] variants) { + return variants; } - if (value instanceof Variant) { - return new Variant[] { (Variant) value }; + if (value instanceof Variant variant) { + return new Variant[] { variant }; } return new Variant[] { new Variant(value) }; @@ -150,11 +150,11 @@ public class MiloClientConnection implements AutoCloseable { * @return the outgoing value */ private DataValue mapWriteValue(final Object value) { - if (value instanceof DataValue) { - return (DataValue) value; + if (value instanceof DataValue dataValue) { + return dataValue; } - if (value instanceof Variant) { - return new DataValue((Variant) value, StatusCode.GOOD, null, null); + if (value instanceof Variant variant) { + return new DataValue(variant, StatusCode.GOOD, null, null); } return new DataValue(new Variant(value), StatusCode.GOOD, null, null); } diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java index 07656e4e88af..ad2b2cd9b06a 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java @@ -283,8 +283,7 @@ public class SubscriptionManager { return future.thenApply(value -> { final Object rawValue = value.getValue().getValue(); - if (rawValue instanceof String[]) { - final String[] namespaces = (String[]) rawValue; + if (rawValue instanceof String[] namespaces) { for (int i = 0; i < namespaces.length; i++) { if (namespaces[i].equals(namespaceUri)) { final UShort result = Unsigned.ushort(i); diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java index 489535f33b85..f3fad98863a9 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java @@ -203,11 +203,11 @@ public class MiloServerComponent extends DefaultComponent { if (certificateValidator != null) { LOG.debug("Using validator: {}", certificateValidator); - if (certificateValidator instanceof Closeable) { + if (certificateValidator instanceof Closeable closeable) { runOnStop(() -> { try { LOG.debug("Closing: {}", certificateValidator); - ((Closeable) certificateValidator).close(); + closeable.close(); } catch (IOException e) { LOG.debug("Failed to close. This exception is ignored.", e); } diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java index 61375e32ef96..cc8d1d742bf6 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java @@ -152,10 +152,10 @@ public class CamelServerItem { } public void update(final Object value) { - if (value instanceof DataValue) { - this.value = (DataValue) value; - } else if (value instanceof Variant) { - this.value = new DataValue((Variant) value, StatusCode.GOOD, DateTime.now()); + if (value instanceof DataValue dataValue) { + this.value = dataValue; + } else if (value instanceof Variant variant) { + this.value = new DataValue(variant, StatusCode.GOOD, DateTime.now()); } else { this.value = new DataValue(new Variant(value), StatusCode.GOOD, DateTime.now()); }
