Remove unused 'feedback' list

3 files changed, 4 insertions, 22 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java b/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java
index d32b0c75e69..ced746bde18 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java
@@ -94,16 +94,4 @@ public class UserConfigRepo {
         return userConfigsMap.keySet();
     }
 
-    /**
-     * Will take the warning messages stored on the payload builders, and apply them to the producer's {@link DeployLogger}
-     * @param producer the producer to apply warnings to
-     */
-    public void applyWarnings(AbstractConfigProducer<?> producer) {
-        for (ConfigPayloadBuilder b : userConfigsMap.values()) {
-            for (String warning : b.warnings()) {
-                producer.deployLogger().log(LogLevel.WARNING, warning);
-            }
-        }
-    }
-    
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
index a13ad7b52c6..2f14db0ce74 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
@@ -39,16 +39,11 @@ public class UserConfigBuilder {
         ConfigDefinitionKey key = DomConfigPayloadBuilder.parseConfigName(element);
 
         Optional<ConfigDefinition> def = configDefinitionStore.getConfigDefinition(key);
-        // TODO: Fail here unless deploying with :force true
-        if ( ! def.isPresent()) {
+        if ( ! def.isPresent()) { // TODO: Fail instead of warn
             logger.log(LogLevel.WARNING, "Unable to find config definition for config '" + key +
                                          "'. Please ensure that the name is spelled correctly, and that the def file is included in a bundle.");
         }
-        List<String> issuedWarnings = new ArrayList<>();
-        ConfigPayloadBuilder payloadBuilder = new DomConfigPayloadBuilder(def.orElse(null)).build(element, issuedWarnings);
-        for (String warning : issuedWarnings)
-            logger.log(LogLevel.WARNING, warning);
-
+        ConfigPayloadBuilder payloadBuilder = new DomConfigPayloadBuilder(def.orElse(null)).build(element);
         ConfigPayloadBuilder old = builderMap.get(key);
         if (old != null) {
             logger.log(LogLevel.WARNING, "Multiple overrides for " + key + " found. Applying in the order they are discovered");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
index 7912dbefad2..7b8f1e8ff47 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
@@ -43,13 +43,12 @@ public class DomConfigPayloadBuilder {
      * Builds a {@link ConfigPayloadBuilder} representing the input 'config' xml element.
      *
      * @param configE        The 'config' xml element
-     * @param issuedWarnings a list that will be populated with issued warnings when building the config payload
      * @return a new payload builder built from xml.
      */
-    public ConfigPayloadBuilder build(Element configE, List<String> issuedWarnings) {
+    public ConfigPayloadBuilder build(Element configE) {
         parseConfigName(configE);
 
-        ConfigPayloadBuilder payloadBuilder = new ConfigPayloadBuilder(configDefinition, issuedWarnings);
+        ConfigPayloadBuilder payloadBuilder = new ConfigPayloadBuilder(configDefinition);
         for (Element child : XML.getChildren(configE)) {
             parseElement(child, payloadBuilder, null);
         }