Skip to content

Remove request FILENAME header for MPUT #8761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2023
Merged

Remove request FILENAME header for MPUT #8761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions ...rg/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,13 @@
import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor;
import org.springframework.integration.handler.MessageProcessor;
import org.springframework.integration.support.AbstractIntegrationMessageBuilder;
import org.springframework.integration.support.MutableMessage;
import org.springframework.integration.support.MutableMessageBuilder;
import org.springframework.integration.support.PartialSuccessException;
import org.springframework.integration.support.utils.IntegrationUtils;
import org.springframework.lang.Nullable;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.MessagingException;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
Expand Down Expand Up @@ -867,7 +868,8 @@ else if (!(payload instanceof Collection)) {
}
if (payload instanceof Collection<?> files) {
return files.stream()
.map(p -> doMput(new MutableMessage<>(p, requestMessage.getHeaders())))
.map((filePayload) -> mputItemMessage(filePayload, requestMessage.getHeaders()))
.map(this::doMput)
.collect(Collectors.toList());
}
else if (!file.isDirectory()) {
Expand All @@ -879,6 +881,13 @@ else if (!file.isDirectory()) {
}
}

private static Message<?> mputItemMessage(Object payload, MessageHeaders requestHeaders) {
return MutableMessageBuilder.withPayload(payload)
.copyHeaders(requestHeaders)
.removeHeader(FileHeaders.FILENAME)
.build();
}

/**
* Put files from the provided directory to the remote server recursively.
* The message can be consulted to determine some context.
Expand All @@ -899,7 +908,7 @@ private List<String> putLocalDirectory(Message<?> requestMessage, File file, Str
try {
for (File filteredFile : filteredFiles) {
if (!filteredFile.isDirectory()) {
String path = doPut(new MutableMessage<>(filteredFile, requestMessage.getHeaders()), subDirectory);
String path = doPut(mputItemMessage(filteredFile, requestMessage.getHeaders()), subDirectory);
if (path != null) {
replies.add(path);
}
Expand Down
8 changes: 7 additions & 1 deletion ...tp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,13 @@ public void testInt3088MPutNotRecursive() throws IOException {
session = TestUtils.getPropertyValue(session, "targetSession", Session.class);
FTPClient client = spy(TestUtils.getPropertyValue(session, "client", FTPClient.class));
new DirectFieldAccessor(session).setPropertyValue("client", client);
this.inboundMPut.send(new GenericMessage<>(getSourceLocalDirectory()));
// The FileHeaders.FILENAME is removed by the AbstractRemoteFileOutboundGateway
// when MPUT item is prepared for its specific PUT
Message<File> mputRequestMessage =
MessageBuilder.withPayload(getSourceLocalDirectory())
.setHeader(FileHeaders.FILENAME, "inbound_file_name")
.build();
this.inboundMPut.send(mputRequestMessage);
@SuppressWarnings("unchecked")
Message<List<String>> out = (Message<List<String>>) this.output.receive(1000);
assertThat(out).isNotNull();
Expand Down