From 69f47e7700137397c883159a0716f9cd574b55c0 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 9 Dec 2022 00:53:54 -0500 Subject: [PATCH] Polishing - primarily automated "clean up" using Eclipse IDE --- .../beans/factory/aot/BeanInstanceSupplier.java | 4 ++-- .../beans/factory/support/InstanceSupplier.java | 4 ++-- .../java/org/springframework/beans/BeanWrapperTests.java | 1 + .../org/springframework/aot/test/generate/CompilerFiles.java | 3 +-- .../core/io/AbstractFileResolvingResource.java | 3 +-- .../java/org/springframework/core/io/buffer/DataBuffer.java | 2 +- .../test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java | 3 +-- .../DefaultClientRequestObservationConvention.java | 5 ++--- .../web/client/ExtractingResponseErrorHandler.java | 3 ++- .../client/DefaultClientRequestObservationConvention.java | 5 ++--- .../web/reactive/function/client/DefaultWebClient.java | 2 +- .../web/servlet/config/MvcNamespaceUtils.java | 4 ++-- 12 files changed, 18 insertions(+), 21 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java index 939f753bae..ae9441e0bc 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java @@ -155,7 +155,7 @@ public final class BeanInstanceSupplier extends AutowiredElementResolver impl public BeanInstanceSupplier withGenerator( ThrowingBiFunction generator) { Assert.notNull(generator, "'generator' must not be null"); - return new BeanInstanceSupplier(this.lookup, generator, this.shortcuts); + return new BeanInstanceSupplier<>(this.lookup, generator, this.shortcuts); } /** @@ -196,7 +196,7 @@ public final class BeanInstanceSupplier extends AutowiredElementResolver impl * that uses the shortcuts */ public BeanInstanceSupplier withShortcuts(String... beanNames) { - return new BeanInstanceSupplier(this.lookup, this.generator, beanNames); + return new BeanInstanceSupplier<>(this.lookup, this.generator, beanNames); } @Override diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/InstanceSupplier.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/InstanceSupplier.java index 4938c0e415..eddbc79547 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/InstanceSupplier.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/InstanceSupplier.java @@ -75,7 +75,7 @@ public interface InstanceSupplier extends ThrowingSupplier { default InstanceSupplier andThen( ThrowingBiFunction after) { Assert.notNull(after, "'after' function must not be null"); - return new InstanceSupplier() { + return new InstanceSupplier<>() { @Override public V get(RegisteredBean registeredBean) throws Exception { @@ -119,7 +119,7 @@ public interface InstanceSupplier extends ThrowingSupplier { && instanceSupplier.getFactoryMethod() == factoryMethod) { return instanceSupplier; } - return new InstanceSupplier() { + return new InstanceSupplier<>() { @Override public T get(RegisteredBean registeredBean) throws Exception { diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index 17a775a7f1..4766b6e2a7 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -380,6 +380,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests { } + @SuppressWarnings("try") public static class ActiveResource implements AutoCloseable { public ActiveResource getResource() { diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generate/CompilerFiles.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/CompilerFiles.java index 304241f1b5..8b0b18bd80 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generate/CompilerFiles.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/CompilerFiles.java @@ -56,8 +56,7 @@ public final class CompilerFiles implements UnaryOperator { return testCompiler .withSources(adapt(Kind.SOURCE, (path, inputStreamSource) -> SourceFile.of(inputStreamSource))) - .withResources(adapt(Kind.RESOURCE, (path, inputStreamSource) -> - ResourceFile.of(path, inputStreamSource))) + .withResources(adapt(Kind.RESOURCE, ResourceFile::of)) .withClasses(adapt(Kind.CLASS, (path, inputStreamSource) -> ClassFile.of(ClassFile.toClassName(path), inputStreamSource))); } diff --git a/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java b/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java index 5bb1185dcf..89a97883c2 100644 --- a/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java @@ -117,8 +117,7 @@ public abstract class AbstractFileResolvingResource extends AbstractResource { return false; } } - else if (con instanceof JarURLConnection) { - JarURLConnection jarCon = (JarURLConnection) con; + else if (con instanceof JarURLConnection jarCon) { JarEntry jarEntry = jarCon.getJarEntry(); if (jarEntry == null) { return false; diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java index a39ee3453e..ec41e5876d 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java @@ -417,7 +417,7 @@ public interface DataBuffer { */ default InputStream asInputStream(boolean releaseOnClose) { return new DataBufferInputStream(this, releaseOnClose); - }; + } /** * Expose this buffer's data as an {@link OutputStream}. Both data and write position are diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java index 218d0cc584..2519bbef3a 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java @@ -370,8 +370,7 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable { } private void addRequestParameter(MockHttpServletRequest request, NameValuePair param) { - if (param instanceof KeyDataPair) { - KeyDataPair pair = (KeyDataPair) param; + if (param instanceof KeyDataPair pair) { File file = pair.getFile(); MockPart part; if (file != null) { diff --git a/spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientRequestObservationConvention.java b/spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientRequestObservationConvention.java index 71d6e53000..f3e26c60bd 100644 --- a/spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientRequestObservationConvention.java +++ b/spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientRequestObservationConvention.java @@ -24,11 +24,10 @@ import io.micrometer.common.KeyValues; import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatusCode; import org.springframework.http.client.ClientHttpResponse; +import org.springframework.http.client.observation.ClientHttpObservationDocumentation.HighCardinalityKeyNames; +import org.springframework.http.client.observation.ClientHttpObservationDocumentation.LowCardinalityKeyNames; import org.springframework.util.StringUtils; -import static org.springframework.http.client.observation.ClientHttpObservationDocumentation.HighCardinalityKeyNames; -import static org.springframework.http.client.observation.ClientHttpObservationDocumentation.LowCardinalityKeyNames; - /** * Default implementation for a {@link ClientRequestObservationConvention}, * extracting information from the {@link ClientRequestObservationContext}. diff --git a/spring-web/src/main/java/org/springframework/web/client/ExtractingResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/ExtractingResponseErrorHandler.java index 72cd840a30..4357be4d27 100644 --- a/spring-web/src/main/java/org/springframework/web/client/ExtractingResponseErrorHandler.java +++ b/spring-web/src/main/java/org/springframework/web/client/ExtractingResponseErrorHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2022 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. @@ -85,6 +85,7 @@ public class ExtractingResponseErrorHandler extends DefaultResponseErrorHandler /** * Set the message converters to use by this extractor. */ + @Override public void setMessageConverters(List> messageConverters) { this.messageConverters = messageConverters; } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java index 3cde48309f..294dfa039c 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java @@ -24,9 +24,8 @@ import io.micrometer.common.KeyValues; import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatusCode; import org.springframework.util.StringUtils; - -import static org.springframework.web.reactive.function.client.ClientHttpObservationDocumentation.HighCardinalityKeyNames; -import static org.springframework.web.reactive.function.client.ClientHttpObservationDocumentation.LowCardinalityKeyNames; +import org.springframework.web.reactive.function.client.ClientHttpObservationDocumentation.HighCardinalityKeyNames; +import org.springframework.web.reactive.function.client.ClientHttpObservationDocumentation.LowCardinalityKeyNames; /** * Default implementation for a {@link ClientRequestObservationConvention}, diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java index 4620d7e68a..2f099e9e40 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java @@ -125,7 +125,7 @@ class DefaultWebClient implements WebClient { handlerMap.entrySet().stream() .map(entry -> new DefaultResponseSpec.StatusHandler(entry.getKey(), entry.getValue())) .toList()); - }; + } @Override diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java index b96ddebada..e6ac91ad60 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java @@ -232,8 +232,8 @@ public abstract class MvcNamespaceUtils { } /** - * Registers an {@link FixedThemeResolver} under a well-known name - * unless already registered. + * Registers an {@link org.springframework.web.servlet.theme.FixedThemeResolver} + * under a well-known name unless already registered. */ @SuppressWarnings("deprecation") private static void registerThemeResolver(ParserContext context, @Nullable Object source) {