From 1fb838dd1ab64ffd3e63b01c27da671ff38669d2 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Sat, 2 Nov 2013 11:38:19 -0400 Subject: [PATCH] INT-3190 Fix Package Tangle (JsonHeaders) https://jira.springsource.org/browse/INT-3190 --- .../integration/amqp/support/DefaultAmqpHeaderMapper.java | 2 +- .../integration/json/JsonToObjectTransformer.java | 1 + .../integration/mapping/AbstractHeaderMapper.java | 2 +- .../integration/{json => mapping/support}/JsonHeaders.java | 2 +- .../integration/mapping/support/package-info.java | 4 ++++ .../integration/support/json/Jackson2JsonObjectMapper.java | 2 +- .../integration/support/json/JacksonJsonObjectMapper.java | 2 +- 7 files changed, 10 insertions(+), 5 deletions(-) rename spring-integration-core/src/main/java/org/springframework/integration/{json => mapping/support}/JsonHeaders.java (95%) create mode 100644 spring-integration-core/src/main/java/org/springframework/integration/mapping/support/package-info.java diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java index ad6dc4c846..1779152dad 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java @@ -26,8 +26,8 @@ import org.springframework.amqp.core.MessageDeliveryMode; import org.springframework.amqp.core.MessageProperties; import org.springframework.integration.MessageHeaders; import org.springframework.integration.amqp.AmqpHeaders; -import org.springframework.integration.json.JsonHeaders; import org.springframework.integration.mapping.AbstractHeaderMapper; +import org.springframework.integration.mapping.support.JsonHeaders; import org.springframework.util.StringUtils; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonToObjectTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonToObjectTransformer.java index 92d895ef5a..a65757aa6b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonToObjectTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonToObjectTransformer.java @@ -18,6 +18,7 @@ package org.springframework.integration.json; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.integration.Message; +import org.springframework.integration.mapping.support.JsonHeaders; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.json.JacksonJsonObjectMapper; import org.springframework.integration.support.json.JacksonJsonObjectMapperProvider; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java index 954f7cb6d3..cb83f71e35 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.MessageHeaders; -import org.springframework.integration.json.JsonHeaders; +import org.springframework.integration.mapping.support.JsonHeaders; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonHeaders.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/support/JsonHeaders.java similarity index 95% rename from spring-integration-core/src/main/java/org/springframework/integration/json/JsonHeaders.java rename to spring-integration-core/src/main/java/org/springframework/integration/mapping/support/JsonHeaders.java index 5381bdf472..fa2c88eef2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonHeaders.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/support/JsonHeaders.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.json; +package org.springframework.integration.mapping.support; import java.util.Arrays; import java.util.Collection; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/support/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/support/package-info.java new file mode 100644 index 0000000000..0fa87a6375 --- /dev/null +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/support/package-info.java @@ -0,0 +1,4 @@ +/** + * Support classes for mapping. + */ +package org.springframework.integration.mapping.support; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonObjectMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonObjectMapper.java index 0d802e5bc4..30a6b28a89 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonObjectMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonObjectMapper.java @@ -25,7 +25,7 @@ import java.net.URL; import java.util.Collection; import java.util.Map; -import org.springframework.integration.json.JsonHeaders; +import org.springframework.integration.mapping.support.JsonHeaders; import org.springframework.util.Assert; import com.fasterxml.jackson.core.JsonParser; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonObjectMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonObjectMapper.java index 5297a2bb33..92342dd621 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonObjectMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonObjectMapper.java @@ -29,7 +29,7 @@ import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.JavaType; -import org.springframework.integration.json.JsonHeaders; +import org.springframework.integration.mapping.support.JsonHeaders; import org.springframework.util.Assert; /**