root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

MINOR: updated configs to use one try/catch for serdes 

removed `try/catch` from `keySerde` and `valueSerde` methods so only the `try\catch` blocks in `defaultKeySerde` and `defaultValueSerde` perform error handling resulting in correct error message.

Author: Bill Bejeck <bill@confluent.io>

Reviewers: Matthias J. Sax <matthias@confluent.io>, Guozhang Wang <wangguoz@gmail.com>

Closes #3568 from bbejeck/MINOR_ensure_correct_error_messages_for_configs
This commit is contained in:
Bill Bejeck 2017-07-26 12:58:33 -07:00 committed by Guozhang Wang
parent f4d1305bfe
commit f8498ec9e2
2 changed files with 63 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
View File

@ -746,11 +746,7 @@ public class StreamsConfig extends AbstractConfig {
*/
@Deprecated
public Serde keySerde() {
try {
return defaultKeySerde();
} catch (final Exception e) {
throw new StreamsException(String.format("Failed to configure key serde %s", get(KEY_SERDE_CLASS_CONFIG)), e);
}
return defaultKeySerde();
}
/**
@ -760,16 +756,18 @@ public class StreamsConfig extends AbstractConfig {
* @return an configured instance of key Serde class
*/
public Serde defaultKeySerde() {
Object keySerdeConfigSetting = get(KEY_SERDE_CLASS_CONFIG);
try {
Serde<?> serde = getConfiguredInstance(KEY_SERDE_CLASS_CONFIG, Serde.class);
if (serde == null) {
keySerdeConfigSetting = get(DEFAULT_KEY_SERDE_CLASS_CONFIG);
serde = getConfiguredInstance(DEFAULT_KEY_SERDE_CLASS_CONFIG, Serde.class);
}
serde.configure(originals(), true);
return serde;
} catch (final Exception e) {
throw new StreamsException(
String.format("Failed to configure key serde %s", get(DEFAULT_KEY_SERDE_CLASS_CONFIG)), e);
String.format("Failed to configure key serde %s", keySerdeConfigSetting), e);
}
}
@ -781,11 +779,7 @@ public class StreamsConfig extends AbstractConfig {
*/
@Deprecated
public Serde valueSerde() {
try {
return defaultValueSerde();
} catch (final Exception e) {
throw new StreamsException(String.format("Failed to configure value serde %s", get(VALUE_SERDE_CLASS_CONFIG)), e);
}
return defaultValueSerde();
}
/**
@ -795,9 +789,11 @@ public class StreamsConfig extends AbstractConfig {
* @return an configured instance of value Serde class
*/
public Serde defaultValueSerde() {
Object valueSerdeConfigSetting = get(VALUE_SERDE_CLASS_CONFIG);
try {
Serde<?> serde = getConfiguredInstance(VALUE_SERDE_CLASS_CONFIG, Serde.class);
if (serde == null) {
valueSerdeConfigSetting = get(DEFAULT_VALUE_SERDE_CLASS_CONFIG);
serde = getConfiguredInstance(DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serde.class);
}
serde.configure(originals(), false);
@ -805,7 +801,7 @@ public class StreamsConfig extends AbstractConfig {
return serde;
} catch (final Exception e) {
throw new StreamsException(
String.format("Failed to configure value serde %s", get(DEFAULT_VALUE_SERDE_CLASS_CONFIG)), e);
String.format("Failed to configure value serde %s", valueSerdeConfigSetting), e);
}
}

55
streams/src/test/java/org/apache/kafka/streams/StreamsConfigTest.java
View File

@ -50,6 +50,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class StreamsConfigTest {
@ -428,6 +429,60 @@ public class StreamsConfigTest {
assertTrue(config.defaultTimestampExtractor() instanceof FailOnInvalidTimestamp);
}
@Test
public void shouldSpecifyCorrectKeySerdeClassOnErrorUsingDeprecatedConfigs() {
final Properties props = minimalStreamsConfig();
props.put(StreamsConfig.KEY_SERDE_CLASS_CONFIG, MisconfiguredSerde.class);
final StreamsConfig config = new StreamsConfig(props);
try {
config.keySerde();
fail("Test should throw a StreamsException");
} catch (StreamsException e) {
assertEquals("Failed to configure key serde class org.apache.kafka.streams.StreamsConfigTest$MisconfiguredSerde", e.getMessage());
}
}
@Test
public void shouldSpecifyCorrectKeySerdeClassOnError() {
final Properties props = minimalStreamsConfig();
props.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, MisconfiguredSerde.class);
final StreamsConfig config = new StreamsConfig(props);
try {
config.keySerde();
fail("Test should throw a StreamsException");
} catch (StreamsException e) {
assertEquals("Failed to configure key serde class org.apache.kafka.streams.StreamsConfigTest$MisconfiguredSerde", e.getMessage());
}
}
@Test
public void shouldSpecifyCorrectValueSerdeClassOnErrorUsingDeprecatedConfigs() {
final Properties props = minimalStreamsConfig();
props.put(StreamsConfig.VALUE_SERDE_CLASS_CONFIG, MisconfiguredSerde.class);
final StreamsConfig config = new StreamsConfig(props);
try {
config.valueSerde();
fail("Test should throw a StreamsException");
} catch (StreamsException e) {
assertEquals("Failed to configure value serde class org.apache.kafka.streams.StreamsConfigTest$MisconfiguredSerde", e.getMessage());
}
}
@Test
public void shouldSpecifyCorrectValueSerdeClassOnError() {
final Properties props = minimalStreamsConfig();
props.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, MisconfiguredSerde.class);
final StreamsConfig config = new StreamsConfig(props);
try {
config.valueSerde();
fail("Test should throw a StreamsException");
} catch (StreamsException e) {
assertEquals("Failed to configure value serde class org.apache.kafka.streams.StreamsConfigTest$MisconfiguredSerde", e.getMessage());
}
}
static class MisconfiguredSerde implements Serde {
@Override
public void configure(final Map configs, final boolean isKey) {