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

INT-3190 Fix Package Tangle (JsonHeaders)

Browse Source 
https://jira.springsource.org/browse/INT-3190
This commit is contained in:
Gary Russell
2013-11-02 11:38:19 -04:00
committed by Artem Bilan
parent cd3f13ac91
commit 1fb838dd1a
7 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java
View File

@@ -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;
/**

1
spring-integration-core/src/main/java/org/springframework/integration/json/JsonToObjectTransformer.java
View File

@@ -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;

2
spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java
View File

@@ -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;

2
spring-integration-core/src/main/java/org/springframework/integration/json/JsonHeaders.java → spring-integration-core/src/main/java/org/springframework/integration/mapping/support/JsonHeaders.java
View File

@@ -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;

4
spring-integration-core/src/main/java/org/springframework/integration/mapping/support/package-info.java Normal file
View File

@@ -0,0 +1,4 @@
/**
* Support classes for mapping.
*/
package org.springframework.integration.mapping.support;

2
spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonObjectMapper.java
View File

@@ -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;

2
spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonObjectMapper.java
View File

@@ -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;
/**