Browse Source

Polishing

pull/25798/head
Juergen Hoeller 4 years ago
parent
commit
c1617d3c52
  1. 5
      spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java
  2. 16
      spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java

5
spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java

@ -1,5 +1,5 @@ @@ -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; @@ -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";

16
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java

@ -126,15 +126,13 @@ class ReactorClientHttpResponse implements ClientHttpResponse { @@ -126,15 +126,13 @@ class ReactorClientHttpResponse implements ClientHttpResponse {
public MultiValueMap<String, ResponseCookie> getCookies() {
MultiValueMap<String, ResponseCookie> 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);
}

Loading…
Cancel
Save