summaryrefslogtreecommitdiffstats
path: root/config-application-package/src/main/java/com/yahoo/config/application
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon.hallingstad@gmail.com>2020-11-02 18:48:30 +0100
committerGitHub <noreply@github.com>2020-11-02 18:48:30 +0100
commit01604cf7df04ff17c3197dafda9d9af57282bbae (patch)
tree03c3146520e45a015456b6bebd5a3fa481d681b8 /config-application-package/src/main/java/com/yahoo/config/application
parent178ed0f20f5f93fba4258ace0c4d9e7905608b53 (diff)
Revert "Add required="true" for override without node children"
Diffstat (limited to 'config-application-package/src/main/java/com/yahoo/config/application')
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java15
1 files changed, 3 insertions, 12 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
index 35584bf9608..6a946e1ce75 100644
--- a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
+++ b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
@@ -4,6 +4,7 @@ package com.yahoo.config.application;
import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.InstanceName;
import com.yahoo.config.provision.RegionName;
+import java.util.logging.Level;
import com.yahoo.text.XML;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -18,7 +19,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@@ -219,20 +219,11 @@ class OverrideProcessor implements PreProcessor {
// if node capacity is specified explicitly for some combination we should require that capacity
elements.forEach(element -> {
if (element.getTagName().equals("nodes"))
- if (!hasChildWithTagName(element, "node")) // specifies capacity, not a list of nodes
+ if (element.getChildNodes().getLength() == 0) // specifies capacity, not a list of nodes
element.setAttribute("required", "true");
});
}
-
- private static boolean hasChildWithTagName(Element element, String childName) {
- for (var child : XML.getChildren(element)) {
- if (child.getTagName().equals(childName))
- return true;
- }
-
- return false;
- }
-
+
/**
* Retains all elements where at least one element is overridden. Removes non-overridden elements from map.
*/