Skip to content

Commit c68d05c

Browse files
committed
gh-10083: Scope: spring-integration-cassandra
1. Replaced springframework Nullable with jsepcify Nullable. 2. Replaced springframewor NonNullApi and NonNullFields with jspecify NullMarked Signed-off-by: Anayonkar Shivalkar <[email protected]>
1 parent cbb0c6f commit c68d05c

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
22
* Provides Apache Cassandra Components support for the Java DSL.
33
*/
4-
@org.springframework.lang.NonNullApi
5-
@org.springframework.lang.NonNullFields
4+
@org.jspecify.annotations.NullMarked
65
package org.springframework.integration.cassandra.dsl;

spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandler.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
2828
import com.datastax.oss.driver.api.core.cql.Statement;
2929
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
30+
import org.jspecify.annotations.Nullable;
3031
import reactor.core.publisher.Flux;
3132
import reactor.core.publisher.Mono;
3233

@@ -50,7 +51,6 @@
5051
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
5152
import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor;
5253
import org.springframework.integration.handler.MessageProcessor;
53-
import org.springframework.lang.Nullable;
5454
import org.springframework.messaging.Message;
5555
import org.springframework.util.Assert;
5656

@@ -85,8 +85,10 @@ public class CassandraMessageHandler extends AbstractReplyProducingMessageHandle
8585
*/
8686
private WriteOptions writeOptions;
8787

88+
@SuppressWarnings("NullAway.Init")
8889
private ReactiveSessionMessageCallback sessionMessageCallback;
8990

91+
@SuppressWarnings("NullAway.Init")
9092
private EvaluationContext evaluationContext;
9193

9294
public CassandraMessageHandler(ReactiveCassandraOperations cassandraOperations) {
@@ -161,6 +163,7 @@ public void setParameterExpressions(Map<String, Expression> parameterExpressions
161163
this.parameterExpressions.putAll(parameterExpressions);
162164
}
163165

166+
@SuppressWarnings("NullAway")
164167
public void setStatementProcessor(MessageProcessor<Statement<?>> statementProcessor) {
165168
Assert.notNull(statementProcessor, "'statementProcessor' must not be null.");
166169
this.sessionMessageCallback =
@@ -191,6 +194,7 @@ protected void doInit() {
191194
}
192195

193196
@Override
197+
@SuppressWarnings("NullAway")
194198
protected Object handleRequestMessage(Message<?> requestMessage) {
195199
Object payload = requestMessage.getPayload();
196200

@@ -218,7 +222,7 @@ protected Object handleRequestMessage(Message<?> requestMessage) {
218222
}
219223
}
220224

221-
@SuppressWarnings("unchecked")
225+
@SuppressWarnings({"unchecked", "NullAway"})
222226
private Mono<? extends WriteResult> handleInsert(Object payload) {
223227
if (this.ingestQuery != null) {
224228
Assert.isInstanceOf(List.class, payload,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
22
* Provides classes supporting Cassandra outbound endpoints.
33
*/
4-
@org.springframework.lang.NonNullApi
4+
@org.jspecify.annotations.NullMarked
55
package org.springframework.integration.cassandra.outbound;

0 commit comments

Comments
 (0)