Browse Source

Polish contribution

See gh-27823
pull/27896/head
Sam Brannen 3 years ago
parent
commit
c3ce4f0f90
  1. 4
      spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java
  2. 6
      spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
  3. 6
      spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
  4. 6
      spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
  5. 6
      spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
  6. 6
      spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java

4
spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -62,7 +62,7 @@ class MetadataStore {
private CandidateComponentsMetadata readMetadata(InputStream in) throws IOException { private CandidateComponentsMetadata readMetadata(InputStream in) throws IOException {
try (in){ try (in) {
return PropertiesMarshaller.read(in); return PropertiesMarshaller.read(in);
} }
} }

6
spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -101,8 +101,8 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
} }
return NO_DEBUG_INFO_MAP; return NO_DEBUG_INFO_MAP;
} }
// We cannot use try-with-resources here as, potential, exception upon closing // We cannot use try-with-resources here for the InputStream, since we have
// would still bubble up the stack // custom handling of the close() method in a finally-block.
try { try {
ClassReader classReader = new ClassReader(is); ClassReader classReader = new ClassReader(is);
Map<Executable, String[]> map = new ConcurrentHashMap<>(32); Map<Executable, String[]> map = new ConcurrentHashMap<>(32);

6
spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -169,8 +169,8 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter<B
ImageInputStream imageInputStream = null; ImageInputStream imageInputStream = null;
ImageReader imageReader = null; ImageReader imageReader = null;
// We cannot use try-with-resources here as, potential, exception upon closing // We cannot use try-with-resources here for the ImageInputStream, since we have
// would still bubble up the stack // custom handling of the close() method in a finally-block.
try { try {
imageInputStream = createImageInputStream(inputMessage.getBody()); imageInputStream = createImageInputStream(inputMessage.getBody());
MediaType contentType = inputMessage.getHeaders().getContentType(); MediaType contentType = inputMessage.getHeaders().getContentType();

6
spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -131,8 +131,8 @@ public class ResourceHttpMessageConverter extends AbstractHttpMessageConverter<R
protected void writeContent(Resource resource, HttpOutputMessage outputMessage) protected void writeContent(Resource resource, HttpOutputMessage outputMessage)
throws IOException, HttpMessageNotWritableException { throws IOException, HttpMessageNotWritableException {
// We cannot use try-with-resources here as, potential, exception upon closing // We cannot use try-with-resources here for the InputStream, since we have
// would still bubble up the stack // custom handling of the close() method in a finally-block.
try { try {
InputStream in = resource.getInputStream(); InputStream in = resource.getInputStream();
try { try {

6
spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -155,8 +155,8 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa
responseHeaders.setContentLength(rangeLength); responseHeaders.setContentLength(rangeLength);
InputStream in = region.getResource().getInputStream(); InputStream in = region.getResource().getInputStream();
// We cannot use try-with-resources here as, potential, exception upon closing // We cannot use try-with-resources here for the InputStream, since we have
// would still bubble up the stack // custom handling of the close() method in a finally-block.
try { try {
StreamUtils.copyRange(in, outputMessage.getBody(), start, end); StreamUtils.copyRange(in, outputMessage.getBody(), start, end);
} }

6
spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -374,8 +374,8 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
headerAccessor.setMessage(error.getMessage()); headerAccessor.setMessage(error.getMessage());
byte[] bytes = this.stompEncoder.encode(headerAccessor.getMessageHeaders(), EMPTY_PAYLOAD); byte[] bytes = this.stompEncoder.encode(headerAccessor.getMessageHeaders(), EMPTY_PAYLOAD);
// We cannot use try-with-resources here as, potential, exception upon closing // We cannot use try-with-resources here for the WebSocketSession, since we have
// would still bubble up the stack // custom handling of the close() method in a finally-block.
try { try {
session.sendMessage(new TextMessage(bytes)); session.sendMessage(new TextMessage(bytes));
} }

Loading…
Cancel
Save