Use the same repo for all builtin config definitions in ServerCache

Avoid creating many instances of identical data for builtin config
definitions. Also put user config definitions in a repo, the same
way the builtin config definitions are.

1 files changed, 8 insertions, 3 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionRepo.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionRepo.java
index b3f0f578e22..d2b8dc75d22 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionRepo.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionRepo.java
@@ -7,10 +7,9 @@ import com.yahoo.vespa.config.buildergen.ConfigDefinition;
 import java.util.Map;
 
 /**
- * Represents a repository of config definitions.
+ * A config definition repository.
  *
- * @author lulf
- * @since 5.10
+ * @author Ulf Lillengen
  */
 public interface ConfigDefinitionRepo {
 
@@ -19,4 +18,10 @@ public interface ConfigDefinitionRepo {
      */
     Map<ConfigDefinitionKey, ConfigDefinition> getConfigDefinitions();
 
+    /**
+     * Gets a config definition from repo or null if not found
+     */
+    // TODO: Remove default implementation when 6.246 is the oldest version in use
+    default ConfigDefinition get(ConfigDefinitionKey key) { return null; }
+
 }