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

Polishing

This commit is contained in:
Juergen Hoeller 2020-09-18 18:15:36 +02:00
parent 9dfef59af2
commit c1617d3c52
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"); * 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.
@ -37,10 +37,11 @@ import org.springframework.lang.Nullable;
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 4.0 * @since 4.0
* @see javax.enterprise.concurrent.ManagedScheduledExecutorService
*/ */
public class DefaultManagedTaskScheduler extends ConcurrentTaskScheduler implements InitializingBean { public class DefaultManagedTaskScheduler extends ConcurrentTaskScheduler implements InitializingBean {
private JndiLocatorDelegate jndiLocator = new JndiLocatorDelegate(); private final JndiLocatorDelegate jndiLocator = new JndiLocatorDelegate();
@Nullable @Nullable
private String jndiName = "java:comp/DefaultManagedScheduledExecutorService"; private String jndiName = "java:comp/DefaultManagedScheduledExecutorService";

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

@ -126,15 +126,13 @@ class ReactorClientHttpResponse implements ClientHttpResponse {
public MultiValueMap<String, ResponseCookie> getCookies() { public MultiValueMap<String, ResponseCookie> getCookies() {
MultiValueMap<String, ResponseCookie> result = new LinkedMultiValueMap<>(); MultiValueMap<String, ResponseCookie> result = new LinkedMultiValueMap<>();
this.response.cookies().values().stream().flatMap(Collection::stream) this.response.cookies().values().stream().flatMap(Collection::stream)
.forEach(c -> .forEach(c -> result.add(c.name(), ResponseCookie.fromClientResponse(c.name(), c.value())
.domain(c.domain())
result.add(c.name(), ResponseCookie.fromClientResponse(c.name(), c.value()) .path(c.path())
.domain(c.domain()) .maxAge(c.maxAge())
.path(c.path()) .secure(c.isSecure())
.maxAge(c.maxAge()) .httpOnly(c.isHttpOnly())
.secure(c.isSecure()) .build()));
.httpOnly(c.isHttpOnly())
.build()));
return CollectionUtils.unmodifiableMultiValueMap(result); return CollectionUtils.unmodifiableMultiValueMap(result);
} }