From 20dd46ea4acbbf9c28a6e1e89b184b66b65a09e1 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 27 Oct 2010 23:00:06 -0400 Subject: [PATCH] SftpConstants is now SftpHeaders, and the key value is camelCase --- .../sftp/{SftpConstants.java => SftpHeaders.java} | 5 +++-- .../integration/sftp/SftpSendingMessageHandler.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) rename spring-integration-sftp/src/main/java/org/springframework/integration/sftp/{SftpConstants.java => SftpHeaders.java} (85%) diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpConstants.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpHeaders.java similarity index 85% rename from spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpConstants.java rename to spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpHeaders.java index acb45bd6e5..84b176e236 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpConstants.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpHeaders.java @@ -18,9 +18,10 @@ package org.springframework.integration.sftp; /** * @author Josh Long + * @since 2.0 */ -public class SftpConstants { +public abstract class SftpHeaders { - public static final String SFTP_REMOTE_DIRECTORY_HEADER = "SFTP_REMOTE_DIRECTORY_HEADER"; + public static final String REMOTE_DIRECTORY = "sftp_remoteDirectory"; } diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSendingMessageHandler.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSendingMessageHandler.java index 2c3e97c2e0..b369622276 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSendingMessageHandler.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSendingMessageHandler.java @@ -184,8 +184,8 @@ public class SftpSendingMessageHandler implements MessageHandler, InitializingBe MessageHeaders messageHeaders = null; if (message != null) { messageHeaders = message.getHeaders(); - if ((messageHeaders != null) && messageHeaders.containsKey(SftpConstants.SFTP_REMOTE_DIRECTORY_HEADER)) { - dynRd = (String) messageHeaders.get(SftpConstants.SFTP_REMOTE_DIRECTORY_HEADER); + if ((messageHeaders != null) && messageHeaders.containsKey(SftpHeaders.REMOTE_DIRECTORY)) { + dynRd = (String) messageHeaders.get(SftpHeaders.REMOTE_DIRECTORY); if (!StringUtils.isEmpty(dynRd)) { baseOfRemotePath = dynRd; }