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

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-41448
This commit is contained in:
Andy Wilkinson
2024-07-11 13:16:59 +01:00
parent 784c8d2df4 2b7baf5767
commit ecbbe6a9cb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BootstrapContext.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2024 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.
@@ -35,7 +35,7 @@ public interface BootstrapContext {
/**
* Return an instance from the context if the type has been registered. The instance
* will be created it if it hasn't been accessed previously.
* will be created if it hasn't been accessed previously.
* @param <T> the instance type
* @param type the instance type
* @return the instance managed by the context
@@ -45,7 +45,7 @@ public interface BootstrapContext {
/**
* Return an instance from the context if the type has been registered. The instance
* will be created it if it hasn't been accessed previously.
* will be created if it hasn't been accessed previously.
* @param <T> the instance type
* @param type the instance type
* @param other the instance to use if the type has not been registered
@@ -55,7 +55,7 @@ public interface BootstrapContext {
/**
* Return an instance from the context if the type has been registered. The instance
* will be created it if it hasn't been accessed previously.
* will be created if it hasn't been accessed previously.
* @param <T> the instance type
* @param type the instance type
* @param other a supplier for the instance to use if the type has not been registered
@@ -65,7 +65,7 @@ public interface BootstrapContext {
/**
* Return an instance from the context if the type has been registered. The instance
* will be created it if it hasn't been accessed previously.
* will be created if it hasn't been accessed previously.
* @param <T> the instance type
* @param <X> the exception to throw if the type is not registered
* @param type the instance type