Skip to content

Commit

Permalink
Merge branch '3.3.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
wilkinsona committed Jul 11, 2024
2 parents 0a3e799 + ecbbe6a commit 6f17ff5
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 6f17ff5

Please sign in to comment.