From c1617d3c526ff7e29b83b8a3a2619bce68a05d57 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 18 Sep 2020 18:15:36 +0200 Subject: [PATCH] Polishing --- .../concurrent/DefaultManagedTaskScheduler.java | 5 +++-- .../reactive/ReactorClientHttpResponse.java | 16 +++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java index 1f167eeecd..133527ed77 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,10 +37,11 @@ import org.springframework.lang.Nullable; * * @author Juergen Hoeller * @since 4.0 + * @see javax.enterprise.concurrent.ManagedScheduledExecutorService */ public class DefaultManagedTaskScheduler extends ConcurrentTaskScheduler implements InitializingBean { - private JndiLocatorDelegate jndiLocator = new JndiLocatorDelegate(); + private final JndiLocatorDelegate jndiLocator = new JndiLocatorDelegate(); @Nullable private String jndiName = "java:comp/DefaultManagedScheduledExecutorService"; diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java index 38be13e461..90978d5f4a 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java @@ -126,15 +126,13 @@ class ReactorClientHttpResponse implements ClientHttpResponse { public MultiValueMap getCookies() { MultiValueMap result = new LinkedMultiValueMap<>(); this.response.cookies().values().stream().flatMap(Collection::stream) - .forEach(c -> - - result.add(c.name(), ResponseCookie.fromClientResponse(c.name(), c.value()) - .domain(c.domain()) - .path(c.path()) - .maxAge(c.maxAge()) - .secure(c.isSecure()) - .httpOnly(c.isHttpOnly()) - .build())); + .forEach(c -> result.add(c.name(), ResponseCookie.fromClientResponse(c.name(), c.value()) + .domain(c.domain()) + .path(c.path()) + .maxAge(c.maxAge()) + .secure(c.isSecure()) + .httpOnly(c.isHttpOnly()) + .build())); return CollectionUtils.unmodifiableMultiValueMap(result); }