Skip to content

Upgrade to NullAway 0.13.6 #50701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
msridhar wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −3
Draft

Upgrade to NullAway 0.13.6 #50701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public <T> AbstractObjectAssert<?, T> getBean(Class<T> type) {
* given type
*/
@CheckReturnValue
public <T> AbstractObjectAssert<?, T> getBean(Class<T> type, Scope scope) {
public <T> AbstractObjectAssert<?, @Nullable T> getBean(Class<T> type, Scope scope) {
Assert.notNull(scope, "'scope' must not be null");
if (this.startupFailure != null) {
throwAssertionError(
Expand Down Expand Up @@ -334,7 +334,7 @@ private boolean isPrimary(String name, Scope scope) {
* @throws AssertionError if the application context did not start
*/
@CheckReturnValue
public AbstractObjectAssert<?, Object> getBean(String name) {
public AbstractObjectAssert<?, @Nullable Object> getBean(String name) {
if (this.startupFailure != null) {
throwAssertionError(
contextFailedToStartWhenExpecting(this.startupFailure, "to contain a bean of name:%n <%s>", name));
Expand Down Expand Up @@ -362,7 +362,7 @@ public AbstractObjectAssert<?, Object> getBean(String name) {
*/
@SuppressWarnings("unchecked")
@CheckReturnValue
public <T> AbstractObjectAssert<?, T> getBean(String name, Class<T> type) {
public <T> AbstractObjectAssert<?, @Nullable T> getBean(String name, Class<T> type) {
if (this.startupFailure != null) {
throwAssertionError(contextFailedToStartWhenExpecting(this.startupFailure,
"to contain a bean of name:%n <%s> (%s)", name, type));
Expand Down
1 change: 1 addition & 0 deletions ...ngframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ public ConfigurationPropertyCaching getCaching() {
return getCache().getSystemEnvironmentProperty(name);
}

@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1578

@koppor koppor Jun 13, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will be obsolete as soon as uber/NullAway#1597 is part of a release.

@msridhar msridhar Jun 13, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we'll try to get that out in a release soon; may be best to wait for it.

@Override
public Stream<ConfigurationPropertyName> stream() {
@Nullable ConfigurationPropertyName[] names = getConfigurationPropertyNames();
Expand Down
Loading