ObjectToOptionalConverter preserves existing Optional instances

Issue: SPR-12785
(cherry picked from commit f786fc3)

Author: jhoeller

spring-core/src/main/java/org/springframework/core/convert/support/ObjectToOptionalConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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,6 +31,7 @@
  * of Optional when known.
  *
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @since 4.1
  */
 @UsesJava8
@@ -64,7 +65,10 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		if (source == null) {
 			return Optional.empty();
 		}
-		if (targetType.getResolvableType() == null) {
+		else if (source instanceof Optional) {
+			return source;
+		}
+		else if (targetType.getResolvableType() == null) {
 			return Optional.of(source);
 		}
 		else {

spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -69,7 +69,7 @@ public void testStringToCharacterEmptyString() {
 		assertEquals(null, conversionService.convert("", Character.class));
 	}
 
-	@Test(expected=ConversionFailedException.class)
+	@Test(expected = ConversionFailedException.class)
 	public void testStringToCharacterInvalidString() {
 		conversionService.convert("invalid", Character.class);
 	}
@@ -106,7 +106,7 @@ public void testStringToBooleanEmptyString() {
 		assertEquals(null, conversionService.convert("", Boolean.class));
 	}
 
-	@Test(expected=ConversionFailedException.class)
+	@Test(expected = ConversionFailedException.class)
 	public void testStringToBooleanInvalidString() {
 		conversionService.convert("invalid", Boolean.class);
 	}
@@ -265,36 +265,11 @@ public void testNumberToNumber() {
 		assertEquals(Long.valueOf(1), conversionService.convert(Integer.valueOf(1), Long.class));
 	}
 
-	@Test(expected=ConversionFailedException.class)
+	@Test(expected = ConversionFailedException.class)
 	public void testNumberToNumberNotSupportedNumber() {
 		conversionService.convert(Integer.valueOf(1), CustomNumber.class);
 	}
 
-	@SuppressWarnings("serial")
-	public static class CustomNumber extends Number {
-
-		@Override
-		public double doubleValue() {
-			return 0;
-		}
-
-		@Override
-		public float floatValue() {
-			return 0;
-		}
-
-		@Override
-		public int intValue() {
-			return 0;
-		}
-
-		@Override
-		public long longValue() {
-			return 0;
-		}
-
-	}
-
 	@Test
 	public void testNumberToCharacter() {
 		assertEquals(Character.valueOf('A'), conversionService.convert(Integer.valueOf(65), Character.class));
@@ -798,7 +773,7 @@ public void convertObjectToOptional() {
 		TypeDescriptor descriptor = new TypeDescriptor(parameter);
 		Object actual = conversionService.convert("1,2,3", TypeDescriptor.valueOf(String.class), descriptor);
 		assertEquals(Optional.class, actual.getClass());
-		assertEquals(Arrays.asList(1,2,3), ((Optional<List<Integer>>) actual).get());
+		assertEquals(Arrays.asList(1, 2, 3), ((Optional<List<Integer>>) actual).get());
 	}
 
 	@Test
@@ -807,6 +782,38 @@ public void convertObjectToOptionalNull() {
 		assertSame(Optional.empty(), conversionService.convert(null, Optional.class));
 	}
 
+	@Test
+	public void convertExistingOptional() {
+		assertSame(Optional.empty(), conversionService.convert(Optional.empty(), TypeDescriptor.valueOf(Object.class),
+				TypeDescriptor.valueOf(Optional.class)));
+		assertSame(Optional.empty(), conversionService.convert(Optional.empty(), Optional.class));
+	}
+
+
+	@SuppressWarnings("serial")
+	public static class CustomNumber extends Number {
+
+		@Override
+		public double doubleValue() {
+			return 0;
+		}
+
+		@Override
+		public float floatValue() {
+			return 0;
+		}
+
+		@Override
+		public int intValue() {
+			return 0;
+		}
+
+		@Override
+		public long longValue() {
+			return 0;
+		}
+	}
+
 
 	public static class TestEntity {