diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-11-02 11:27:15 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-11-02 11:27:15 +0100 |
commit | 55d850c843bb22f9e33933382edbfca63a9406b2 (patch) | |
tree | 4e57427a7b71e9653bdb3986dae5fa0569cc780c /config-application-package | |
parent | a20ea689f5dc24025485050eee34994e5698b7cb (diff) |
Extract method
Diffstat (limited to 'config-application-package')
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java | 23 |
1 files changed, 12 insertions, 11 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 6f4d782a5b4..35584bf9608 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 @@ -218,20 +218,21 @@ class OverrideProcessor implements PreProcessor { private void doElementSpecificProcessingOnOverride(List<Element> elements) { // if node capacity is specified explicitly for some combination we should require that capacity elements.forEach(element -> { - if (element.getTagName().equals("nodes")) { - boolean hasNodeChild = false; - for (var child : XML.getChildren(element)) { - if (child.getTagName().equals("node")) { - hasNodeChild = true; - break; - } - } - if (!hasNodeChild) // specifies capacity, not a list of nodes + if (element.getTagName().equals("nodes")) + if (!hasChildWithTagName(element, "node")) // 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. */ |