Remove unused argument

2 files changed, 14 insertions, 20 deletions

diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java
index 393bd1c2de7..81cb1f83b6e 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java
@@ -7,12 +7,10 @@ import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.provision.Version;
 import com.yahoo.path.Path;
 import com.yahoo.io.reader.NamedReader;
-import com.yahoo.log.LogLevel;
 
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
 
@@ -24,7 +22,6 @@ import java.util.Optional;
 public class ApplicationPackageXmlFilesValidator {
 
     private final AppSubDirs appDirs;
-    private final DeployLogger logger;
     private final Optional<Version> vespaVersion;
 
     private static final FilenameFilter xmlFilter = new FilenameFilter() {
@@ -34,25 +31,24 @@ public class ApplicationPackageXmlFilesValidator {
         }
     };
 
-    public ApplicationPackageXmlFilesValidator(AppSubDirs appDirs, DeployLogger logger, Optional<Version> vespaVersion) {
+
+    public ApplicationPackageXmlFilesValidator(AppSubDirs appDirs, Optional<Version> vespaVersion) {
         this.appDirs = appDirs;
-        this.logger = logger;
         this.vespaVersion = vespaVersion;
     }
 
-    public static ApplicationPackageXmlFilesValidator createDefaultXMLValidator(File appDir, DeployLogger logger, Optional<Version> vespaVersion) {
-        return new ApplicationPackageXmlFilesValidator(new AppSubDirs(appDir), logger, vespaVersion);
+    // TODO: Remove when no version older than 6.33 is used
+    public ApplicationPackageXmlFilesValidator(AppSubDirs appDirs, DeployLogger logger, Optional<Version> vespaVersion) {
+        this.appDirs = appDirs;
+        this.vespaVersion = vespaVersion;
     }
 
-    public static ApplicationPackageXmlFilesValidator createTestXmlValidator(File appDir) {
-        return new ApplicationPackageXmlFilesValidator(new AppSubDirs(appDir), new BaseDeployLogger(), Optional.<Version>empty());
+    public static ApplicationPackageXmlFilesValidator createDefaultXMLValidator(File appDir, Optional<Version> vespaVersion) {
+        return new ApplicationPackageXmlFilesValidator(new AppSubDirs(appDir), vespaVersion);
     }
 
-    // Verify that files a and b does not coexist.
-    private void checkConflicts(String a, String b) throws IllegalArgumentException {
- 	   if (appDirs.file(a).exists() && appDirs.file(b).exists())
- 		   throw new IllegalArgumentException("Application package in " + appDirs.root() + " contains both " + a + " and " + b +
-                                              ", please use just one of them");
+    public static ApplicationPackageXmlFilesValidator createTestXmlValidator(File appDir) {
+        return new ApplicationPackageXmlFilesValidator(new AppSubDirs(appDir), Optional.<Version>empty());
     }
 
     @SuppressWarnings("deprecation")
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 3b85e617f87..1f39e2474da 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
@@ -44,10 +44,8 @@ import java.net.URL;
 import java.security.MessageDigest;
 import java.util.*;
 import java.util.jar.JarFile;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static com.yahoo.io.IOUtils.readAll;
 import static com.yahoo.text.Lowercase.toLowerCase;
 
 
@@ -626,13 +624,13 @@ public class FilesApplicationPackage implements ApplicationPackage {
     }
 
     @Override
-    public void validateXML(DeployLogger logger) throws IOException {
-        validateXML(logger, Optional.empty());
+    public void validateXML() throws IOException {
+        validateXML(Optional.empty());
     }
 
     @Override
-    public void validateXML(DeployLogger logger, Optional<Version> vespaVersion) throws IOException {
-        ApplicationPackageXmlFilesValidator xmlFilesValidator = ApplicationPackageXmlFilesValidator.createDefaultXMLValidator(appDir, logger, vespaVersion);
+    public void validateXML(Optional<Version> vespaVersion) throws IOException {
+        ApplicationPackageXmlFilesValidator xmlFilesValidator = ApplicationPackageXmlFilesValidator.createDefaultXMLValidator(appDir, vespaVersion);
         xmlFilesValidator.checkApplication();
         ApplicationPackageXmlFilesValidator.checkIncludedDirs(this);
     }