Skip to content

Fix a NPE using kafka emitter extension #4608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jihoonson merged 3 commits into from
Aug 8, 2017
Merged

Fix a NPE using kafka emitter extension #4608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
324e3db
Fix a NPE using kafka emitter extension
wywlds Jul 27, 2017
86aaaff
fix format
wywlds Jul 28, 2017
ea6dbd8
Add @Nullable annotation on kafkaProducerConfig
wywlds Jul 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...nsions-contrib/kafka-emitter/src/main/java/io/druid/emitter/kafka/KafkaEmitterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import org.apache.kafka.clients.producer.ProducerConfig;

import javax.annotation.Nullable;
import java.util.Map;

public class KafkaEmitterConfig
Expand All @@ -46,14 +48,14 @@ public KafkaEmitterConfig(
@JsonProperty("metric.topic") String metricTopic,
@JsonProperty("alert.topic") String alertTopic,
@JsonProperty("clusterName") String clusterName,
@JsonProperty("producer.config") Map<String, String> kafkaProducerConfig
@JsonProperty("producer.config") @Nullable Map<String, String> kafkaProducerConfig
)
{
this.bootstrapServers = Preconditions.checkNotNull(bootstrapServers, "bootstrap.servers can not be null");
this.metricTopic = Preconditions.checkNotNull(metricTopic, "metric.topic can not be null");
this.alertTopic = Preconditions.checkNotNull(alertTopic, "alert.topic can not be null");
this.clusterName = clusterName;
this.kafkaProducerConfig = kafkaProducerConfig;
this.kafkaProducerConfig = kafkaProducerConfig == null? ImmutableMap.<String,String>of() : kafkaProducerConfig;
Copy link
Copy Markdown
Member

@leventov leventov Jul 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please annotate kafkaProducerConfig parameter as @Nullable

Copy link
Copy Markdown
Contributor Author

@wywlds wywlds Jul 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@leventov Thank you for the review, I added @Nullable in the latest commit.

}

@JsonProperty
Expand Down Expand Up @@ -110,9 +112,7 @@ public boolean equals(Object o)
if (getClusterName() != null ? !getClusterName().equals(that.getClusterName()) : that.getClusterName() != null) {
return false;
}
return getKafkaProducerConfig() != null
? getKafkaProducerConfig().equals(that.getKafkaProducerConfig())
: that.getKafkaProducerConfig() == null;
return getKafkaProducerConfig().equals(that.getKafkaProducerConfig());
}

@Override
Expand All @@ -122,7 +122,7 @@ public int hashCode()
result = 31 * result + getMetricTopic().hashCode();
result = 31 * result + getAlertTopic().hashCode();
result = 31 * result + (getClusterName() != null ? getClusterName().hashCode() : 0);
result = 31 * result + (getKafkaProducerConfig() != null ? getKafkaProducerConfig().hashCode() : 0);
result = 31 * result + getKafkaProducerConfig().hashCode();
return result;
}

Expand Down
15 changes: 15 additions & 0 deletions ...ns-contrib/kafka-emitter/src/test/java/io/druid/emitter/kafka/KafkaEmitterConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,19 @@ public void testSerDeserKafkaEmitterConfig() throws IOException
.readValue(kafkaEmitterConfigString);
Assert.assertEquals(kafkaEmitterConfigExpected, kafkaEmitterConfig);
}

@Test
public void testSerDeNotRequiredKafkaProducerConfig() throws IOException
{
KafkaEmitterConfig kafkaEmitterConfig = new KafkaEmitterConfig("localhost:9092", "metricTest",
"alertTest", "clusterNameTest",
null
);
try {
KafkaEmitter emitter = new KafkaEmitter(kafkaEmitterConfig, mapper);
}
catch (NullPointerException e) {
Assert.fail();
}
}
}