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

Upgrade to SIK-3.0

Browse Source 
* Fix Kafka Java DSL sample from bean name conflict
* Fix usage of deprecated `org.springframework.integration.test.util.SocketUtils`
This commit is contained in:
Artem Bilan
2017-11-30 20:37:49 -05:00
parent 38202d8b1f
commit bbcb4bcfae
7 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intermediate/mail-attachments/src/test/java/org/springframework/integration/samples/mailattachments/MimeMessageParsingTest.java
View File

@@ -37,7 +37,7 @@ import org.subethamail.wiser.WiserMessage;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.integration.samples.mailattachments.support.EmailFragment;
import org.springframework.integration.samples.mailattachments.support.EmailParserUtils;
import org.springframework.integration.test.util.SocketUtils;
import org.springframework.util.SocketUtils;
import org.springframework.mail.MailParseException;
import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.mail.javamail.MimeMessageHelper;
@@ -47,6 +47,8 @@ import org.springframework.mail.javamail.MimeMessageHelper;
*
* @author Gunnar Hillert
* @author Gary Russell
* @author Artem Bilan
*
* @since 2.2
*/
public class MimeMessageParsingTest {
@@ -60,7 +62,7 @@ public class MimeMessageParsingTest {
@Before
public void startWiser() {
this.wiserPort = SocketUtils.findAvailableServerSocket(2500);
this.wiserPort = SocketUtils.findAvailableTcpPort(2500);
wiser = new Wiser();
wiser.setPort(this.wiserPort);

5
intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/support/CustomTestContextLoader.java
View File

@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.env.MapPropertySource;
import org.springframework.integration.test.util.SocketUtils;
import org.springframework.util.SocketUtils;
import org.springframework.test.context.MergedContextConfiguration;
import org.springframework.test.context.support.GenericXmlContextLoader;
@@ -31,6 +31,7 @@ import org.springframework.test.context.support.GenericXmlContextLoader;
*
* @author Gunnar Hillert
* @author Gary Russell
* @author Artem Bilan
*
*/
public class CustomTestContextLoader extends GenericXmlContextLoader {
@@ -41,7 +42,7 @@ public class CustomTestContextLoader extends GenericXmlContextLoader {
protected void loadBeanDefinitions(GenericApplicationContext context,
MergedContextConfiguration mergedConfig) {
int availableServerSocket = SocketUtils.findAvailableServerSocket(5678);
int availableServerSocket = SocketUtils.findAvailableTcpPort(5678);
final Map<String, Object> sockets = new HashMap<String, Object>();
sockets.put("availableServerSocket", availableServerSocket);