Skip to content

KAFKA-3237 - Remove test cases testInvalidDefaultRange() and testInva… #936

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

Closed
jcustenborder wants to merge 1 commit into from
Closed

KAFKA-3237 - Remove test cases testInvalidDefaultRange() and testInva… #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions clients/src/main/java/org/apache/kafka/common/config/ConfigDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
*/
public class ConfigDef {

private static final Object NO_DEFAULT_VALUE = new String("");
public static final Object NO_DEFAULT_VALUE = new String("");

private final Map<String, ConfigKey> configKeys = new HashMap<String, ConfigKey>();

Expand Down Expand Up @@ -360,7 +360,7 @@ public ConfigKey(String name, Type type, Object defaultValue, Validator validato
this.defaultValue = defaultValue;
this.validator = validator;
this.importance = importance;
if (this.validator != null)
if (this.validator != null && this.hasDefault())
this.validator.ensureValid(name, defaultValue);
this.documentation = documentation;
}
Expand Down
13 changes: 13 additions & 0 deletions clients/src/test/java/org/apache/kafka/common/config/ConfigDefTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,19 @@ public void testSslPasswords() {
assertEquals(Password.HIDDEN, vals.get(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG).toString());
}

@Test
public void testNullDefaultWithValidator() {
final String key = "enum_test";

ConfigDef def = new ConfigDef();
def.define(key, Type.STRING, ConfigDef.NO_DEFAULT_VALUE, ValidString.in("ONE", "TWO", "THREE"), Importance.HIGH, "docs");

Properties props = new Properties();
props.put(key, "ONE");
Map<String, Object> vals = def.parse(props);
assertEquals("ONE", vals.get(key));
}

private void testValidators(Type type, Validator validator, Object defaultVal, Object[] okValues, Object[] badValues) {
ConfigDef def = new ConfigDef().define("name", type, defaultVal, validator, Importance.HIGH, "docs");

Expand Down