root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2024-01-29 16:42:32 +01:00
parent 5dc26460fb
commit 005d5ef922
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java
View File

@ -29,11 +29,12 @@ import org.springframework.util.StringUtils;
* Created using the {@code parse*} methods. * Created using the {@code parse*} methods.
* *
* @author Arjen Poutsma * @author Arjen Poutsma
* @author Juergen Hoeller
* @since 5.3 * @since 5.3
*/ */
final class BitsCronField extends CronField { final class BitsCronField extends CronField {
public static BitsCronField ZERO_NANOS = forZeroNanos(); public static final BitsCronField ZERO_NANOS = forZeroNanos();
private static final long MASK = 0xFFFFFFFFFFFFFFFFL; private static final long MASK = 0xFFFFFFFFFFFFFFFFL;

22
spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
View File

@ -392,6 +392,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
return this.observationConvention; return this.observationConvention;
} }
// GET // GET
@Override @Override
@ -872,13 +873,14 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
request = createRequest(url, method); request = createRequest(url, method);
} }
catch (IOException ex) { catch (IOException ex) {
ResourceAccessException exception = createResourceAccessException(url, method, ex); throw createResourceAccessException(url, method, ex);
throw exception;
} }
ClientRequestObservationContext observationContext = new ClientRequestObservationContext(request); ClientRequestObservationContext observationContext = new ClientRequestObservationContext(request);
observationContext.setUriTemplate(uriTemplate); observationContext.setUriTemplate(uriTemplate);
Observation observation = ClientHttpObservationDocumentation.HTTP_CLIENT_EXCHANGES.observation(this.observationConvention, Observation observation = ClientHttpObservationDocumentation.HTTP_CLIENT_EXCHANGES.observation(
DEFAULT_OBSERVATION_CONVENTION, () -> observationContext, this.observationRegistry).start(); this.observationConvention, DEFAULT_OBSERVATION_CONVENTION,
() -> observationContext, this.observationRegistry).start();
ClientHttpResponse response = null; ClientHttpResponse response = null;
try (Observation.Scope scope = observation.openScope()){ try (Observation.Scope scope = observation.openScope()){
if (requestCallback != null) { if (requestCallback != null) {
@ -890,13 +892,13 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
return (responseExtractor != null ? responseExtractor.extractData(response) : null); return (responseExtractor != null ? responseExtractor.extractData(response) : null);
} }
catch (IOException ex) { catch (IOException ex) {
ResourceAccessException exception = createResourceAccessException(url, method, ex); ResourceAccessException accessEx = createResourceAccessException(url, method, ex);
observation.error(exception); observation.error(accessEx);
throw exception; throw accessEx;
} }
catch (Throwable exc) { catch (Throwable ex) {
observation.error(exc); observation.error(ex);
throw exc; throw ex;
} }
finally { finally {
if (response != null) { if (response != null) {