From c52df8fb8ca741011e2b6acde0da063e82c5ab69 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 17 Jan 2011 17:22:49 -0500 Subject: [PATCH] INT-1722 renamed the 'userDefinedPrefix' property to 'userDefinedHeaderPrefix' for clarity since it is a prefix for user-defined headers (rather than emphasizing 'user-defined' as an adjective for the prefix itself) --- .../http/support/DefaultHttpHeaderMapper.java | 12 ++++++------ ...faultHttpHeaderMapperFromMessageInboundTests.java | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java index d259b0b5e5..5f290a9d67 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java @@ -228,7 +228,7 @@ public class DefaultHttpHeaderMapper implements HeaderMapper { private volatile String[] inboundHeaderNames = new String[0]; - private volatile String userDefinedPrefix = "X-"; + private volatile String userDefinedHeaderPrefix = "X-"; /** @@ -257,10 +257,10 @@ public class DefaultHttpHeaderMapper implements HeaderMapper { } /** - * Sets the prefix to use with custom headers. Default is 'X-'. + * Sets the prefix to use with user-defined (non-standard) headers. Default is 'X-'. */ - public void setUserDefinedPrefix(String userDefinedPrefix) { - this.userDefinedPrefix = (userDefinedPrefix != null) ? userDefinedPrefix : ""; + public void setUserDefinedHeaderPrefix(String userDefinedHeaderPrefix) { + this.userDefinedHeaderPrefix = (userDefinedHeaderPrefix != null) ? userDefinedHeaderPrefix : ""; } /** @@ -280,7 +280,7 @@ public class DefaultHttpHeaderMapper implements HeaderMapper { if (!this.containsElementIgnoreCase(HTTP_REQUEST_HEADER_NAMES, name) && !this.containsElementIgnoreCase(HTTP_RESPONSE_HEADER_NAMES, name)) { // prefix the user-defined header names if not already prefixed - name = name.startsWith(userDefinedPrefix) ? name : userDefinedPrefix + name; + name = name.startsWith(this.userDefinedHeaderPrefix) ? name : this.userDefinedHeaderPrefix + name; } if (logger.isDebugEnabled()) { logger.debug(MessageFormat.format("setting headerName=[{0}], value={1}", name, value)); @@ -305,7 +305,7 @@ public class DefaultHttpHeaderMapper implements HeaderMapper { for (String name : headerNames) { if (this.shouldMapInboundHeader(name)) { if (!ObjectUtils.containsElement(HTTP_REQUEST_HEADER_NAMES, name) && !ObjectUtils.containsElement(HTTP_RESPONSE_HEADER_NAMES, name)) { - String prefixedName = name.startsWith(userDefinedPrefix) ? name : userDefinedPrefix + name; + String prefixedName = name.startsWith(this.userDefinedHeaderPrefix) ? name : this.userDefinedHeaderPrefix + name; Object value = source.containsKey(prefixedName) ? this.getHttpHeader(source, prefixedName) : this.getHttpHeader(source, name); if (value != null) { if (logger.isDebugEnabled()) { diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java index 8c21be8844..34f0c083ac 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 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. @@ -333,7 +333,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefix() throws Exception{ DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); - mapper.setUserDefinedPrefix("Z-"); + mapper.setUserDefinedHeaderPrefix("Z-"); mapper.setOutboundHeaderNames(new String[] {"foo*", "HTTP_RESPONSE_HEADERS"}); Map messageHeaders = new HashMap(); messageHeaders.put("foobar", "abc"); @@ -351,7 +351,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefixEmptyString() throws Exception{ DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); - mapper.setUserDefinedPrefix(""); + mapper.setUserDefinedHeaderPrefix(""); mapper.setOutboundHeaderNames(new String[] {"foo*", "HTTP_RESPONSE_HEADERS"}); Map messageHeaders = new HashMap(); messageHeaders.put("foobar", "abc"); @@ -369,7 +369,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { @Test public void validateCustomHeaderNamePatternsAndStandardResponseHeadersMappedToHttpHeadersWithCustomPrefixNull() throws Exception{ DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); - mapper.setUserDefinedPrefix(null); + mapper.setUserDefinedHeaderPrefix(null); mapper.setOutboundHeaderNames(new String[] {"foo*", "HTTP_RESPONSE_HEADERS"}); Map messageHeaders = new HashMap(); messageHeaders.put("foobar", "abc");