Polish contribution

See gh-30942
spring-projects · Aug 4, 2023 · c050642 · c050642
1 parent 7636eec
commit c050642
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -94,12 +94,9 @@ public boolean supports(Class<?> clazz) {
 	protected String readInternal(Class<? extends String> clazz, HttpInputMessage inputMessage) throws IOException {
 		Charset charset = getContentTypeCharset(inputMessage.getHeaders().getContentType());
 		long length = inputMessage.getHeaders().getContentLength();
-		final byte[] bytes;
-		if (length >= 0 && length <= Integer.MAX_VALUE) {
-			bytes = inputMessage.getBody().readNBytes((int) length);
-		} else {
-			bytes = inputMessage.getBody().readAllBytes();
-		}
+		byte[] bytes = (length >= 0 && length <= Integer.MAX_VALUE ?
+				inputMessage.getBody().readNBytes((int) length) :
+				inputMessage.getBody().readAllBytes());
 		return new String(bytes, charset);
 	}
 

diff --git a/...web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java b/...web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.