Polish contribution

See gh-29530

Author: sbrannen

spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.

spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -158,10 +158,7 @@ public void completed(Message<HttpResponse, Publisher<ByteBuffer>> result) {
 
 		@Override
 		public void failed(Exception ex) {
-			Throwable t = ex;
-			if (t instanceof HttpStreamResetException hsre) {
-				t = hsre.getCause();
-			}
+			Throwable t = (ex instanceof HttpStreamResetException hsre ? hsre.getCause() : ex);
 			this.sink.error(t);
 		}
 

spring-web/src/main/java/org/springframework/http/client/reactive/JettyHeadersAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 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.

spring-web/src/main/java/org/springframework/http/client/reactive/JettyResourceFactory.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.
@@ -131,9 +131,9 @@ public void afterPropertiesSet() throws Exception {
 		}
 		if (this.byteBufferPool == null) {
 			this.byteBufferPool = new MappedByteBufferPool(2048,
-					this.executor instanceof ThreadPool.SizedThreadPool sizedThreadPool
-							? sizedThreadPool.getMaxThreads() / 2
-							: ProcessorUtils.availableProcessors() * 2);
+					this.executor instanceof ThreadPool.SizedThreadPool sizedThreadPool ?
+							sizedThreadPool.getMaxThreads() / 2 :
+							ProcessorUtils.availableProcessors() * 2);
 		}
 		if (this.scheduler == null) {
 			this.scheduler = new ScheduledExecutorScheduler(name + "-scheduler", false);

spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 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.
@@ -163,8 +163,8 @@ public Mono<T> readMono(ResolvableType actualType, ResolvableType elementType,
 	protected Map<String, Object> getReadHints(ResolvableType actualType,
 			ResolvableType elementType, ServerHttpRequest request, ServerHttpResponse response) {
 
-		if (this.decoder instanceof HttpMessageDecoder<?> httpMethodDecoder) {
-			return httpMethodDecoder.getDecodeHints(actualType, elementType, request, response);
+		if (this.decoder instanceof HttpMessageDecoder<?> httpMessageDecoder) {
+			return httpMessageDecoder.getDecodeHints(actualType, elementType, request, response);
 		}
 		return Hints.none();
 	}

spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.

spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageWriter.java

@@ -150,9 +150,9 @@ private Flux<Publisher<DataBuffer>> encode(Publisher<?> input, ResolvableType el
 			if (data == null) {
 				result = Flux.just(encodeText(sb + "\n", mediaType, factory));
 			}
-			else if (data instanceof String dataString) {
-				dataString = StringUtils.replace(dataString, "\n", "\ndata:");
-				result = Flux.just(encodeText(sb + dataString + "\n\n", mediaType, factory));
+			else if (data instanceof String text) {
+				text = StringUtils.replace(text, "\n", "\ndata:");
+				result = Flux.just(encodeText(sb + text + "\n\n", mediaType, factory));
 			}
 			else {
 				result = encodeEvent(sb, data, dataType, mediaType, factory, hints);

spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 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.
@@ -129,7 +129,7 @@ private LinkedMultiValueMap<String, Part> toMultiValueMap(Map<String, Collection
 	}
 
 	private List<Part> toList(Collection<Part> collection) {
-		return collection instanceof List<Part> partList ? partList : new ArrayList<>(collection);
+		return (collection instanceof List<Part> list ? list : new ArrayList<>(collection));
 	}
 
 }

spring-web/src/main/java/org/springframework/http/codec/support/BaseCodecConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.

spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java

@@ -441,24 +441,26 @@ else if (codec instanceof EncoderHttpMessageWriter<?> encoderHttpMessageWriter)
 			if (codec instanceof AbstractDataBufferDecoder<?> abstractDataBufferDecoder) {
 				abstractDataBufferDecoder.setMaxInMemorySize(size);
 			}
+			// Pattern variables in the following if-blocks cannot be named the same as instance fields
+			// due to lacking support in Checkstyle: https://github.com/checkstyle/checkstyle/issues/10969
 			if (protobufPresent) {
-				if (codec instanceof ProtobufDecoder protobufDecoderCodec) {
-					protobufDecoderCodec.setMaxMessageSize(size);
+				if (codec instanceof ProtobufDecoder protobufDec) {
+					protobufDec.setMaxMessageSize(size);
 				}
 			}
 			if (kotlinSerializationCborPresent) {
-				if (codec instanceof KotlinSerializationCborDecoder kotlinSerializationCborDecoderCodec) {
-					kotlinSerializationCborDecoderCodec.setMaxInMemorySize(size);
+				if (codec instanceof KotlinSerializationCborDecoder kotlinSerializationCborDec) {
+					kotlinSerializationCborDec.setMaxInMemorySize(size);
 				}
 			}
 			if (kotlinSerializationJsonPresent) {
-				if (codec instanceof KotlinSerializationJsonDecoder kotlinSerializationJsonDecoderCodec) {
-					kotlinSerializationJsonDecoderCodec.setMaxInMemorySize(size);
+				if (codec instanceof KotlinSerializationJsonDecoder kotlinSerializationJsonDec) {
+					kotlinSerializationJsonDec.setMaxInMemorySize(size);
 				}
 			}
 			if (kotlinSerializationProtobufPresent) {
-				if (codec instanceof KotlinSerializationProtobufDecoder kotlinSerializationProtobufDecoderCodec) {
-					kotlinSerializationProtobufDecoderCodec.setMaxInMemorySize(size);
+				if (codec instanceof KotlinSerializationProtobufDecoder kotlinSerializationProtobufDec) {
+					kotlinSerializationProtobufDec.setMaxInMemorySize(size);
 				}
 			}
 			if (jackson2Present) {