From 046dac504b19012a099b40ed40e95e2c8aaa6ac2 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Thu, 3 Sep 2020 13:57:51 +0200 Subject: Wrap xml files in a file(system)wrapper in preprocessing --- .../main/java/com/yahoo/config/application/XmlPreProcessor.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java') diff --git a/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java index c49a799f2b7..61b67dfb5c6 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. 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.FileSystemWrapper.FileWrapper; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.RegionName; @@ -31,7 +32,7 @@ public class XmlPreProcessor { final static String preprocessNamespace = "xmlns:preprocess"; final static String preprocessNamespaceUri = "properties"; //TODO - private final File applicationDir; + private final FileWrapper applicationDir; private final Reader xmlInput; private final InstanceName instance; private final Environment environment; @@ -43,6 +44,10 @@ public class XmlPreProcessor { } public XmlPreProcessor(File applicationDir, Reader xmlInput, InstanceName instance, Environment environment, RegionName region) { + this(FileSystemWrapper.getDefault().wrap(applicationDir.toPath()), xmlInput, instance, environment, region); + } + + public XmlPreProcessor(FileWrapper applicationDir, Reader xmlInput, InstanceName instance, Environment environment, RegionName region) { this.applicationDir = applicationDir; this.xmlInput = xmlInput; this.instance = instance; -- cgit v1.2.3