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

Upgrade dependencies and various fixes

Browse Source 
* Remove usage of removed `org.springframework.util.SocketUtils`
in favor of OS-selected port
* Migrate mail tests to Greenmail instead of already obsolete (and soon to be removed)
`org.springframework.integration.test.mail.TestMailServer`
This commit is contained in:
Artem Bilan
2022-03-24 12:02:16 -04:00
parent db9db657a3
commit 1aa24b6577
78 changed files with 283 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml
View File

@@ -36,7 +36,7 @@
<ip:tcp-connection-factory id="client"
type="client"
host="localhost"
port="${availableServerSocket}"
port="#{server.port}"
single-use="false"
serializer="fastestWireFormatSerializer"
deserializer="fastestWireFormatSerializer"
@@ -47,6 +47,7 @@
<ip:tcp-outbound-channel-adapter id="outAdapter.client"
order="2"
channel="input"
auto-startup="false"
connection-factory="client" /> <!-- Collaborator -->
<!-- Also send a copy to the custom aggregator for correlation and
@@ -56,9 +57,10 @@
<bridge input-channel="input" output-channel="toAggregator.client"
order="1"/>
<!-- Asynch receive reply -->
<!-- Async receive reply -->
<ip:tcp-inbound-channel-adapter id="inAdapter.client"
channel="toAggregator.client"
auto-startup="false"
connection-factory="client" /> <!-- Collaborator -->
<!-- dataType attribute invokes the conversion service, if necessary -->
@@ -84,7 +86,7 @@
<ip:tcp-connection-factory id="server"
type="server"
port="${availableServerSocket}"
port="0"
using-nio="true"
serializer="fastestWireFormatSerializer"
deserializer="fastestWireFormatSerializer" />

75
intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2022 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.
@@ -16,31 +16,28 @@
package org.springframework.integration.samples.tcpclientserver;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.core.task.TaskExecutor;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory;
import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
import org.springframework.integration.ip.util.TestingUtilities;
import org.springframework.integration.samples.tcpclientserver.support.CustomTestContextLoader;
import org.springframework.messaging.MessagingException;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
@@ -56,9 +53,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
* @since 2.1
*
*/
@ContextConfiguration(loader = CustomTestContextLoader.class,
locations = { "/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml" })
@RunWith(SpringJUnit4ClassRunner.class)
@SpringJUnitConfig(locations = "/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml")
@DirtiesContext
public class TcpClientServerDemoTest {
@@ -68,15 +63,31 @@ public class TcpClientServerDemoTest {
@Autowired
AbstractServerConnectionFactory crLfServer;
@Before
@Autowired
AbstractClientConnectionFactory client;
@Autowired
@Qualifier("outAdapter.client")
AbstractEndpoint outAdapterClient;
@Autowired
@Qualifier("inAdapter.client")
AbstractEndpoint inAdapterClient;
@BeforeEach
public void setup() {
TestingUtilities.waitListening(this.crLfServer, 10000L);
if (!this.outAdapterClient.isRunning()) {
TestingUtilities.waitListening(this.crLfServer, 10000L);
this.client.setPort(this.crLfServer.getPort());
this.outAdapterClient.start();
this.inAdapterClient.start();
}
}
@Test
public void testHappyDay() {
String result = gw.send("999Hello world!"); // first 3 bytes is correlationid
assertEquals("999Hello world!:echo", result);
assertThat(result).isEqualTo("999Hello world!:echo");
}
@Test
@@ -88,36 +99,28 @@ public class TcpClientServerDemoTest {
results.add(i);
final int j = i;
executor.execute(() -> {
String result = gw.send(j + "Hello world!"); // first 3 bytes is correlationid
assertEquals(j + "Hello world!:echo", result);
String result = gw.send(j + "Hello world!"); // first 3 bytes is correlationId
assertThat(result).isEqualTo(j + "Hello world!:echo");
results.remove(j);
latch.countDown();
});
}
assertTrue(latch.await(60, TimeUnit.SECONDS));
assertEquals(0, results.size());
assertThat(latch.await(60, TimeUnit.SECONDS)).isTrue();
assertThat(results).hasSize(0);
}
@Test
public void testTimeoutThrow() {
try {
gw.send("TIMEOUT_TEST_THROW");
fail("expected exception");
}
catch (MessagingException e) {
assertThat(e.getMessage(), containsString("No response received for TIMEOUT_TEST"));
}
assertThatExceptionOfType(MessagingException.class)
.isThrownBy(() -> gw.send("TIMEOUT_TEST_THROW"))
.withMessageContaining("No response received for TIMEOUT_TEST");
}
@Test
public void testTimeoutReturn() {
try {
gw.send("TIMEOUT_TEST_RETURN");
fail("expected exception");
}
catch (MessagingException e) {
assertThat(e.getMessage(), containsString("No response received for TIMEOUT_TEST"));
}
assertThatExceptionOfType(MessagingException.class)
.isThrownBy(() -> gw.send("TIMEOUT_TEST_RETURN"))
.withMessageContaining("No response received for TIMEOUT_TEST");
}
}

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

@@ -1,60 +0,0 @@
/*
* Copyright 2002-2017 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.tcpclientserver.support;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.env.MapPropertySource;
import org.springframework.util.SocketUtils;
import org.springframework.test.context.MergedContextConfiguration;
import org.springframework.test.context.support.GenericXmlContextLoader;
/**
*
* @author Gunnar Hillert
* @author Gary Russell
* @author Artem Bilan
*
*/
public class CustomTestContextLoader extends GenericXmlContextLoader {
private static final Log LOGGER = LogFactory.getLog(CustomTestContextLoader.class);
@Override
protected void loadBeanDefinitions(GenericApplicationContext context,
MergedContextConfiguration mergedConfig) {
int availableServerSocket = SocketUtils.findAvailableTcpPort(5678);
final Map<String, Object> sockets = new HashMap<String, Object>();
sockets.put("availableServerSocket", availableServerSocket);
if (LOGGER.isInfoEnabled()) {
LOGGER.info("Available Server Socket: " + availableServerSocket);
}
final MapPropertySource propertySource = new MapPropertySource("sockets", sockets);
context.getEnvironment().getPropertySources().addLast(propertySource);
super.loadBeanDefinitions(context, mergedConfig);
}
}