Skip to content

Commit 1728bf1

Browse files
stsypanovsbrannen
stsypanov
authored and
sbrannen
committed
Avoid unnecessary boxing where primitives can be used
Closes gh-23267
1 parent 2909de8 commit 1728bf1

File tree

17 files changed

+24
-24
lines changed

17 files changed

+24
-24
lines changed

‎spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition,
4545
if (node instanceof Element) {
4646
Element ele = (Element) node;
4747
if (ele.hasAttribute(PROXY_TARGET_CLASS)) {
48-
proxyTargetClass = Boolean.valueOf(ele.getAttribute(PROXY_TARGET_CLASS));
48+
proxyTargetClass = Boolean.parseBoolean(ele.getAttribute(PROXY_TARGET_CLASS));
4949
}
5050
}
5151

‎spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ protected boolean shouldSkip(@Nullable ConfigurableListableBeanFactory beanFacto
183183
return true;
184184
}
185185
Object value = beanDefinition.getAttribute(SKIP_REQUIRED_CHECK_ATTRIBUTE);
186-
return (value != null && (Boolean.TRUE.equals(value) || Boolean.valueOf(value.toString())));
186+
return (value != null && (Boolean.TRUE.equals(value) || Boolean.parseBoolean(value.toString())));
187187
}
188188

