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

Upgrade to Jackson 2.10

Browse Source 
* Remove extraneous code

* Realign white listing with similar implementation in Spring Security: c0b48338f4

* 2.10 GA
This commit is contained in:
Gary Russell
2019-09-27 12:25:41 -04:00
committed by Artem Bilan
parent f3850b7520
commit 0c7cae15da
7 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java
View File

@@ -106,6 +106,15 @@ public class BackToBackAdapterTests {
@Test
public void testJson() {
testJsonCommon("org.springframework");
}
@Test
public void testJsonNoTrust() {
testJsonCommon();
}
private void testJsonCommon(String... trusted) {
MqttPahoMessageHandler adapter = new MqttPahoMessageHandler("tcp://localhost:1883", "si-test-out");
adapter.setDefaultTopic("mqtt-foo");
adapter.setBeanFactory(mock(BeanFactory.class));
@@ -132,7 +141,12 @@ public class BackToBackAdapterTests {
assertThat(out).isNotNull();
adapter.stop();
inbound.stop();
assertThat(out.getPayload()).isEqualTo(new Foo("bar"));
if (trusted != null) {
assertThat(out.getPayload()).isEqualTo(new Foo("bar"));
}
else {
assertThat(out.getPayload()).isNotEqualTo(new Foo("bar"));
}
assertThat(out.getHeaders().get(MqttHeaders.RECEIVED_TOPIC)).isEqualTo("mqtt-foo");
assertThat(out.getHeaders().get("baz")).isEqualTo("qux");
}