From 51250e6136f4ca1b1f5a5261bbe428197519ccbc Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Sat, 30 Mar 2013 11:53:32 -0400 Subject: [PATCH] INT-2973 Fix 2.2.x Build with Spring 3.0.x Remove 3.1 dependencies and tests. --- .../util/BeanFactoryTypeConverterTests.java | 98 ++----------------- 1 file changed, 10 insertions(+), 88 deletions(-) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java index 91312c7729..01f1a90403 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java @@ -17,7 +17,6 @@ package org.springframework.integration.util; import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -30,9 +29,6 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -52,13 +48,11 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.Converter; -import org.springframework.core.convert.support.DefaultConversionService; +import org.springframework.core.convert.support.ConversionServiceFactory; +import org.springframework.core.convert.support.GenericConversionService; import org.springframework.integration.Message; import org.springframework.integration.MessageHeaders; -import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.context.NamedComponent; -import org.springframework.integration.handler.MethodInvokingMessageProcessor; -import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.message.GenericMessage; @@ -151,85 +145,10 @@ public class BeanFactoryTypeConverterTests { assertEquals("foo", typeConverter.convertValue(object, TypeDescriptor.valueOf(Object.class), TypeDescriptor.valueOf(String.class))); } - @SuppressWarnings("unchecked") - @Test - public void testMapOfMapOfCollectionIsConverted() { - DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); - DefaultConversionService conversionService = new DefaultConversionService(); - conversionService.addConverter(new Converter() { - public Bar convert(Foo source) { - return new Bar(); - } - }); - BeanFactoryTypeConverter typeConverter = new BeanFactoryTypeConverter(conversionService); - beanFactory.setConversionService(conversionService); - typeConverter.setBeanFactory(beanFactory); - Map>> foos; - Map>> bars; - - TypeDescriptor sourceType = TypeDescriptor.map(Map.class, null, null); - TypeDescriptor targetType = TypeDescriptor.map(Map.class, TypeDescriptor.valueOf(String.class), - TypeDescriptor.map(Map.class, TypeDescriptor.valueOf(String.class), - TypeDescriptor.collection(Set.class, TypeDescriptor.valueOf(Bar.class)))); - - Set fooSet = new HashSet(); - fooSet.add(new Foo()); - Map> fooMap = new HashMap>(); - fooMap.put("foo", fooSet); - foos = new HashMap>>(); - foos.put("foo", fooMap); - - bars = (Map>>) typeConverter.convertValue(foos, sourceType, targetType); - assertTrue(bars.get("foo").get("foo").iterator().next() instanceof Bar); - - Service service = new Service(); - MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(service, "handle"); - processor.setConversionService(conversionService); - ServiceActivatingHandler handler = new ServiceActivatingHandler(processor); - QueueChannel replyChannel = new QueueChannel(); - handler.setOutputChannel(replyChannel); - handler.handleMessage(new GenericMessage>>>(foos)); - Message message = replyChannel.receive(0); - assertNotNull(message); - assertEquals("bar", message.getPayload()); - } - - @Test - public void testCollectionIsConverted() { - DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); - DefaultConversionService conversionService = new DefaultConversionService(); - conversionService.addConverter(new Converter() { - public Bar convert(Foo source) { - return new Bar(); - } - }); - BeanFactoryTypeConverter typeConverter = new BeanFactoryTypeConverter(conversionService); - beanFactory.setConversionService(conversionService); - typeConverter.setBeanFactory(beanFactory); - - Service service = new Service(); - MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(service, "handle"); - processor.setConversionService(conversionService); - ServiceActivatingHandler handler = new ServiceActivatingHandler(processor); - QueueChannel replyChannel = new QueueChannel(); - handler.setOutputChannel(replyChannel); - handler.handleMessage(new GenericMessage>(Collections.singletonList(new Foo()))); - Message message = replyChannel.receive(0); - assertNotNull(message); - assertEquals("baz", message.getPayload()); - } - - @Test - public void testNullArg() { - DefaultConversionService conversionService = new DefaultConversionService(); - BeanFactoryTypeConverter typeConverter = new BeanFactoryTypeConverter(conversionService); - Object foo = typeConverter.convertValue(null, null, TypeDescriptor.valueOf(Bar.class)); - assertNull(foo); - } - @Test public void testVoidArg() { - DefaultConversionService conversionService = new DefaultConversionService(); + @SuppressWarnings("deprecation") + GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); BeanFactoryTypeConverter typeConverter = new BeanFactoryTypeConverter(conversionService); Object foo = typeConverter.convertValue(null, null, TypeDescriptor.valueOf(Void.class)); assertNull(foo); @@ -239,7 +158,8 @@ public class BeanFactoryTypeConverterTests { @Test public void testEditorWithTargetString() { - DefaultConversionService conversionService = new DefaultConversionService(); + @SuppressWarnings("deprecation") + GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); BeanFactoryTypeConverter typeConverter = new BeanFactoryTypeConverter(conversionService); UUID uuid = UUID.randomUUID(); Object foo = typeConverter.convertValue(uuid, TypeDescriptor.valueOf(UUID.class), @@ -249,7 +169,8 @@ public class BeanFactoryTypeConverterTests { @Test public void testEditorWithTargetFoo() { - DefaultConversionService conversionService = new DefaultConversionService(); + @SuppressWarnings("deprecation") + GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); final Foo foo = new Foo(); conversionService.addConverter(new Converter() { public Foo convert(String source) { @@ -265,7 +186,8 @@ public class BeanFactoryTypeConverterTests { @Test public void testDelegateWithTargetUUID() { - DefaultConversionService conversionService = new DefaultConversionService(); + @SuppressWarnings("deprecation") + GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); BeanFactoryTypeConverter typeConverter = new BeanFactoryTypeConverter(conversionService); UUID uuid = UUID.randomUUID(); Object converted = typeConverter.convertValue(uuid.toString(), TypeDescriptor.valueOf(String.class),