Remove unused methods

2 files changed, 2 insertions, 28 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 26c57483a5c..201c18527bb 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
@@ -3,7 +3,6 @@ package com.yahoo.config.model.application.provider;
 
 import com.yahoo.collections.Tuple2;
 import com.yahoo.config.application.api.ApplicationPackage;
-import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.provision.Version;
 import com.yahoo.path.Path;
 import com.yahoo.io.reader.NamedReader;
@@ -24,12 +23,7 @@ public class ApplicationPackageXmlFilesValidator {
     private final AppSubDirs appDirs;
     private final Optional<Version> vespaVersion;
 
-    private static final FilenameFilter xmlFilter = new FilenameFilter() {
-        @Override
-        public boolean accept(File dir, String name) {
-            return name.endsWith(".xml");
-        }
-    };
+    private static final FilenameFilter xmlFilter = (dir, name) -> name.endsWith(".xml");
 
 
     public ApplicationPackageXmlFilesValidator(AppSubDirs appDirs, Optional<Version> vespaVersion) {
@@ -37,18 +31,12 @@ public class ApplicationPackageXmlFilesValidator {
         this.vespaVersion = 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 createDefaultXMLValidator(File appDir, Optional<Version> vespaVersion) {
         return new ApplicationPackageXmlFilesValidator(new AppSubDirs(appDir), vespaVersion);
     }
 
     public static ApplicationPackageXmlFilesValidator createTestXmlValidator(File appDir) {
-        return new ApplicationPackageXmlFilesValidator(new AppSubDirs(appDir), Optional.<Version>empty());
+        return new ApplicationPackageXmlFilesValidator(new AppSubDirs(appDir), Optional.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 002c31d5910..06e74e08307 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
@@ -628,12 +628,6 @@ public class FilesApplicationPackage implements ApplicationPackage {
         validateXML(Optional.empty());
     }
 
-    // TODO: Remove when no version older than 6.33 is used
-    @Override
-    public void validateXML(DeployLogger logger) throws IOException {
-        validateXML(Optional.empty());
-    }
-
     @Override
     public void validateXML(Optional<Version> vespaVersion) throws IOException {
         ApplicationPackageXmlFilesValidator xmlFilesValidator = ApplicationPackageXmlFilesValidator.createDefaultXMLValidator(appDir, vespaVersion);
@@ -641,14 +635,6 @@ public class FilesApplicationPackage implements ApplicationPackage {
         ApplicationPackageXmlFilesValidator.checkIncludedDirs(this);
     }
 
-    // TODO: Remove when no version older than 6.33 is used
-    @Override
-    public void validateXML(DeployLogger logger, Optional<Version> vespaVersion) throws IOException {
-        ApplicationPackageXmlFilesValidator xmlFilesValidator = ApplicationPackageXmlFilesValidator.createDefaultXMLValidator(appDir, vespaVersion);
-        xmlFilesValidator.checkApplication();
-        ApplicationPackageXmlFilesValidator.checkIncludedDirs(this);
-    }
-
     @Override
     public void writeMetaData() throws IOException {
         File metaFile = new File(appDir, META_FILE_NAME);