From 4d5cd477e8bb42c4ffe14f41bfc0a39a98a5d09e Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 17 Jan 2018 08:14:18 +0100 Subject: Prepare for removal of RuleConfigDeriver --- .../config/model/application/provider/FilesApplicationPackage.java | 5 +++++ .../model/application/provider/FilesApplicationPackageTest.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'config-application-package/src') diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index 97322fc1c55..5367bdcf13f 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -659,6 +659,11 @@ public class FilesApplicationPackage implements ApplicationPackage { @Override public ApplicationPackage preprocess(Zone zone, RuleConfigDeriver ignored, DeployLogger logger) throws IOException, TransformerException, ParserConfigurationException, SAXException { + return preprocess(zone, logger); + } + + @Override + public ApplicationPackage preprocess(Zone zone, DeployLogger logger) throws IOException, TransformerException, ParserConfigurationException, SAXException { IOUtils.recursiveDeleteDir(preprocessedDir); IOUtils.copyDirectory(appDir, preprocessedDir, -1, (dir, name) -> ! name.equals(".preprocessed") && ! name.equals(SERVICES) && diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java index 89a5769ff0c..5a052851458 100644 --- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java @@ -76,7 +76,7 @@ public class FilesApplicationPackageTest { } @Test - public void testDeploymentXmlNotAvailable() throws IOException, TransformerException, ParserConfigurationException, SAXException { + public void testDeploymentXmlNotAvailable() { File appDir = new File("src/test/resources/multienvapp"); assertFalse(new File(appDir, "deployment.xml").exists()); FilesApplicationPackage app = FilesApplicationPackage.fromFile(appDir); @@ -84,7 +84,7 @@ public class FilesApplicationPackageTest { } @Test - public void testDeploymentXml() throws IOException, TransformerException, ParserConfigurationException, SAXException { + public void testDeploymentXml() { File appDir = new File("src/test/resources/app-with-deployment"); final File deployment = new File(appDir, "deployment.xml"); assertTrue(deployment.exists()); -- cgit v1.2.3