From 31ae416727de509c1418062f93e4e993135f91e9 Mon Sep 17 00:00:00 2001 From: Ilayaperumal Gopinathan Date: Tue, 19 Jan 2016 18:59:53 +0530 Subject: [PATCH] Remove Spring XD tuple dependency - Use spring-cloud-stream-tuple instead This resolves #280 --- spring-cloud-stream-binders/pom.xml | 6 ------ .../spring-cloud-stream-binder-kafka/pom.xml | 6 ------ .../stream/binder/kafka/KafkaTestBinder.java | 10 +++++----- .../spring-cloud-stream-binder-redis/pom.xml | 5 ----- .../redis/AbstractRedisSerializerTests.java | 6 +++--- .../spring-cloud-stream-binder-test/pom.xml | 5 ----- .../binder/MessageChannelBinderSupportTests.java | 15 ++++++++------- spring-cloud-stream-starters/pom.xml | 1 - 8 files changed, 16 insertions(+), 38 deletions(-) diff --git a/spring-cloud-stream-binders/pom.xml b/spring-cloud-stream-binders/pom.xml index 2925837d9..202960a9b 100644 --- a/spring-cloud-stream-binders/pom.xml +++ b/spring-cloud-stream-binders/pom.xml @@ -17,7 +17,6 @@ 0.8.2.1 2.6.0 - 1.2.1.RELEASE spring-cloud-stream-binder-test @@ -28,11 +27,6 @@ - - org.springframework.xd - spring-xd-tuple - ${spring-xd.version} - org.apache.kafka kafka_2.10 diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/pom.xml b/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/pom.xml index 868cfcae0..ae278d37e 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/pom.xml +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/pom.xml @@ -76,12 +76,6 @@ rxjava-math ${rxjava-math.version} - - org.springframework.xd - spring-xd-tuple - ${spring-xd.version} - test - org.apache.curator curator-recipes diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaTestBinder.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaTestBinder.java index adf323726..5bea73141 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaTestBinder.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaTestBinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 the original author or authors. + * Copyright 2015-2016 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. @@ -18,18 +18,18 @@ package org.springframework.cloud.stream.binder.kafka; import java.util.List; -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.Registration; - import org.springframework.cloud.stream.binder.AbstractTestBinder; import org.springframework.cloud.stream.test.junit.kafka.KafkaTestSupport; import org.springframework.cloud.stream.test.junit.kafka.TestKafkaCluster; +import org.springframework.cloud.stream.tuple.integration.TupleKryoRegistrar; import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.codec.Codec; import org.springframework.integration.codec.kryo.KryoRegistrar; import org.springframework.integration.codec.kryo.PojoCodec; import org.springframework.integration.kafka.support.ZookeeperConnect; -import org.springframework.xd.tuple.serializer.kryo.TupleKryoRegistrar; + +import com.esotericsoftware.kryo.Kryo; +import com.esotericsoftware.kryo.Registration; /** diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml index e1f8eba22..8cb4c960d 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml @@ -64,10 +64,5 @@ joda-time test - - org.springframework.xd - spring-xd-tuple - test - diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/test/java/org/springframework/cloud/stream/binder/redis/AbstractRedisSerializerTests.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/test/java/org/springframework/cloud/stream/binder/redis/AbstractRedisSerializerTests.java index 742a50c8c..79ff879a5 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/test/java/org/springframework/cloud/stream/binder/redis/AbstractRedisSerializerTests.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/test/java/org/springframework/cloud/stream/binder/redis/AbstractRedisSerializerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2016 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. @@ -31,9 +31,9 @@ import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; +import org.springframework.cloud.stream.tuple.Tuple; +import org.springframework.cloud.stream.tuple.TupleBuilder; import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.xd.tuple.Tuple; -import org.springframework.xd.tuple.TupleBuilder; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/pom.xml b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/pom.xml index d9044798e..666184e7a 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/pom.xml +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/pom.xml @@ -34,11 +34,6 @@ org.springframework spring-web - - org.springframework.xd - spring-xd-tuple - test - org.springframework.cloud spring-cloud-stream diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/test/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupportTests.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/test/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupportTests.java index 257e83964..f633c9181 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/test/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupportTests.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/test/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 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. @@ -25,12 +25,14 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.Registration; import org.junit.Before; import org.junit.Test; import org.springframework.cloud.stream.binder.MessageChannelBinderSupport.JavaClassMimeTypeConversion; +import org.springframework.cloud.stream.tuple.DefaultTuple; +import org.springframework.cloud.stream.tuple.Tuple; +import org.springframework.cloud.stream.tuple.TupleBuilder; +import org.springframework.cloud.stream.tuple.integration.TupleKryoRegistrar; import org.springframework.integration.codec.kryo.KryoRegistrar; import org.springframework.integration.codec.kryo.PojoCodec; import org.springframework.integration.support.MessageBuilder; @@ -41,10 +43,9 @@ import org.springframework.messaging.converter.ContentTypeResolver; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.MimeType; import org.springframework.util.MimeTypeUtils; -import org.springframework.xd.tuple.DefaultTuple; -import org.springframework.xd.tuple.Tuple; -import org.springframework.xd.tuple.TupleBuilder; -import org.springframework.xd.tuple.serializer.kryo.TupleKryoRegistrar; + +import com.esotericsoftware.kryo.Kryo; +import com.esotericsoftware.kryo.Registration; /** * @author Gary Russell diff --git a/spring-cloud-stream-starters/pom.xml b/spring-cloud-stream-starters/pom.xml index 6ce153b25..08b872a4c 100644 --- a/spring-cloud-stream-starters/pom.xml +++ b/spring-cloud-stream-starters/pom.xml @@ -4,7 +4,6 @@ spring-cloud-stream-starters pom - http://projects.spring.io/spring-xd/ Pivotal Software, Inc. http://www.spring.io