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

Merge branch '3.3.x' 

Closes gh-42976
This commit is contained in:
Stéphane Nicoll 2024-11-02 20:25:35 +09:00
parent 06f0b91429 3c42ba8cf0
commit fdf24c6caa
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityService.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2024 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.
@ -97,7 +97,7 @@ class CloudFoundrySecurityService {
/** /**
* Return all token keys known by the UAA. * Return all token keys known by the UAA.
* @return a list of token keys * @return a map of token keys
*/ */
Map<String, String> fetchTokenKeys() { Map<String, String> fetchTokenKeys() {
try { try {

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientSsl.java
View File

@ -31,8 +31,8 @@ import org.springframework.web.client.RestClient;
* Typically used as follows: <pre class="code"> * Typically used as follows: <pre class="code">
* &#064;Bean * &#064;Bean
* public MyBean myBean(RestClient.Builder restClientBuilder, RestClientSsl ssl) { * public MyBean myBean(RestClient.Builder restClientBuilder, RestClientSsl ssl) {
* RestClient restClientrestClient= restClientBuilder.apply(ssl.fromBundle("mybundle")).build(); * RestClient restClient = restClientBuilder.apply(ssl.fromBundle("mybundle")).build();
* return new MyBean(webClient); * return new MyBean(restClient);
* } * }
* </pre> NOTE: Apply SSL configuration will replace any previously * </pre> NOTE: Apply SSL configuration will replace any previously
* {@link RestClient.Builder#requestFactory configured} {@link ClientHttpRequestFactory}. * {@link RestClient.Builder#requestFactory configured} {@link ClientHttpRequestFactory}.

4
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/package-info.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 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.
@ -15,6 +15,6 @@
*/ */
/** /**
* Non-blocking IO {@link java.nio.file.FileSystem} implementation for nested suppoprt. * Non-blocking IO {@link java.nio.file.FileSystem} implementation for nested support.
*/ */
package org.springframework.boot.loader.nio.file; package org.springframework.boot.loader.nio.file;

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
View File

@ -528,7 +528,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
/** /**
* Returns a mutable set of the patterns that match jars to ignore for TLD scanning. * Returns a mutable set of the patterns that match jars to ignore for TLD scanning.
* @return the list of jars to ignore for TLD scanning * @return the set of jars to ignore for TLD scanning
*/ */
public Set<String> getTldSkipPatterns() { public Set<String> getTldSkipPatterns() {
return this.tldSkipPatterns; return this.tldSkipPatterns;