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

INT-469

Browse Source
This commit is contained in:
Mark Fisher
2008-11-13 01:35:17 +00:00
parent 618282db91
commit f5bbea66f9
6 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.integration.file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java
View File

@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
public class DefaultFileNameGenerator implements FileNameGenerator {
public String generateFileName(Message<?> message) {
String filenameProperty = message.getHeaders().get(FILENAME_PROPERTY_KEY, String.class);
String filenameProperty = message.getHeaders().get(FileHeaders.FILENAME, String.class);
if (StringUtils.hasText(filenameProperty)) {
return filenameProperty;
}

31
org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileHeaders.java Normal file
View File

@@ -0,0 +1,31 @@
/*
* Copyright 2002-2008 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.file;
/**
* Pre-defined header names to be used when storing or retrieving
* File-related values to/from integration Message Headers.
*
* @author Mark Fisher
*/
public abstract class FileHeaders {
public static final String PREFIX = "spring.integration.file.";
public static final String FILENAME = PREFIX + "name";
}

3
org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileNameGenerator.java
View File

@@ -25,9 +25,6 @@ import org.springframework.integration.core.Message;
*/
public interface FileNameGenerator {
String FILENAME_PROPERTY_KEY = "filename";
String generateFileName(Message<?> message);
}

4
org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java
View File

@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessagingException;
import org.springframework.integration.file.FileNameGenerator;
import org.springframework.integration.file.FileHeaders;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.transformer.Transformer;
import org.springframework.util.Assert;
@@ -58,7 +58,7 @@ public abstract class AbstractFilePayloadTransformer<T> implements Transformer {
T result = this.transformFile(file);
Message<?> transformedMessage = MessageBuilder.withPayload(result)
.copyHeaders(message.getHeaders())
.setHeaderIfAbsent(FileNameGenerator.FILENAME_PROPERTY_KEY, file.getName())
.setHeaderIfAbsent(FileHeaders.FILENAME, file.getName())
.build();
if (this.deleteFiles) {
if (!file.delete() && this.logger.isWarnEnabled()) {