Skip to content

Commit 3c42ba8

Browse files
committed
Merge pull request #42974 from ngocnhan-tran1996
* pr/42974: Fix copyright year of updated file Polish Closes gh-42974
2 parents f9281a6 + a224c81 commit 3c42ba8

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -97,7 +97,7 @@ private URI getPermissionsUri(String applicationId) {
9797

9898
/**
9999
* Return all token keys known by the UAA.
100-
* @return a list of token keys
100+
* @return a map of token keys
101101
*/
102102
Map<String, String> fetchTokenKeys() {
103103
try {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@
3232
* Typically used as follows: <pre class="code">
3333
* &#064;Bean
3434
* public MyBean myBean(RestClient.Builder restClientBuilder, RestClientSsl ssl) {
35-
* RestClient restClientrestClient= restClientBuilder.apply(ssl.fromBundle("mybundle")).build();
36-
* return new MyBean(webClient);
35+
* RestClient restClient = restClientBuilder.apply(ssl.fromBundle("mybundle")).build();
36+
* return new MyBean(restClient);
3737
* }
3838
* </pre> NOTE: Apply SSL configuration will replace any previously
3939
* {@link RestClient.Builder#requestFactory configured} {@link ClientHttpRequestFactory}.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,6 +15,6 @@
1515
*/
1616

1717
/**
18-
* Non-blocking IO {@link java.nio.file.FileSystem} implementation for nested suppoprt.
18+
* Non-blocking IO {@link java.nio.file.FileSystem} implementation for nested support.
1919
*/
2020
package org.springframework.boot.loader.nio.file;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ public void setBaseDirectory(File baseDirectory) {
528528

529529
/**
530530
* Returns a mutable set of the patterns that match jars to ignore for TLD scanning.
531-
* @return the list of jars to ignore for TLD scanning
531+
* @return the set of jars to ignore for TLD scanning
532532
*/
533533
public Set<String> getTldSkipPatterns() {
534534
return this.tldSkipPatterns;

0 commit comments

Comments
 (0)