Reduce method complexity

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java

@@ -442,19 +442,7 @@ protected void processListener(MethodKafkaListenerEndpoint<?, ?> endpoint, Kafka
 		if (StringUtils.hasText(autoStartup)) {
 			endpoint.setAutoStartup(resolveExpressionAsBoolean(autoStartup, "autoStartup"));
 		}
-		String[] propertyStrings = kafkaListener.properties();
-		if (propertyStrings.length > 0) {
-			Properties properties = new Properties();
-			for (String property : propertyStrings) {
-				try {
-					properties.load(new StringReader(resolveExpressionAsString(property, "property")));
-				}
-				catch (IOException e) {
-					this.logger.error("Failed to load property " + property + ", continuing...", e);
-				}
-			}
-			endpoint.setConsumerProperties(properties);
-		}
+		resolveKafkaProperties(endpoint, kafkaListener.properties());
 
 		KafkaListenerContainerFactory<?> factory = null;
 		String containerFactoryBeanName = resolve(kafkaListener.containerFactory());
@@ -481,6 +469,21 @@ protected void processListener(MethodKafkaListenerEndpoint<?, ?> endpoint, Kafka
 		}
 	}
 
+	private void resolveKafkaProperties(MethodKafkaListenerEndpoint<?, ?> endpoint, String[] propertyStrings) {
+		if (propertyStrings.length > 0) {
+			Properties properties = new Properties();
+			for (String property : propertyStrings) {
+				try {
+					properties.load(new StringReader(resolveExpressionAsString(property, "property")));
+				}
+				catch (IOException e) {
+					this.logger.error("Failed to load property " + property + ", continuing...", e);
+				}
+			}
+			endpoint.setConsumerProperties(properties);
+		}
+	}
+
 	private String getEndpointId(KafkaListener kafkaListener) {
 		if (StringUtils.hasText(kafkaListener.id())) {
 			return resolve(kafkaListener.id());

spring-kafka/src/main/java/org/springframework/kafka/core/DefaultKafkaConsumerFactory.java

@@ -130,26 +130,34 @@ protected KafkaConsumer<K, V> createKafkaConsumer(@Nullable String groupId, @Nul
 			return createKafkaConsumer(this.configs);
 		}
 		else {
-			Map<String, Object> modifiedConfigs = new HashMap<>(this.configs);
-			if (groupId != null) {
-				modifiedConfigs.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
-			}
-			if (shouldModifyClientId) {
-				modifiedConfigs.put(ConsumerConfig.CLIENT_ID_CONFIG,
-						(overrideClientIdPrefix ? clientIdPrefix
-								: modifiedConfigs.get(ConsumerConfig.CLIENT_ID_CONFIG)) + clientIdSuffix);
-			}
-			if (properties != null) {
-				properties.forEach((k, v) -> {
-					if (!k.equals(ConsumerConfig.CLIENT_ID_CONFIG) && !k.equals(ConsumerConfig.GROUP_ID_CONFIG)) {
-						modifiedConfigs.put((String) k, v);
-					}
-				});
-			}
-			return createKafkaConsumer(modifiedConfigs);
+			return createConsumerWithAdjustedProperties(groupId, clientIdPrefix, properties, overrideClientIdPrefix,
+					clientIdSuffix, shouldModifyClientId);
 		}
 	}
 
+	private KafkaConsumer<K, V> createConsumerWithAdjustedProperties(String groupId, String clientIdPrefix,
+			Properties properties, boolean overrideClientIdPrefix, String clientIdSuffix,
+			boolean shouldModifyClientId) {
+
+		Map<String, Object> modifiedConfigs = new HashMap<>(this.configs);
+		if (groupId != null) {
+			modifiedConfigs.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
+		}
+		if (shouldModifyClientId) {
+			modifiedConfigs.put(ConsumerConfig.CLIENT_ID_CONFIG,
+					(overrideClientIdPrefix ? clientIdPrefix
+							: modifiedConfigs.get(ConsumerConfig.CLIENT_ID_CONFIG)) + clientIdSuffix);
+		}
+		if (properties != null) {
+			properties.forEach((k, v) -> {
+				if (!k.equals(ConsumerConfig.CLIENT_ID_CONFIG) && !k.equals(ConsumerConfig.GROUP_ID_CONFIG)) {
+					modifiedConfigs.put((String) k, v);
+				}
+			});
+		}
+		return createKafkaConsumer(modifiedConfigs);
+	}
+
 	protected KafkaConsumer<K, V> createKafkaConsumer(Map<String, Object> configs) {
 		return new KafkaConsumer<>(configs, this.keyDeserializer, this.valueDeserializer);
 	}