From 025eaf688f1c1269cd51139b7b1beadf2c103f35 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 28 Mar 2019 12:15:02 +0100 Subject: [PATCH] Clean up warnings in Gradle build output --- .../springframework/cglib/core/AbstractClassGenerator.java | 2 +- .../main/java/org/springframework/cglib/proxy/Enhancer.java | 2 +- .../core/annotation/MergedAnnotationCollectors.java | 4 ++-- .../core/env/PropertyResolverExtensionsTests.kt | 4 ++-- .../http/converter/json/Jackson2ObjectMapperBuilderTests.java | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/cglib/core/AbstractClassGenerator.java b/spring-core/src/main/java/org/springframework/cglib/core/AbstractClassGenerator.java index c64e57afe6..4d05d05123 100644 --- a/spring-core/src/main/java/org/springframework/cglib/core/AbstractClassGenerator.java +++ b/spring-core/src/main/java/org/springframework/cglib/core/AbstractClassGenerator.java @@ -244,7 +244,7 @@ abstract public class AbstractClassGenerator implements ClassGenerator { /** * Set the strategy to use to create the bytecode from this generator. - * By default an instance of {@see DefaultGeneratorStrategy} is used. + * By default an instance of {@link DefaultGeneratorStrategy} is used. */ public void setStrategy(GeneratorStrategy strategy) { if (strategy == null) diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java index d13c18b5db..fdca6b52d0 100644 --- a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java +++ b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java @@ -762,7 +762,7 @@ public class Enhancer extends AbstractClassGenerator { /** * This method should not be called in regular flow. - * Technically speaking {@link #wrapCachedClass(Class)} uses {@link EnhancerFactoryData} as a cache value, + * Technically speaking {@link #wrapCachedClass(Class)} uses {@link Enhancer.EnhancerFactoryData} as a cache value, * and the latter enables faster instantiation than plain old reflection lookup and invoke. * This method is left intact for backward compatibility reasons: just in case it was ever used. * @param type class to instantiate diff --git a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotationCollectors.java b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotationCollectors.java index 1fcdb57203..68e8ba2eaa 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotationCollectors.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotationCollectors.java @@ -102,7 +102,7 @@ public abstract class MergedAnnotationCollectors { * @param options the map conversion options * @return a {@link Collector} which collects and synthesizes the * annotations into a {@link LinkedMultiValueMap} - * @see #toMultiValueMap(Function, MapValues...) + * @see #toMultiValueMap(Function, MergedAnnotation.MapValues...) */ public static Collector, ?, MultiValueMap> toMultiValueMap( MapValues... options) { @@ -120,7 +120,7 @@ public abstract class MergedAnnotationCollectors { * @param finisher the finisher function for the new {@link MultiValueMap} * @return a {@link Collector} which collects and synthesizes the * annotations into a {@link LinkedMultiValueMap} - * @see #toMultiValueMap(MapValues...) + * @see #toMultiValueMap(MergedAnnotation.MapValues...) */ public static Collector, ?, MultiValueMap> toMultiValueMap( Function, MultiValueMap> finisher, diff --git a/spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsTests.kt b/spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsTests.kt index a68d40c741..96854fe549 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsTests.kt @@ -40,14 +40,14 @@ class PropertyResolverExtensionsTests { @Test fun `getProperty extension`() { every { propertyResolver.getProperty("name", String::class.java) } returns "foo" - val name: String? = propertyResolver.getProperty("name") + propertyResolver.getProperty("name") verify { propertyResolver.getProperty("name", String::class.java) } } @Test fun `getRequiredProperty extension`() { every { propertyResolver.getRequiredProperty("name", String::class.java) } returns "foo" - val name: String = propertyResolver.getRequiredProperty("name") + propertyResolver.getRequiredProperty("name") verify { propertyResolver.getRequiredProperty("name", String::class.java) } } diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java index ec38333a60..eaab345436 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java @@ -676,6 +676,7 @@ public class Jackson2ObjectMapperBuilderTests { } + @SuppressWarnings("serial") public static class MyXmlFactory extends XmlFactory { }