From f4f9484d18ba5af02a09416ea3efd0fd156e5fba Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 28 Oct 2010 11:34:26 -0400 Subject: [PATCH] INT-1568 removed '$' prefix for headers. Now there is NO prefix. --- .../integration/MessageHeaders.java | 2 +- .../GatewayWithHeaderAnnotations-context.xml | 2 +- .../gateway/GatewayWithHeaderAnnotations.java | 7 ++++--- .../ExpressionEvaluatingMessageProcessorTests.java | 14 ++++++++------ .../json/JsonInboundMessageMapperTests.java | 10 +++++----- .../json/JsonOutboundMessageMapperTests.java | 14 +++++++------- .../integration/ip/util/RegexUtilsTests.java | 2 ++ .../jdbc/JdbcMessageHandlerIntegrationTests.java | 2 +- .../jdbc/config/JdbcMessageHandlerParserTests.java | 4 ++-- ...gDollarHeaderJdbcOutboundChannelAdapterTest.xml | 2 +- ...ingMapPayloadJdbcOutboundChannelAdapterTest.xml | 2 +- .../handlingMapPayloadJdbcOutboundGatewayTest.xml | 2 +- ...adNestedQueryJdbcOutboundChannelAdapterTest.xml | 2 +- ...rameterSourceJdbcOutboundChannelAdapterTest.xml | 2 +- 14 files changed, 36 insertions(+), 31 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java index 85f3c8f2a4..046969c043 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java @@ -44,7 +44,7 @@ public final class MessageHeaders implements Map, Serializable { private static final Log logger = LogFactory.getLog(MessageHeaders.class); - public static final String PREFIX = "$"; + public static final String PREFIX = ""; /** * The key for the Message ID. This is an automatically generated UUID and diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations-context.xml index 8878a2b438..225747dd2c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations-context.xml @@ -11,6 +11,6 @@ default-request-channel="requestChannel" service-interface="org.springframework.integration.gateway.GatewayWithHeaderAnnotations$TestService" /> - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java index 51b349b759..b50a69c769 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java @@ -43,13 +43,14 @@ public class GatewayWithHeaderAnnotations { @Test // INT-1205 public void priorityAsArgument() { TestService gateway = (TestService) applicationContext.getBean("gateway"); - String result = gateway.test("foo", 99); - assertEquals("foo99", result); + String result = gateway.test("foo", 99, "bar"); + assertEquals("foo99bar", result); } public static interface TestService { - public String test(String str, @Header(MessageHeaders.PRIORITY) int priority); + // wrt INT-1205, priority no longer has a $ prefix, so here we are testing the $custom header as well + public String test(String str, @Header(MessageHeaders.PRIORITY) int priority, @Header("$custom") String custom); } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java index 2cc5c5aa2b..79d32a7b02 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java @@ -37,7 +37,9 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.integration.Message; import org.springframework.integration.message.GenericMessage; +import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; /** @@ -112,18 +114,18 @@ public class ExpressionEvaluatingMessageProcessorTests { @Test public void testProcessMessageWithDollarInBrackets() { - Expression expression = expressionParser.parseExpression("headers['$id']"); + Expression expression = expressionParser.parseExpression("headers['$foo_id']"); ExpressionEvaluatingMessageProcessor processor = new ExpressionEvaluatingMessageProcessor(expression); - GenericMessage message = new GenericMessage("foo"); - assertEquals(message.getHeaders().getId(), processor.processMessage(message)); + Message message = MessageBuilder.withPayload("foo").setHeader("$foo_id", "abc").build(); + assertEquals("abc", processor.processMessage(message)); } @Test public void testProcessMessageWithDollarPropertyAccess() { - Expression expression = expressionParser.parseExpression("headers.$id"); + Expression expression = expressionParser.parseExpression("headers.$foo_id"); ExpressionEvaluatingMessageProcessor processor = new ExpressionEvaluatingMessageProcessor(expression); - GenericMessage message = new GenericMessage("foo"); - assertEquals(message.getHeaders().getId(), processor.processMessage(message)); + Message message = MessageBuilder.withPayload("foo").setHeader("$foo_id", "xyz").build(); + assertEquals("xyz", processor.processMessage(message)); } @Test diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonInboundMessageMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonInboundMessageMapperTests.java index 45121314fb..403f3b6107 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonInboundMessageMapperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonInboundMessageMapperTests.java @@ -59,7 +59,7 @@ public class JsonInboundMessageMapperTests { @Test public void testToMessageWithHeadersAndStringPayload() throws Exception { UUID id = UUID.randomUUID(); - String jsonMessage = "{\"headers\":{\"$timestamp\":1,\"$id\":\"" + id + "\"},\"payload\":\"myPayloadStuff\"}"; + String jsonMessage = "{\"headers\":{\"timestamp\":1,\"id\":\"" + id + "\"},\"payload\":\"myPayloadStuff\"}"; Message expected = MessageBuilder.withPayload("myPayloadStuff").setHeader(MessageHeaders.TIMESTAMP, new Long(1)).setHeader(MessageHeaders.ID, id).build(); JsonInboundMessageMapper mapper = new JsonInboundMessageMapper(String.class); Message result = mapper.toMessage(jsonMessage); @@ -80,7 +80,7 @@ public class JsonInboundMessageMapperTests { public void testToMessageWithHeadersAndBeanPayload() throws Exception { TestBean bean = new TestBean(); UUID id = UUID.randomUUID(); - String jsonMessage = "{\"headers\":{\"$timestamp\":1,\"$id\":\"" + id + "\"},\"payload\":" + getBeanAsJson(bean) + "}"; + String jsonMessage = "{\"headers\":{\"timestamp\":1,\"id\":\"" + id + "\"},\"payload\":" + getBeanAsJson(bean) + "}"; Message expected = MessageBuilder.withPayload(bean).setHeader(MessageHeaders.TIMESTAMP, new Long(1)).setHeader(MessageHeaders.ID, id).build(); JsonInboundMessageMapper mapper = new JsonInboundMessageMapper(TestBean.class); Message result = mapper.toMessage(jsonMessage); @@ -101,7 +101,7 @@ public class JsonInboundMessageMapperTests { public void testToMessageWithBeanHeaderAndStringPayload() throws Exception { TestBean bean = new TestBean(); UUID id = UUID.randomUUID(); - String jsonMessage = "{\"headers\":{\"$timestamp\":1,\"$id\":\"" + id + "\", \"myHeader\":" + getBeanAsJson(bean) + "},\"payload\":\"myPayloadStuff\"}"; + String jsonMessage = "{\"headers\":{\"timestamp\":1,\"id\":\"" + id + "\", \"myHeader\":" + getBeanAsJson(bean) + "},\"payload\":\"myPayloadStuff\"}"; Message expected = MessageBuilder.withPayload("myPayloadStuff"). setHeader(MessageHeaders.TIMESTAMP, new Long(1)).setHeader(MessageHeaders.ID, id).setHeader("myHeader", bean).build(); JsonInboundMessageMapper mapper = new JsonInboundMessageMapper(String.class); @@ -115,7 +115,7 @@ public class JsonInboundMessageMapperTests { @Test public void testToMessageWithHeadersAndListOfStringsPayload() throws Exception { UUID id = UUID.randomUUID(); - String jsonMessage = "{\"headers\":{\"$timestamp\":1,\"$id\":\"" + id + "\"},\"payload\":[\"myPayloadStuff1\",\"myPayloadStuff2\",\"myPayloadStuff3\"]}"; + String jsonMessage = "{\"headers\":{\"timestamp\":1,\"id\":\"" + id + "\"},\"payload\":[\"myPayloadStuff1\",\"myPayloadStuff2\",\"myPayloadStuff3\"]}"; List expectedList = Arrays.asList(new String[]{"myPayloadStuff1", "myPayloadStuff2", "myPayloadStuff3"}); Message> expected = MessageBuilder.withPayload(expectedList).setHeader(MessageHeaders.TIMESTAMP, new Long(1)).setHeader(MessageHeaders.ID, id).build(); JsonInboundMessageMapper mapper = new JsonInboundMessageMapper(new TypeReference>(){}); @@ -128,7 +128,7 @@ public class JsonInboundMessageMapperTests { TestBean bean1 = new TestBean(); TestBean bean2 = new TestBean(); UUID id = UUID.randomUUID(); - String jsonMessage = "{\"headers\":{\"$timestamp\":1,\"$id\":\"" + id + "\"},\"payload\":[" + getBeanAsJson(bean1) + "," + getBeanAsJson(bean2) + "]}"; + String jsonMessage = "{\"headers\":{\"timestamp\":1,\"id\":\"" + id + "\"},\"payload\":[" + getBeanAsJson(bean1) + "," + getBeanAsJson(bean2) + "]}"; List expectedList = Arrays.asList(new TestBean[]{bean1, bean2}); Message> expected = MessageBuilder.withPayload(expectedList).setHeader(MessageHeaders.TIMESTAMP, new Long(1)).setHeader(MessageHeaders.ID, id).build(); JsonInboundMessageMapper mapper = new JsonInboundMessageMapper(new TypeReference>(){}); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java index 7f869dacd0..908b9b6c73 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java @@ -50,8 +50,8 @@ public class JsonOutboundMessageMapperTests { JsonOutboundMessageMapper mapper = new JsonOutboundMessageMapper(); String result = mapper.fromMessage(testMessage); assertTrue(result.contains("\"headers\":{")); - assertTrue(result.contains("\"$timestamp\":"+testMessage.getHeaders().getTimestamp())); - assertTrue(result.contains("\"$id\":\""+testMessage.getHeaders().getId()+"\"")); + assertTrue(result.contains("\"timestamp\":"+testMessage.getHeaders().getTimestamp())); + assertTrue(result.contains("\"id\":\""+testMessage.getHeaders().getId()+"\"")); assertTrue(result.contains("\"payload\":\"myPayloadStuff\"")); } @@ -64,10 +64,10 @@ public class JsonOutboundMessageMapperTests { JsonOutboundMessageMapper mapper = new JsonOutboundMessageMapper(); String result = mapper.fromMessage(testMessage); assertTrue(result.contains("\"headers\":{")); - assertTrue(result.contains("\"$timestamp\":"+testMessage.getHeaders().getTimestamp())); - assertTrue(result.contains("\"$id\":\""+testMessage.getHeaders().getId()+"\"")); + assertTrue(result.contains("\"timestamp\":"+testMessage.getHeaders().getTimestamp())); + assertTrue(result.contains("\"id\":\""+testMessage.getHeaders().getId()+"\"")); assertTrue(result.contains("\"payload\":\"myPayloadStuff\"")); - assertTrue(result.contains("\"$history\":")); + assertTrue(result.contains("\"history\":")); assertTrue(result.contains("testName-1")); assertTrue(result.contains("testType-1")); assertTrue(result.contains("testName-2")); @@ -93,8 +93,8 @@ public class JsonOutboundMessageMapperTests { JsonOutboundMessageMapper mapper = new JsonOutboundMessageMapper(); String result = mapper.fromMessage(testMessage); assertTrue(result.contains("\"headers\":{")); - assertTrue(result.contains("\"$timestamp\":"+testMessage.getHeaders().getTimestamp())); - assertTrue(result.contains("\"$id\":\""+testMessage.getHeaders().getId()+"\"")); + assertTrue(result.contains("\"timestamp\":"+testMessage.getHeaders().getTimestamp())); + assertTrue(result.contains("\"id\":\""+testMessage.getHeaders().getId()+"\"")); TestBean parsedPayload = extractJsonPayloadToTestBean(result); assertEquals(payload, parsedPayload); } diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java index 0dd3f5549e..279c208fc1 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java @@ -19,6 +19,7 @@ package org.springframework.integration.ip.util; import static org.junit.Assert.assertEquals; import static org.springframework.integration.ip.util.RegexUtils.escapeRegExSpecials; +import org.junit.Ignore; import org.junit.Test; import org.springframework.integration.MessageHeaders; @@ -41,6 +42,7 @@ public class RegexUtilsTests { * And one of the ones we are actually using */ @Test + @Ignore // no longer relevant due to INT-1568 public void testSiPrefix () { // protect the test in case we ever change the prefix if ("$^[]{()}+*\\?|.".contains(MessageHeaders.PREFIX)) { diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java index b53ac99592..1b68c5fd4f 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java @@ -77,7 +77,7 @@ public class JdbcMessageHandlerIntegrationTests { @Test public void testIdHeaderDynamicInsert() { - JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate.getJdbcOperations(), "insert into foos (id, status, name) values (:headers[$id], 0, :payload)"); + JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate.getJdbcOperations(), "insert into foos (id, status, name) values (:headers[id], 0, :payload)"); Message message = new GenericMessage("foo"); handler.handleMessage(message); String id = message.getHeaders().getId().toString(); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java index bde2171dc0..03efe8edbc 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java @@ -37,10 +37,10 @@ public class JdbcMessageHandlerParserTests { @Test public void testDollarHeaderOutboundChannelAdapter(){ setUp("handlingDollarHeaderJdbcOutboundChannelAdapterTest.xml", getClass()); - Message message = MessageBuilder.withPayload("foo").build(); + Message message = MessageBuilder.withPayload("foo").setHeader("$foo_id", "abc").build(); channel.send(message); Map map = this.jdbcTemplate.queryForMap("SELECT * from FOOS"); - assertEquals("Wrong id", message.getHeaders().getId().toString(), map.get("ID")); + assertEquals("Wrong id", message.getHeaders().get("$foo_id").toString(), map.get("ID")); assertEquals("Wrong id", "foo", map.get("name")); } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingDollarHeaderJdbcOutboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingDollarHeaderJdbcOutboundChannelAdapterTest.xml index 31995a8669..ec65cb377e 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingDollarHeaderJdbcOutboundChannelAdapterTest.xml +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingDollarHeaderJdbcOutboundChannelAdapterTest.xml @@ -9,7 +9,7 @@ http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd"> - diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundChannelAdapterTest.xml index 08a9bd361d..e72ba172e5 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundChannelAdapterTest.xml +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundChannelAdapterTest.xml @@ -9,7 +9,7 @@ http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd"> - diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundGatewayTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundGatewayTest.xml index bbe17af91e..6778e17374 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundGatewayTest.xml +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundGatewayTest.xml @@ -13,7 +13,7 @@ - diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadNestedQueryJdbcOutboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadNestedQueryJdbcOutboundChannelAdapterTest.xml index c122dfaa5d..026dc520d3 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadNestedQueryJdbcOutboundChannelAdapterTest.xml +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingMapPayloadNestedQueryJdbcOutboundChannelAdapterTest.xml @@ -10,7 +10,7 @@ http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd"> - insert into foos (id, status, name) values (:headers[$id], 0, :payload[foo]) + insert into foos (id, status, name) values (:headers[id], 0, :payload[foo]) diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingParameterSourceJdbcOutboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingParameterSourceJdbcOutboundChannelAdapterTest.xml index 883fca5f20..a728e5565b 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingParameterSourceJdbcOutboundChannelAdapterTest.xml +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingParameterSourceJdbcOutboundChannelAdapterTest.xml @@ -9,7 +9,7 @@ http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd"> -