INT-2652 Fix mget for FTP
FTP servers return full path from listNames() whereas SFTP returns just the filename. mget logic assumed SFTP behavior. Add a test to see if the filename already starts with the remote directory and remove it before calling get() (which assumes just the filename). Includes an @Ignored test for FTP and SFTP that runs an mget against a server.
This commit is contained in:
committed by
Oleg Zhurakousky
parent
e73d3a3425
commit
b8f7d01f69
@@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:int-ftp="http://www.springframework.org/schema/integration/ftp"
|
||||
xmlns:int="http://www.springframework.org/schema/integration"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd
|
||||
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
|
||||
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
|
||||
|
||||
<bean id="ftpSessionFactory"
|
||||
class="org.springframework.integration.ftp.session.DefaultFtpSessionFactory">
|
||||
<property name="host" value="localhost"/>
|
||||
<property name="username" value="ftptest"/>
|
||||
<property name="password" value="ftptest"/>
|
||||
</bean>
|
||||
|
||||
<int:channel id="inbound" />
|
||||
|
||||
<int-ftp:outbound-gateway id="gatewayLS" cache-sessions="false"
|
||||
session-factory="ftpSessionFactory"
|
||||
request-channel="inbound"
|
||||
command="mget"
|
||||
command-options=""
|
||||
expression="payload"
|
||||
local-directory="/tmp/out"
|
||||
reply-channel="resultChannel"/>
|
||||
|
||||
<int:channel id="resultChannel">
|
||||
<int:queue />
|
||||
</int:channel>
|
||||
</beans>
|
||||
@@ -0,0 +1,39 @@
|
||||
/*
|
||||
* Copyright 2002-2012 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
|
||||
*
|
||||
* http://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.ftp.outbound;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
|
||||
/**
|
||||
* @author Gary Russell
|
||||
* @since 2.2
|
||||
*
|
||||
*/
|
||||
@ContextConfiguration
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
public class BigMGetTests extends org.springframework.integration.file.test.BigMGetTests {
|
||||
|
||||
@Test @Ignore // needs directories and server (FTP and SFTP)
|
||||
public void doTest() throws Exception {
|
||||
assertEquals(FILES, this.mgetManyFiles().getPayload().size());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user