Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4.x'

Browse Source 
Closes gh-25880
This commit is contained in:
Stephane Nicoll
2021-04-04 11:19:13 +02:00
parent 72a1eb6384 103155694f
commit dd916f908f
12 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BootstrapRegistry.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 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.
@@ -139,7 +139,7 @@ public interface BootstrapRegistry {
}
/**
* Factory method that can be used to create a {@link InstanceSupplier} for a
* Factory method that can be used to create an {@link InstanceSupplier} for a
* given instance.
* @param <T> the instance type
* @param instance the instance
@@ -150,7 +150,7 @@ public interface BootstrapRegistry {
}
/**
* Factory method that can be used to create a {@link InstanceSupplier} from a
* Factory method that can be used to create an {@link InstanceSupplier} from a
* {@link Supplier}.
* @param <T> the instance type
* @param supplier the supplier that will provide the instance

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/InactiveConfigDataAccessException.java
View File

@@ -111,7 +111,7 @@ public class InactiveConfigDataAccessException extends ConfigDataException {
}
/**
* Throw a {@link InactiveConfigDataAccessException} if the given
* Throw an {@link InactiveConfigDataAccessException} if the given
* {@link ConfigDataEnvironmentContributor} contains the property.
* @param contributor the contributor to check
* @param name the name to check

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/InvalidConfigDataPropertyException.java
View File

@@ -101,7 +101,7 @@ public class InvalidConfigDataPropertyException extends ConfigDataException {
}
/**
* Throw a {@link InvalidConfigDataPropertyException} or log a warning if the given
* Throw an {@link InvalidConfigDataPropertyException} or log a warning if the given
* {@link ConfigDataEnvironmentContributor} contains any invalid property. A warning
* is logged if the property is still supported, but not recommended. An error is
* thrown if the property is completely unsupported.

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java
View File

@@ -87,7 +87,7 @@ public class RootUriTemplateHandler implements UriTemplateHandler {
/**
* Derives a new {@code RootUriTemplateHandler} from this one, wrapping its delegate
* {link UriTemplateHandler} by applying the given {@code wrapper}.
* {@link UriTemplateHandler} by applying the given {@code wrapper}.
* @param wrapper the wrapper to apply to the delegate URI template handler
* @return the new handler
* @since 2.3.10