summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2017-02-26 22:15:20 +0100
committerHarald Musum <musum@yahoo-inc.com>2017-02-26 22:15:20 +0100
commitf3f181604da1d730ad0d1a3e0146b7b1d9a19c1b (patch)
tree4fc3a17d945b8ddcdcfe811f8e7d9fb53febdb1b /config-model-api
parentfb22b3ff47144013a977039b0adb5e73e4591f0b (diff)
Stop using 3-arg getConfig method (will be removed)
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/Model.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
index 90ea7b5f15c..2b75343e505 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
@@ -26,14 +26,15 @@ public interface Model {
* @param targetDef The config definition to use for applying defaults.
* @return override The global override to apply to the generated config.
*/
- // TODO: Remove when 6.70 is deployed everywhere
+ // TODO: Remove when 6.76 is deployed everywhere
ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef, ConfigPayload override);
+
/**
- * Resolves a config using a given def file, apply overrides and returns it.
+ * Resolves config for a given key and config definition
*
- * @param configKey The key of the config to retrieve.
- * @param targetDef The config definition to use for applying defaults.
+ * @param configKey The key to resolve
+ * @param targetDef The config definition to use for the schema
*/
ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef);