From 26de6268aa2fcad138a156e70856de908a64f710 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 27 Jul 2017 16:06:56 +0200 Subject: [PATCH] Polishing --- .../MapAnnotationAttributeExtractor.java | 4 ++-- .../core/io/buffer/DataBufferUtilsTests.java | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/annotation/MapAnnotationAttributeExtractor.java b/spring-core/src/main/java/org/springframework/core/annotation/MapAnnotationAttributeExtractor.java index e88c502083..6eed1d0d57 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/MapAnnotationAttributeExtractor.java +++ b/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 actualReturnType = attributeValue.getClass(); + Class actualReturnType = attributeValue.getClass(); if (!ClassUtils.isAssignable(requiredReturnType, actualReturnType)) { boolean converted = false; diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java index be66e39e47..7b3b1a35a7 100644 --- a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java +++ b/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 flux = Flux.just(foo, bar, baz); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - DataBufferUtils.write(flux, bos) - .subscribe(DataBufferUtils.releaseConsumer()); - - - } - }