Sonar: Fix Nullable on Possibly null Parameters

spring-projects · Jan 29, 2021 · 10cb5e4 · 10cb5e4
1 parent 9dbd0e5
commit 10cb5e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/DefaultKafkaConsumerFactory.java b/spring-kafka/src/main/java/org/springframework/kafka/core/DefaultKafkaConsumerFactory.java
@@ -254,11 +254,15 @@ public Consumer<K, V> createConsumer(@Nullable String groupId, @Nullable String
 		return createKafkaConsumer(groupId, clientIdPrefix, clientIdSuffixArg, properties);
 	}
 
-	protected Consumer<K, V> createKafkaConsumer(@Nullable String groupId, @Nullable String clientIdPrefix,
+	protected Consumer<K, V> createKafkaConsumer(@Nullable String groupId, @Nullable String clientIdPrefixArg,
 			@Nullable String clientIdSuffixArg, @Nullable Properties properties) {
 
 		boolean overrideClientIdPrefix = StringUtils.hasText(clientIdPrefix);
+		String clientIdPrefix = clientIdPrefixArg;
 		String clientIdSuffix = clientIdSuffixArg;
+		if (clientIdPrefix == null) {
+			clientIdPrefix = "";
+		}
 		if (clientIdSuffix == null) {
 			clientIdSuffix = "";
 		}
@@ -275,8 +279,8 @@ protected Consumer<K, V> createKafkaConsumer(@Nullable String groupId, @Nullable
 		}
 	}
 
-	private Consumer<K, V> createConsumerWithAdjustedProperties(String groupId, String clientIdPrefix,
-			Properties properties, boolean overrideClientIdPrefix, String clientIdSuffix,
+	private Consumer<K, V> createConsumerWithAdjustedProperties(@Nullable String groupId, String clientIdPrefix,
+			@Nullable Properties properties, boolean overrideClientIdPrefix, String clientIdSuffix,
 			boolean shouldModifyClientId) {
 
 		Map<String, Object> modifiedConfigs = new HashMap<>(this.configs);

diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaTemplate.java b/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaTemplate.java
@@ -582,7 +582,7 @@ protected ListenableFuture<SendResult<K, V>> doSend(final ProducerRecord<K, V> p
 	}
 
 	private Callback buildCallback(final ProducerRecord<K, V> producerRecord, final Producer<K, V> producer,
-			final SettableListenableFuture<SendResult<K, V>> future, Object sample) {
+			final SettableListenableFuture<SendResult<K, V>> future, @Nullable Object sample) {
 
 		return (metadata, exception) -> {
 			try {