189189
/**

‎spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private RootBeanDefinition parseDefinitionSource(Element definition, ParserConte
111111
CacheableOperation.Builder builder = prop.merge(opElement,
112112
parserContext.getReaderContext(), new CacheableOperation.Builder());
113113
builder.setUnless(getAttributeValue(opElement, "unless", ""));
114-
builder.setSync(Boolean.valueOf(getAttributeValue(opElement, "sync", "false")));
114+
builder.setSync(Boolean.parseBoolean(getAttributeValue(opElement, "sync", "false")));
115115

116116
Collection<CacheOperation> col = cacheOpMap.get(nameHolder);
117117
if (col == null) {
@@ -132,12 +132,12 @@ private RootBeanDefinition parseDefinitionSource(Element definition, ParserConte
132132

133133
String wide = opElement.getAttribute("all-entries");
134134
if (StringUtils.hasText(wide)) {
135-
builder.setCacheWide(Boolean.valueOf(wide.trim()));
135+
builder.setCacheWide(Boolean.parseBoolean(wide.trim()));
136136
}
137137

138138
String after = opElement.getAttribute("before-invocation");
139139
if (StringUtils.hasText(after)) {
140-
builder.setBeforeInvocation(Boolean.valueOf(after.trim()));
140+
builder.setBeforeInvocation(Boolean.parseBoolean(after.trim()));
141141
}
142142

143143
Collection<CacheOperation> col = cacheOpMap.get(nameHolder);

‎spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
9696
protected ClassPathBeanDefinitionScanner configureScanner(ParserContext parserContext, Element element) {
9797
boolean useDefaultFilters = true;
9898
if (element.hasAttribute(USE_DEFAULT_FILTERS_ATTRIBUTE)) {
99-
useDefaultFilters = Boolean.valueOf(element.getAttribute(USE_DEFAULT_FILTERS_ATTRIBUTE));
99+
useDefaultFilters = Boolean.parseBoolean(element.getAttribute(USE_DEFAULT_FILTERS_ATTRIBUTE));
100100
}
101101

102102
// Delegate bean definition registration to scanner class.
@@ -145,7 +145,7 @@ protected void registerComponents(
145145
// Register annotation config processors, if necessary.
146146
boolean annotationConfig = true;
147147
if (element.hasAttribute(ANNOTATION_CONFIG_ATTRIBUTE)) {
148-
annotationConfig = Boolean.valueOf(element.getAttribute(ANNOTATION_CONFIG_ATTRIBUTE));
148+
annotationConfig = Boolean.parseBoolean(element.getAttribute(ANNOTATION_CONFIG_ATTRIBUTE));
149149
}
150150
if (annotationConfig) {
151151
Set<BeanDefinitionHolder> processorDefinitions =

‎spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
8181
if (StringUtils.hasText(exceptionHandler)) {
8282
builder.addPropertyReference("exceptionHandler", exceptionHandler);
8383
}
84-
if (Boolean.valueOf(element.getAttribute(AopNamespaceUtils.PROXY_TARGET_CLASS_ATTRIBUTE))) {
84+
if (Boolean.parseBoolean(element.getAttribute(AopNamespaceUtils.PROXY_TARGET_CLASS_ATTRIBUTE))) {
8585
builder.addPropertyValue("proxyTargetClass", true);
8686
}
8787
registerPostProcessor(parserContext, builder, TaskManagementConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME);

‎spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ private void determinePoolSizeRange(ThreadPoolTaskExecutor executor) {
106106
int maxPoolSize;
107107
int separatorIndex = this.poolSize.indexOf('-');
108108
if (separatorIndex != -1) {
109-
corePoolSize = Integer.valueOf(this.poolSize.substring(0, separatorIndex));
110-
maxPoolSize = Integer.valueOf(this.poolSize.substring(separatorIndex + 1, this.poolSize.length()));
109+
corePoolSize = Integer.parseInt(this.poolSize.substring(0, separatorIndex));
110+
maxPoolSize = Integer.parseInt(this.poolSize.substring(separatorIndex + 1, this.poolSize.length()));
111111
if (corePoolSize > maxPoolSize) {
112112
throw new IllegalArgumentException(
113113
"Lower bound of pool-size range must not exceed the upper bound");

‎spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,16 +372,16 @@ private int[] getRange(String field, int min, int max) {
372372
return result;
373373
}
374374
if (!field.contains("-")) {
375-
result[0] = result[1] = Integer.valueOf(field);
375+
result[0] = result[1] = Integer.parseInt(field);
376376
}
377377
else {
378378
String[] split = StringUtils.delimitedListToStringArray(field, "-");
379379
if (split.length > 2) {
380380
throw new IllegalArgumentException("Range has more than two fields: '" +
381381
field + "' in expression \"" + this.expression + "\"");
382382
}
383-
result[0] = Integer.valueOf(split[0]);
384-
result[1] = Integer.valueOf(split[1]);
383+
result[0] = Integer.parseInt(split[0]);
384+
result[1] = Integer.parseInt(split[1]);
385385
}
386386
if (result[0] >= max || result[1] >= max) {
387387
throw new IllegalArgumentException("Range exceeds maximum (" + max + "): '" +

‎spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ protected boolean resolveProxyTargetClass(BeanDefinition beanDefinition) {
426426
proxyTargetClass = (Boolean) attributeValue;
427427
}
428428
else if (attributeValue instanceof String) {
429-
proxyTargetClass = Boolean.valueOf((String) attributeValue);
429+
proxyTargetClass = Boolean.parseBoolean((String) attributeValue);
430430
}
431431
else if (attributeValue != null) {
432432
throw new BeanDefinitionStoreException("Invalid proxy target class attribute [" +

‎spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public long[] getHeartbeat() {
243243
if (rawValues == null) {
244244
return Arrays.copyOf(DEFAULT_HEARTBEAT, 2);
245245
}
246-
return new long[] {Long.valueOf(rawValues[0]), Long.valueOf(rawValues[1])};
246+
return new long[] {Long.parseLong(rawValues[0]), Long.parseLong(rawValues[1])};
247247
}
248248

249249
public void setAcceptVersion(String acceptVersion) {

‎spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ public long[] getHeartbeat() {
282282
if (rawValues == null) {
283283
return null;
284284
}
285-
return new long[] {Long.valueOf(rawValues[0]), Long.valueOf(rawValues[1])};
285+
return new long[] {Long.parseLong(rawValues[0]), Long.parseLong(rawValues[1])};
286286
}
287287

288288
/**

‎spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ protected SpringPersistenceUnitInfo parsePersistenceUnitInfo(
230230
Element excludeUnlistedClasses = DomUtils.getChildElementByTagName(persistenceUnit, EXCLUDE_UNLISTED_CLASSES);
231231
if (excludeUnlistedClasses != null) {
232232
String excludeText = DomUtils.getTextValue(excludeUnlistedClasses);
233-
unitInfo.setExcludeUnlistedClasses(!StringUtils.hasText(excludeText) || Boolean.valueOf(excludeText));
233+
unitInfo.setExcludeUnlistedClasses(!StringUtils.hasText(excludeText) || Boolean.parseBoolean(excludeText));
234234
}
235235

236236
// set JPA 2.0 shared cache mode

‎spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private RootBeanDefinition parseAttributeSource(Element attrEle, ParserContext p
124124
}
125125
}
126126
if (StringUtils.hasText(readOnly)) {
127-
attribute.setReadOnly(Boolean.valueOf(methodEle.getAttribute(READ_ONLY_ATTRIBUTE)));
127+
attribute.setReadOnly(Boolean.parseBoolean(methodEle.getAttribute(READ_ONLY_ATTRIBUTE)));
128128
}
129129

130130
List<RollbackRuleAttribute> rollbackRules = new LinkedList<>();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ else if (line.startsWith("event:")) {
130130
sseBuilder.event(line.substring(6).trim());
131131
}
132132
else if (line.startsWith("retry:")) {
133-
sseBuilder.retry(Duration.ofMillis(Long.valueOf(line.substring(6).trim())));
133+
sseBuilder.retry(Duration.ofMillis(Long.parseLong(line.substring(6).trim())));
134134
}
135135
else if (line.startsWith(":")) {
136136
comment = (comment != null ? comment : new StringBuilder());

‎spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ private ManagedList<?> getMessageConverters(Element element, @Nullable Object so
569569
}
570570
}
571571

572-
if (convertersElement == null || Boolean.valueOf(convertersElement.getAttribute("register-defaults"))) {
572+
if (convertersElement == null || Boolean.parseBoolean(convertersElement.getAttribute("register-defaults"))) {
573573
messageConverters.setSource(source);
574574
messageConverters.add(createConverterDefinition(ByteArrayHttpMessageConverter.class, source));
575575

‎spring-websocket/src/main/java/org/springframework/web/socket/config/HandlersBeanDefinitionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public BeanDefinition parse(Element element, ParserContext context) {
6464
context.pushContainingComponent(compDefinition);
6565

6666
String orderAttribute = element.getAttribute("order");
67-
int order = orderAttribute.isEmpty() ? DEFAULT_MAPPING_ORDER : Integer.valueOf(orderAttribute);
67+
int order = orderAttribute.isEmpty() ? DEFAULT_MAPPING_ORDER : Integer.parseInt(orderAttribute);
6868

6969
RootBeanDefinition handlerMappingDef = new RootBeanDefinition(WebSocketHandlerMapping.class);
7070
handlerMappingDef.setSource(source);

‎spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ private ManagedMap<String, Object> registerHandlerMapping(
200200
RootBeanDefinition handlerMappingDef = new RootBeanDefinition(WebSocketHandlerMapping.class);
201201

202202
String orderAttribute = element.getAttribute("order");
203-
int order = orderAttribute.isEmpty() ? DEFAULT_MAPPING_ORDER : Integer.valueOf(orderAttribute);
203+
int order = orderAttribute.isEmpty() ? DEFAULT_MAPPING_ORDER : Integer.parseInt(orderAttribute);
204204
handlerMappingDef.getPropertyValues().add("order", order);
205205

206206
String pathHelper = element.getAttribute("path-helper");
@@ -485,7 +485,7 @@ private RuntimeBeanReference registerMessageConverter(
485485
converters.add(object);
486486
}
487487
}
488-
if (convertersElement == null || Boolean.valueOf(convertersElement.getAttribute("register-defaults"))) {
488+
if (convertersElement == null || Boolean.parseBoolean(convertersElement.getAttribute("register-defaults"))) {
489489
converters.setSource(source);
490490
converters.add(new RootBeanDefinition(StringMessageConverter.class));
491491
converters.add(new RootBeanDefinition(ByteArrayMessageConverter.class));

‎spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractClientSockJsSession.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ private void handleCloseFrame(SockJsFrame frame) {
307307
if (frameData != null) {
308308
String[] data = getMessageCodec().decode(frameData);
309309
if (data != null && data.length == 2) {
310-
closeStatus = new CloseStatus(Integer.valueOf(data[0]), data[1]);
310+
closeStatus = new CloseStatus(Integer.parseInt(data[0]), data[1]);
311311
}
312312
if (logger.isDebugEnabled()) {
313313
logger.debug("Processing SockJS close frame with " + closeStatus + " in " + this);

0 commit comments

Comments
 (0)