Polishing

spring-core/src/main/java/org/springframework/core/annotation/MapAnnotationAttributeExtractor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -126,7 +126,7 @@ class MapAnnotationAttributeExtractor extends AbstractAliasAwareAnnotationAttrib
 
 			// finally, ensure correct type
 			Class<?> requiredReturnType = attributeMethod.getReturnType();
-			Class<? extends Object> actualReturnType = attributeValue.getClass();
+			Class<?> actualReturnType = attributeValue.getClass();
 
 			if (!ClassUtils.isAssignable(requiredReturnType, actualReturnType)) {
 				boolean converted = false;

spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java

@@ -16,7 +16,6 @@
 
 package org.springframework.core.io.buffer;
 
-import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;
@@ -30,7 +29,6 @@ import java.nio.file.StandardOpenOption;
 import java.time.Duration;
 import java.util.stream.Collectors;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
@@ -293,16 +291,4 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase {
 		// AbstractDataBufferAllocatingTestCase.LeakDetector will assert the release of the buffers
 	}
 
-	public void foo() {
-		DataBuffer foo = stringBuffer("foo");
-		DataBuffer bar = stringBuffer("bar");
-		DataBuffer baz = stringBuffer("baz");
-		Flux<DataBuffer> flux = Flux.just(foo, bar, baz);
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
-		DataBufferUtils.write(flux, bos)
-				.subscribe(DataBufferUtils.releaseConsumer());
-
-
-	}
-
 }