Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modernize code for diamond, isEmpty & pattern matching

Browse Source
This commit is contained in:
Tran Ngoc Nhan
2024-09-24 01:42:38 +07:00
committed by GitHub
parent 40faaa0c15
commit fc377126de
107 changed files with 550 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketAdapterParsingUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ import org.springframework.util.StringUtils;
/**
* @author Artem Bilan
* @author Ngoc Nhan
* @since 4.1
*/
abstract class WebSocketAdapterParsingUtils {
@@ -48,7 +49,7 @@ abstract class WebSocketAdapterParsingUtils {
boolean hasDefaultProtocolHandler = StringUtils.hasText(defaultProtocolHandler);
if (hasProtocolHandlers || hasDefaultProtocolHandler) {
List<BeanReference> protocolHandlerList = new ManagedList<BeanReference>();
List<BeanReference> protocolHandlerList = new ManagedList<>();
String[] ids = StringUtils.commaDelimitedListToStringArray(protocolHandlers);
for (String id : ids) {
protocolHandlerList.add(new RuntimeBeanReference(id));
@@ -64,7 +65,7 @@ abstract class WebSocketAdapterParsingUtils {
String messageConverters = element.getAttribute("message-converters");
if (StringUtils.hasText(messageConverters)) {
List<BeanReference> messageConverterList = new ManagedList<BeanReference>();
List<BeanReference> messageConverterList = new ManagedList<>();
String[] ids = StringUtils.commaDelimitedListToStringArray(messageConverters);
for (String id : ids) {
messageConverterList.add(new RuntimeBeanReference(id));

7
spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketIntegrationConfigurationInitializer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2023 the original author or authors.
* Copyright 2014-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@ import org.springframework.web.util.pattern.PathPatternParser;
* @author Artem Bilan
* @author Gary Russell
* @author Chris Bono
* @author Ngoc Nhan
*
* @since 4.1
*/
@@ -56,8 +57,8 @@ public class WebSocketIntegrationConfigurationInitializer implements Integration
@Override
public void initialize(ConfigurableListableBeanFactory beanFactory) throws BeansException {
if (beanFactory instanceof BeanDefinitionRegistry) {
registerEnableWebSocketIfNecessary((BeanDefinitionRegistry) beanFactory);
if (beanFactory instanceof BeanDefinitionRegistry beanDefinitionRegistry) {
registerEnableWebSocketIfNecessary(beanDefinitionRegistry);
}
else {
LOGGER.warn("'DelegatingWebSocketConfiguration' isn't registered because 'beanFactory'" +

9
spring-integration-websocket/src/main/java/org/springframework/integration/websocket/inbound/WebSocketInboundChannelAdapter.java
View File

@@ -66,6 +66,7 @@ import org.springframework.web.socket.messaging.SubProtocolHandler;
* The {@link MessageProducerSupport} for inbound WebSocket messages.
*
* @author Artem Bilan
* @author Ngoc Nhan
*
* @since 4.1
*/
@@ -281,15 +282,15 @@ public class WebSocketInboundChannelAdapter extends MessageProducerSupport
@Override
protected void doStart() {
if (this.webSocketContainer instanceof Lifecycle) {
((Lifecycle) this.webSocketContainer).start();
if (this.webSocketContainer instanceof Lifecycle lifecycle) {
lifecycle.start();
}
}
@Override
protected void doStop() {
if (this.webSocketContainer instanceof Lifecycle) {
((Lifecycle) this.webSocketContainer).stop();
if (this.webSocketContainer instanceof Lifecycle lifecycle) {
lifecycle.stop();
}
}