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

Start version 6.1

Browse Source 
* Upgrade dependencies whenever it is reasonable
* Fix deprecations and some new API paths
* Move docs to a new version with respective branching for the `changes-5.5-6.0.adoc`
This commit is contained in:
abilan
2023-02-03 11:57:05 -05:00
parent ab32591012
commit 39c73d404a
12 changed files with 248 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java
View File

@@ -17,6 +17,7 @@
package org.springframework.integration.ftp.session;
import java.io.IOException;
import java.time.Duration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -186,7 +187,7 @@ public abstract class AbstractFtpSessionFactory<T extends FTPClient> implements
client.setDefaultTimeout(this.defaultTimeout);
}
if (this.dataTimeout != null) {
client.setDataTimeout(this.dataTimeout);
client.setDataTimeout(Duration.ofMillis(this.dataTimeout));
}
client.setControlEncoding(this.controlEncoding);

5
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.
@@ -17,6 +17,7 @@
package org.springframework.integration.ftp.session;
import java.lang.reflect.Field;
import java.time.Duration;
import java.util.Random;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -74,7 +75,7 @@ class SessionFactoryTests {
FtpSession session = sessionFactory.getSession();
verify(client).setConnectTimeout(123);
verify(client).setDefaultTimeout(456);
verify(client).setDataTimeout(789);
verify(client).setDataTimeout(Duration.ofMillis(789));
session.close();