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

Remove deprecations from previous versions (#8628)

Browse Source
This commit is contained in:
Artem Bilan
2023-05-22 11:19:13 -04:00
committed by GitHub
parent edbaf6d590
commit ba417de680
37 changed files with 22 additions and 1929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/AbstractConnectionFactorySpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2022 the original author or authors.
* Copyright 2016-2023 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.
@@ -212,17 +212,6 @@ public abstract class AbstractConnectionFactorySpec
return _this();
}
/**
* @param tcpSocketSupport the {@link TcpSocketSupport}.
* @return the spec.
* @deprecated in favor of {@link #socketSupport(TcpSocketSupport)}.
* @see AbstractConnectionFactory#setTcpSocketSupport(TcpSocketSupport)
*/
@Deprecated
public S tcpSocketSupport(TcpSocketSupport tcpSocketSupport) {
return socketSupport(tcpSocketSupport);
}
/**
* @param tcpSocketSupport the {@link TcpSocketSupport}.
* @return the spec.

28
spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/TcpClientConnectionFactorySpec.java
View File

@@ -18,8 +18,6 @@ package org.springframework.integration.ip.dsl;
import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory;
import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
import org.springframework.integration.ip.tcp.connection.TcpNetClientConnectionFactory;
import org.springframework.integration.ip.tcp.connection.TcpNioClientConnectionFactory;
/**
* An {@link AbstractConnectionFactorySpec} for {@link AbstractClientConnectionFactory}s.
@@ -34,7 +32,7 @@ import org.springframework.integration.ip.tcp.connection.TcpNioClientConnectionF
*
*/
public abstract class TcpClientConnectionFactorySpec
<S extends TcpClientConnectionFactorySpec<S, C>, C extends AbstractClientConnectionFactory>
<S extends TcpClientConnectionFactorySpec<S, C>, C extends AbstractClientConnectionFactory>
extends AbstractConnectionFactorySpec<S, C> {
/**
@@ -46,30 +44,6 @@ public abstract class TcpClientConnectionFactorySpec
super(cf);
}
/**
* Create an instance.
* @param host the host.
* @param port the port.
* @deprecated since 6.0.3; use a subclass.
*/
@Deprecated
protected TcpClientConnectionFactorySpec(String host, int port) {
this(host, port, false);
}
/**
* Create an instance.
* @param host the host.
* @param port the port.
* @param nio true for NIO.
* @deprecated since 6.0.3; use a subclass.
*/
@SuppressWarnings("unchecked")
@Deprecated
protected TcpClientConnectionFactorySpec(String host, int port, boolean nio) {
super(nio ? (C) new TcpNioClientConnectionFactory(host, port) : (C) new TcpNetClientConnectionFactory(host, port));
}
/**
* Set the connection timeout in seconds. Defaults to 60.
* @param connectTimeout the timeout.

26
spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/TcpOutboundGatewaySpec.java
View File

@@ -115,19 +115,6 @@ public class TcpOutboundGatewaySpec extends MessageHandlerSpec<TcpOutboundGatewa
return this;
}
/**
* Set the unsolicited message channel name.
* @param channelName the name.
* @return the spec.
* @since 5.4
* @deprecated in favor of {@link #unsolicitedMessageChannelName(String)}
* due to the typo in method name.
*/
@Deprecated(since = "6.1", forRemoval = true)
public TcpOutboundGatewaySpec unsolictedMessageChannelName(String channelName) {
return unsolicitedMessageChannelName(channelName);
}
/**
* Set the unsolicited message channel name.
* @param channelName the name.
@@ -139,19 +126,6 @@ public class TcpOutboundGatewaySpec extends MessageHandlerSpec<TcpOutboundGatewa
return this;
}
/**
* Set the unsolicited message channel.
* @param channel the channel.
* @return the spec.
* @since 5.4
* @deprecated in favor of {@link #unsolicitedMessageChannel(MessageChannel)}
* due to the typo in method name.
*/
@Deprecated(since = "6.1", forRemoval = true)
public TcpOutboundGatewaySpec unsolictedMessageChannelName(MessageChannel channel) {
return unsolicitedMessageChannel(channel);
}
/**
* Set the unsolicited message channel.
* @param channel the channel.

26
spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/TcpServerConnectionFactorySpec.java
View File

@@ -17,8 +17,6 @@
package org.springframework.integration.ip.dsl;
import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
import org.springframework.integration.ip.tcp.connection.TcpNetServerConnectionFactory;
import org.springframework.integration.ip.tcp.connection.TcpNioServerConnectionFactory;
/**
* An {@link AbstractConnectionFactorySpec} for {@link AbstractServerConnectionFactory}s.
@@ -33,7 +31,7 @@ import org.springframework.integration.ip.tcp.connection.TcpNioServerConnectionF
*
*/
public abstract class TcpServerConnectionFactorySpec
<S extends TcpServerConnectionFactorySpec<S, C>, C extends AbstractServerConnectionFactory>
<S extends TcpServerConnectionFactorySpec<S, C>, C extends AbstractServerConnectionFactory>
extends AbstractConnectionFactorySpec<S, C> {
/**
@@ -45,28 +43,6 @@ public abstract class TcpServerConnectionFactorySpec
super(cf);
}
/**
* Create an instance.
* @param port the port.
* @deprecated since 6.0.3; use a subclass.
*/
@Deprecated
protected TcpServerConnectionFactorySpec(int port) {
this(port, false);
}
/**
* Create an instance.
* @param port the port.
* @param nio true for NIO.
* @deprecated since 6.0.3; use a subclass.
*/
@Deprecated
@SuppressWarnings("unchecked")
protected TcpServerConnectionFactorySpec(int port, boolean nio) {
super(nio ? (C) new TcpNioServerConnectionFactory(port) : (C) new TcpNetServerConnectionFactory(port));
}
/**
* @param localAddress the local address.
* @return the spec.