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

Support Java 14 (#3310)

Browse Source 
* Support Java 14

* Provide changes to avoid deprecated Java API
and have a compatibility back to Java 8
* Change affected test classes to JUnit 5 whenever it is possible
* Ignore/Disable some TCP/IP tests which don't pass on Java 14

* Fix (some) TCP tests on JRE 14

* Fix SSL Handshake test - client side handshake is successful with java 14

- change the badClient cert to a badServer cert to force an error on the client side

Co-authored-by: artembilan <raven666>
Co-authored-by: Gary Russell <grussell@pivotal.io>
This commit is contained in:
Artem Bilan
2020-06-17 14:00:06 -04:00
committed by GitHub
parent b0cd0156c7
commit 3f5aba2cb9
53 changed files with 613 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 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.
@@ -25,7 +25,7 @@ import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Session;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.integration.IntegrationMessageHeaderAccessor;
@@ -41,6 +41,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
/**
* @author Mark Fisher
* @author Gary Russell
* @author Artem Bilan
*/
public class DefaultJmsHeaderMapperTests {
@@ -83,7 +84,7 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testJmsCorrelationIdNumberConvertsToString() throws JMSException {
Message<String> message = MessageBuilder.withPayload("test")
.setHeader(JmsHeaders.CORRELATION_ID, new Integer(123)).build();
.setHeader(JmsHeaders.CORRELATION_ID, 123).build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
@@ -103,8 +104,10 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testJmsTypeMappedFromHeader() throws JMSException {
String jmsType = "testing";
Message<String> message = MessageBuilder.withPayload("test")
.setHeader(JmsHeaders.TYPE, jmsType).build();
Message<String> message =
MessageBuilder.withPayload("test")
.setHeader(JmsHeaders.TYPE, jmsType)
.build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
@@ -114,8 +117,10 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testJmsTypeIgnoredIfIncorrectType() throws JMSException {
Message<String> message = MessageBuilder.withPayload("test")
.setHeader(JmsHeaders.TYPE, new Integer(123)).build();
Message<String> message =
MessageBuilder.withPayload("test")
.setHeader(JmsHeaders.TYPE, 123)
.build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
@@ -137,9 +142,10 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testUserDefinedPropertyMappedFromHeader() throws JMSException {
Message<String> message = MessageBuilder.withPayload("test")
.setHeader("foo", new Integer(123))
.build();
Message<String> message =
MessageBuilder.withPayload("test")
.setHeader("foo", 123)
.build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
@@ -151,9 +157,10 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testUserDefinedPropertyMappedFromHeaderWithCustomPrefix() throws JMSException {
Message<String> message = MessageBuilder.withPayload("test")
.setHeader("foo", new Integer(123))
.build();
Message<String> message =
MessageBuilder.withPayload("test")
.setHeader("foo", 123)
.build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
mapper.setOutboundPrefix("custom_");
javax.jms.Message jmsMessage = new StubTextMessage();
@@ -301,11 +308,12 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testPropertyMappingExceptionIsNotFatal() throws JMSException {
Message<String> message = MessageBuilder.withPayload("test")
.setHeader("foo", new Integer(123))
.setHeader("bad", new Integer(456))
.setHeader("bar", new Integer(789))
.build();
Message<String> message =
MessageBuilder.withPayload("test")
.setHeader("foo", 123)
.setHeader("bad", 456)
.setHeader("bar", 789)
.build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage() {
@@ -328,11 +336,12 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testIllegalArgumentExceptionIsNotFatal() throws JMSException {
Message<String> message = MessageBuilder.withPayload("test")
.setHeader("foo", new Integer(123))
.setHeader("bad", new Integer(456))
.setHeader("bar", new Integer(789))
.build();
Message<String> message =
MessageBuilder.withPayload("test")
.setHeader("foo", 123)
.setHeader("bad", 456)
.setHeader("bar", 789)
.build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage() {
@@ -416,7 +425,7 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void attemptToWriteDisallowedCorrelationIdNumberPropertyIsNotFatal() throws JMSException {
Message<String> message = MessageBuilder.withPayload("test")
.setHeader(JmsHeaders.CORRELATION_ID, new Integer(123))
.setHeader(JmsHeaders.CORRELATION_ID, 123)
.setHeader("foo", "bar")
.build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
@@ -544,7 +553,7 @@ public class DefaultJmsHeaderMapperTests {
}
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "javatype")
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "javatype")
private static class Foo {
}

7
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/TestJmsHeaderMapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 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.
@@ -27,6 +27,7 @@ import org.springframework.messaging.MessageHeaders;
/**
* @author Mark Fisher
* @author Gary Russell
* @author Artem Bilan
*/
public class TestJmsHeaderMapper extends JmsHeaderMapper {
@@ -36,9 +37,9 @@ public class TestJmsHeaderMapper extends JmsHeaderMapper {
@Override
public Map<String, Object> toHeaders(Message source) {
Map<String, Object> headerMap = new HashMap<String, Object>();
Map<String, Object> headerMap = new HashMap<>();
headerMap.put("testProperty", "foo");
headerMap.put("testAttribute", new Integer(123));
headerMap.put("testAttribute", 123);
return headerMap;
}

4
spring-integration-jms/src/test/java/org/springframework/integration/jms/dsl/JmsTests.java
View File

@@ -88,7 +88,7 @@ import org.springframework.transaction.PlatformTransactionManager;
*/
@SpringJUnitConfig
@LogLevels(level = "debug",
categories = { "org.springframework", "org.springframework.integration", "org.apache" })
categories = {"org.springframework", "org.springframework.integration", "org.apache"})
@DirtiesContext
public class JmsTests extends ActiveMQMultiContextTests {
@@ -215,7 +215,7 @@ public class JmsTests extends ActiveMQMultiContextTests {
@Test
public void testJmsPipelineFlow() {
assertThat(TestUtils.getPropertyValue(this.jmsOutboundGatewayHandler, "idleReplyContainerTimeout", Long.class))
.isEqualTo(new Long(10000));
.isEqualTo(10000L);
PollableChannel replyChannel = new QueueChannel();
Message<String> message = MessageBuilder.withPayload("hello through the jms pipeline")
.setReplyChannel(replyChannel)