Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ public <T> T getDefObjVal() {
// Key used to identify default value in configuration map
public static final String DEFAULT_KEY = "_default_";

public static final String NO_THROW_ON_UNKNOWN_CONFIG = "no_throw_on_unknown_config";
public static final String IGNORE_UNKNOWN_CONFIG_KEY = "ignore_unknown_config_key";

public static String serverSetting(String key) {
return SERVER_SETTING_PREFIX + key;
Expand Down Expand Up @@ -363,10 +363,10 @@ public static Map<String, Object> parseConfigMap(Map<String, String> configMap)
}
}

tmpMap.remove(ClientConfigProperties.NO_THROW_ON_UNKNOWN_CONFIG);
tmpMap.remove(ClientConfigProperties.IGNORE_UNKNOWN_CONFIG_KEY);
if (!tmpMap.isEmpty()) {
String msg = "Unknown and unmapped config properties: " + tmpMap.keySet();
if (configMap.containsKey(NO_THROW_ON_UNKNOWN_CONFIG)) {
if (Boolean.parseBoolean(String.valueOf(configMap.get(IGNORE_UNKNOWN_CONFIG_KEY)))) {
LOG.warn(msg);
} else {
throw new ClientMisconfigurationException(msg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ public void testUnknownClientSettings() throws Exception {
Assert.assertTrue(ex.getMessage().contains("unknown_setting"));
}

try (Client client = newClient().setOption(ClientConfigProperties.NO_THROW_ON_UNKNOWN_CONFIG, "what ever").setOption("unknown_setting", "value").build()) {
try (Client client = newClient().setOption(ClientConfigProperties.IGNORE_UNKNOWN_CONFIG_KEY, "true").setOption("unknown_setting", "value").build()) {
Assert.assertTrue(client.ping());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,6 @@ public void testUnknownSettings() throws Exception {
}

// next should not throw exception
driver.connect(getEndpointString() + "?unknown_setting=1&" + ClientConfigProperties.NO_THROW_ON_UNKNOWN_CONFIG + "=1", new Properties()).close();
driver.connect(getEndpointString() + "?unknown_setting=1&" + ClientConfigProperties.IGNORE_UNKNOWN_CONFIG_KEY + "=true", new Properties()).close();
}
}