From 703d54677e94463f773c0b25a764c2a368c3d517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A6=D1=8B=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Thu, 14 May 2020 16:39:04 +0300 Subject: [PATCH] Avoid unnecessary boxing/unboxing of primitives Closes gh-25080 --- .../beans/propertyeditors/CharacterEditor.java | 4 ++-- .../scheduling/config/TaskExecutorFactoryBean.java | 2 +- .../http/converter/ResourceRegionHttpMessageConverter.java | 6 +++--- .../config/AnnotationDrivenBeanDefinitionParser.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java index fe485cee6f..ec7c7d4c9b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java @@ -82,7 +82,7 @@ public class CharacterEditor extends PropertyEditorSupport { setAsUnicode(text); } else if (text.length() == 1) { - setValue(Character.valueOf(text.charAt(0))); + setValue(text.charAt(0)); } else { throw new IllegalArgumentException("String [" + text + "] with length " + @@ -103,7 +103,7 @@ public class CharacterEditor extends PropertyEditorSupport { private void setAsUnicode(String text) { int code = Integer.parseInt(text.substring(UNICODE_PREFIX.length()), 16); - setValue(Character.valueOf((char) code)); + setValue((char) code); } } diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java index ed12d899a1..a672b107c8 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java @@ -128,7 +128,7 @@ public class TaskExecutorFactoryBean implements } } else { - Integer value = Integer.valueOf(this.poolSize); + int value = Integer.parseInt(this.poolSize); corePoolSize = value; maxPoolSize = value; } diff --git a/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java index a7167e530b..b9dca72204 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java @@ -148,7 +148,7 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa long start = region.getPosition(); long end = start + region.getCount() - 1; - Long resourceLength = region.getResource().contentLength(); + long resourceLength = region.getResource().contentLength(); end = Math.min(end, resourceLength - 1); long rangeLength = end - start + 1; responseHeaders.add("Content-Range", "bytes " + start + '-' + end + '/' + resourceLength); @@ -201,10 +201,10 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa print(out, "--" + boundaryString); println(out); if (contentType != null) { - print(out, "Content-Type: " + contentType.toString()); + print(out, "Content-Type: " + contentType); println(out); } - Long resourceLength = region.getResource().contentLength(); + long resourceLength = region.getResource().contentLength(); end = Math.min(end, resourceLength - inputStreamPosition - 1); print(out, "Content-Range: bytes " + region.getPosition() + '-' + (region.getPosition() + region.getCount() - 1) + diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java index d70469ceb5..d143b7d09f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java @@ -208,7 +208,7 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser { handlerMappingDef.getPropertyValues().add("contentNegotiationManager", contentNegotiationManager); if (element.hasAttribute("enable-matrix-variables")) { - Boolean enableMatrixVariables = Boolean.valueOf(element.getAttribute("enable-matrix-variables")); + boolean enableMatrixVariables = Boolean.parseBoolean(element.getAttribute("enable-matrix-variables")); handlerMappingDef.getPropertyValues().add("removeSemicolonContent", !enableMatrixVariables); }