From af2df8ba0eff2e81c3a8fce358a09a54abb3a974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E9=91=AB?= Date: Tue, 3 Jan 2023 18:03:55 +0800 Subject: [PATCH] some new features of jdk to optimize the code --- ...KafkaStreamsMessageConversionDelegate.java | 3 +-- .../kafka/KafkaMessageChannelBinder.java | 3 +-- .../config/ObservationAutoConfiguration.java | 3 +-- .../binding/BindingsLifecycleController.java | 20 ++++++------------- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsMessageConversionDelegate.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsMessageConversionDelegate.java index 78ce848ed..9d8b1610f 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsMessageConversionDelegate.java +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsMessageConversionDelegate.java @@ -285,8 +285,7 @@ public class KafkaStreamsMessageConversionDelegate { if (o2 != null) { if (KafkaStreamsMessageConversionDelegate.this.kstreamBindingInformationCatalogue .isDlqEnabled(bindingTarget)) { - if (o2 instanceof Message) { - Message message = (Message) o2; + if (o2 instanceof Message message) { // We need to convert the key to a byte[] before sending to DLQ. Serde keySerde = kstreamBindingInformationCatalogue.getKeySerde(bindingTarget); diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/KafkaMessageChannelBinder.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/KafkaMessageChannelBinder.java index 321ac2f81..61f90a679 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/KafkaMessageChannelBinder.java +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/KafkaMessageChannelBinder.java @@ -1265,8 +1265,7 @@ public class KafkaMessageChannelBinder extends } MessageHeaders headers; - if (message instanceof ErrorMessage) { - final ErrorMessage errorMessage = (ErrorMessage) message; + if (message instanceof ErrorMessage errorMessage) { final Message originalMessage = errorMessage.getOriginalMessage(); if (originalMessage != null) { headers = originalMessage.getHeaders(); diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/ObservationAutoConfiguration.java b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/ObservationAutoConfiguration.java index 25e3158dc..e081e3522 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/ObservationAutoConfiguration.java +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/ObservationAutoConfiguration.java @@ -38,8 +38,7 @@ public class ObservationAutoConfiguration { ListenerContainerCustomizer observedListenerContainerCustomizer( ApplicationContext applicationContext) { return (container, destinationName, group) -> { - if (container instanceof AbstractMessageListenerContainer) { - AbstractMessageListenerContainer abstractMessageListenerContainer = ((AbstractMessageListenerContainer) container); + if (container instanceof AbstractMessageListenerContainer abstractMessageListenerContainer) { abstractMessageListenerContainer.setObservationEnabled(true); abstractMessageListenerContainer.setApplicationContext(applicationContext); } diff --git a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingsLifecycleController.java b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingsLifecycleController.java index 107fa7c66..e1970037a 100644 --- a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingsLifecycleController.java +++ b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingsLifecycleController.java @@ -111,20 +111,12 @@ public class BindingsLifecycleController { Binding binding = BindingsLifecycleController.this.locateBinding(bindingName); if (binding != null) { switch (state) { - case STARTED: - binding.start(); - break; - case STOPPED: - binding.stop(); - break; - case PAUSED: - binding.pause(); - break; - case RESUMED: - binding.resume(); - break; - default: - break; + case STARTED -> binding.start(); + case STOPPED -> binding.stop(); + case PAUSED -> binding.pause(); + case RESUMED -> binding.resume(); + default -> { + } } } }