diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-06-07 10:27:41 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-06-07 10:27:41 +0200 |
commit | 7b25c2023eec1b3db30847461123e40ffea88263 (patch) | |
tree | 4556ea8fe335484899810da6e2074b8d98f35b37 /config-application-package/src/main/java/com/yahoo | |
parent | 17fb234d24b33692d6a7a3dd7bdcb54376db4256 (diff) |
Move methods and do not hardcode
Diffstat (limited to 'config-application-package/src/main/java/com/yahoo')
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/application/Xml.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java index c48a41083c7..f2a837026ea 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/Xml.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/Xml.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.application; import com.yahoo.config.application.api.ApplicationPackage; @@ -75,10 +75,6 @@ public class Xml { return factory.newDocumentBuilder(); } - static File getServices(File app) { - return new File(app, "services.xml"); // TODO Do not hard-code - } - static Document copyDocument(Document input) throws TransformerException { Transformer transformer = TransformerFactory.newInstance().newTransformer(); DOMSource source = new DOMSource(input); @@ -142,9 +138,7 @@ public class Xml { List<Element> children = XML.getChildren(parent, name); List<Element> allFromFiles = allElemsFromPath(app, pathFromAppRoot); for (Element fromFile : allFromFiles) { - for (Element inThatFile : XML.getChildren(fromFile, name)) { - children.add(inThatFile); - } + children.addAll(XML.getChildren(fromFile, name)); } return children; } |