Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INTEXT-216: KafkaProducerContext.beanName as null

Browse Source 
JIRA: https://jira.spring.io/browse/INTEXT-216

Having the default value for the `NamedComponent` contract (`beanName`)
 doesn't allow us to override (generate) the unique bean name for the component.

 Clean up `KafkaProducerContext.beanName` to `null` by default.

**Cherry-pick to 1.3.x**
This commit is contained in:
Artem Bilan
2016-01-06 11:01:04 -05:00
committed by Artem Bilan
parent d3e724d134
commit a98aba36c7
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/KafkaProducerContext.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2014 the original author or authors.
* Copyright 2013-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,13 +23,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.clients.producer.RecordMetadata;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.context.SmartLifecycle;
import org.springframework.integration.support.context.NamedComponent;
import org.springframework.messaging.Message;
import org.springframework.util.StringUtils;
/**
@@ -49,9 +47,9 @@ public class KafkaProducerContext implements SmartLifecycle, NamedComponent, Bea
private volatile Map<String, ProducerConfiguration<?, ?>> producerConfigurations;
private volatile ProducerConfiguration<?,?> theProducerConfiguration;
private volatile ProducerConfiguration<?, ?> theProducerConfiguration;
private String beanName = "not_specified";
private String beanName;
private int phase = 0;
@@ -187,18 +185,19 @@ public class KafkaProducerContext implements SmartLifecycle, NamedComponent, Bea
}
public Future<RecordMetadata> send(String topic, Object messageKey, Object messagePayload) {
return this.send(topic, null, messageKey, messagePayload);
return send(topic, null, messageKey, messagePayload);
}
public Future<RecordMetadata> send(String topic, Integer partition, Object messageKey, Object messagePayload) {
if (!running.get()) {
if (!this.running.get()) {
start();
}
// only try to look up for a producer configuration if the topic is passed as argument
// if no topic is configured, then we'll fall back to the default if a single
// producer configuration is available
ProducerConfiguration<?, ?> producerConfiguration = StringUtils.hasText(topic) ? getTopicConfiguration(topic) : null;
ProducerConfiguration<?, ?> producerConfiguration =
StringUtils.hasText(topic) ? getTopicConfiguration(topic) : null;
if (producerConfiguration != null) {
return producerConfiguration.convertAndSend(topic, partition, messageKey, messagePayload);