summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2016-09-06 10:01:35 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2016-09-06 10:01:35 +0200
commita6f30e429551d78f3e32c347c563fc02d724e968 (patch)
tree71a59fe78f652462b444db114bd6a2201eed2429 /config-model-api
parent4195e6c5fe04eef44fdfdb66e7e7cdfef8d461bc (diff)
Allow source paths to config defs
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java4
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/UnparsedConfigDefinition.java9
2 files changed, 7 insertions, 6 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
index 96f58bf140a..e2a77894f73 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
@@ -104,9 +104,7 @@ public interface ApplicationPackage {
Collection<NamedReader> searchDefinitionContents();
/**
- * Subclass hook.
- * Returns a mapping from def key to a file name that can be used for lookup.
- * @return An mapping of all config definition combos available in this package.
+ * Returns all the config definitions available in this package as unparsed data.
*/
Map<ConfigDefinitionKey, UnparsedConfigDefinition> getAllExistingConfigDefs();
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/UnparsedConfigDefinition.java b/config-model-api/src/main/java/com/yahoo/config/application/api/UnparsedConfigDefinition.java
index 5954047c564..0bf790ce8a1 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/UnparsedConfigDefinition.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/UnparsedConfigDefinition.java
@@ -4,11 +4,14 @@ package com.yahoo.config.application.api;
import com.yahoo.vespa.config.ConfigDefinition;
/**
- * Represents a config definition that has not been parsed.
+ * A config definition that has not been parsed.
+ *
* @author lulf
* @since 5.20
*/
public interface UnparsedConfigDefinition {
- public ConfigDefinition parse();
- public String getUnparsedContent();
+
+ ConfigDefinition parse();
+ String getUnparsedContent();
+
}