From db2c532c07130f46f89cda7d68159585a9171bd6 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Thu, 28 Dec 2023 15:19:33 +0800 Subject: [PATCH] Use auto boxing and unboxing where feasible See gh-31916 --- .../beans/factory/support/AbstractBeanDefinition.java | 2 +- .../beans/factory/support/BeanDefinitionDefaults.java | 2 +- .../java/org/springframework/validation/DataBinderTests.java | 2 +- .../web/reactive/result/view/RequestContext.java | 2 +- .../springframework/web/servlet/support/RequestContext.java | 4 ++-- .../web/servlet/tags/HtmlEscapingAwareTag.java | 2 +- .../web/servlet/tags/form/AbstractFormTag.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java index 5a65001bdf..ebdadd211b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java @@ -581,7 +581,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess */ @Override public boolean isLazyInit() { - return (this.lazyInit != null && this.lazyInit.booleanValue()); + return (this.lazyInit != null && this.lazyInit); } /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java index 5da53bfe3b..853f629e2f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java @@ -59,7 +59,7 @@ public class BeanDefinitionDefaults { * @return whether to apply lazy-init semantics ({@code false} by default) */ public boolean isLazyInit() { - return (this.lazyInit != null && this.lazyInit.booleanValue()); + return (this.lazyInit != null && this.lazyInit); } /** diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java index 0fcf18cebd..fee87bcf29 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -2043,7 +2043,7 @@ class DataBinderTests { binder.bind(pvs); assertThat(tb.getIntegerList()).hasSize(257); - assertThat(tb.getIntegerList()).element(256).isEqualTo(Integer.valueOf(1)); + assertThat(tb.getIntegerList()).element(256).isEqualTo(1); assertThat(binder.getBindingResult().getFieldValue("integerList[256]")).isEqualTo(1); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java index b1dfca61f1..5da3aeff33 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java @@ -164,7 +164,7 @@ public class RequestContext { * no explicit default given. */ public boolean isDefaultHtmlEscape() { - return (this.defaultHtmlEscape != null && this.defaultHtmlEscape.booleanValue()); + return (this.defaultHtmlEscape != null && this.defaultHtmlEscape); } /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java index 9b876f6e1a..0d5d9332d6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java @@ -474,7 +474,7 @@ public class RequestContext { * Is default HTML escaping active? Falls back to {@code false} in case of no explicit default given. */ public boolean isDefaultHtmlEscape() { - return (this.defaultHtmlEscape != null && this.defaultHtmlEscape.booleanValue()); + return (this.defaultHtmlEscape != null && this.defaultHtmlEscape); } /** @@ -493,7 +493,7 @@ public class RequestContext { * @since 4.1.2 */ public boolean isResponseEncodedHtmlEscape() { - return (this.responseEncodedHtmlEscape == null || this.responseEncodedHtmlEscape.booleanValue()); + return (this.responseEncodedHtmlEscape == null || this.responseEncodedHtmlEscape); } /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java index 65a5e7275c..31123deaaa 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java @@ -61,7 +61,7 @@ public abstract class HtmlEscapingAwareTag extends RequestContextAwareTag { */ protected boolean isHtmlEscape() { if (this.htmlEscape != null) { - return this.htmlEscape.booleanValue(); + return this.htmlEscape; } else { return isDefaultHtmlEscape(); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java index f766ccf54d..6c57d34e5b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java @@ -111,7 +111,7 @@ public abstract class AbstractFormTag extends HtmlEscapingAwareTag { @Override protected boolean isDefaultHtmlEscape() { Boolean defaultHtmlEscape = getRequestContext().getDefaultHtmlEscape(); - return (defaultHtmlEscape == null || defaultHtmlEscape.booleanValue()); + return (defaultHtmlEscape == null || defaultHtmlEscape); }