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

9
spring-integration-file/src/test/java/org/springframework/integration/file/DefaultFileNameGeneratorTests.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.
@@ -21,7 +21,7 @@ import static org.mockito.Mockito.mock;
import java.io.File;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.integration.support.MessageBuilder;
@@ -30,6 +30,7 @@ import org.springframework.messaging.Message;
/**
* @author Mark Fisher
* @author Gary Russell
* @author Artem Bilan
*/
public class DefaultFileNameGeneratorTests {
@@ -55,7 +56,7 @@ public class DefaultFileNameGeneratorTests {
public void defaultHeaderNameNotString() {
DefaultFileNameGenerator generator = new DefaultFileNameGenerator();
generator.setBeanFactory(mock(BeanFactory.class));
Message<?> message = MessageBuilder.withPayload("test").setHeader(FileHeaders.FILENAME, new Integer(123))
Message<?> message = MessageBuilder.withPayload("test").setHeader(FileHeaders.FILENAME, 123)
.build();
String filename = generator.generateFileName(message);
assertThat(filename).isEqualTo(message.getHeaders().getId() + ".msg");
@@ -86,7 +87,7 @@ public class DefaultFileNameGeneratorTests {
DefaultFileNameGenerator generator = new DefaultFileNameGenerator();
generator.setBeanFactory(mock(BeanFactory.class));
generator.setHeaderName("foo");
Message<?> message = MessageBuilder.withPayload("test").setHeader("foo", new Integer(123)).build();
Message<?> message = MessageBuilder.withPayload("test").setHeader("foo", 123).build();
String filename = generator.generateFileName(message);
assertThat(filename).isEqualTo(message.getHeaders().getId() + ".msg");
}