From 7417bd0ac1edce224c321005af39cacc100618a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Thu, 26 Dec 2024 16:29:27 +0100 Subject: [PATCH] Refine null-safety in the spring-r2dbc module Closes gh-34160 --- .../connection/lookup/AbstractRoutingConnectionFactory.java | 3 +-- .../org/springframework/r2dbc/core/MapBindParameterSource.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/lookup/AbstractRoutingConnectionFactory.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/lookup/AbstractRoutingConnectionFactory.java index c219d5fdb82..21af276a584 100644 --- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/lookup/AbstractRoutingConnectionFactory.java +++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/lookup/AbstractRoutingConnectionFactory.java @@ -138,7 +138,6 @@ public abstract class AbstractRoutingConnectionFactory implements ConnectionFact * @see #setTargetConnectionFactories(Map) * @see #setDefaultTargetConnectionFactory(Object) */ - @SuppressWarnings("NullAway") public void initialize() { Assert.notNull(this.targetConnectionFactories, "Property 'targetConnectionFactories' must not be null"); @@ -217,7 +216,7 @@ public abstract class AbstractRoutingConnectionFactory implements ConnectionFact * per {@link #determineCurrentLookupKey()} * @see #determineCurrentLookupKey() */ - @SuppressWarnings("NullAway") + @SuppressWarnings("NullAway") // Lambda protected Mono determineTargetConnectionFactory() { Assert.state(this.resolvedConnectionFactories != null, "ConnectionFactory router not initialized"); diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/MapBindParameterSource.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/MapBindParameterSource.java index 826666d74b4..5c416284c0c 100644 --- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/MapBindParameterSource.java +++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/MapBindParameterSource.java @@ -75,7 +75,7 @@ class MapBindParameterSource implements BindParameterSource { } @Override - @SuppressWarnings("NullAway") + @SuppressWarnings("NullAway") // Dataflow analysis limitation public Parameter getValue(String paramName) throws IllegalArgumentException { if (!hasValue(paramName)) { throw new IllegalArgumentException("No value registered for key '" + paramName + "'");