GC some unused methods and simplify

4 files changed, 35 insertions, 50 deletions

diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java
index 2b7aa5ab6e1..ca8f9c17066 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java
@@ -13,22 +13,14 @@ import java.io.File;
  */
 public class AppSubDirs {
 
-    final Tuple2<File, String> root;
-    public final Tuple2<File, String> rules;
-    final Tuple2<File, String> searchchains;
-    final Tuple2<File, String> docprocchains;
-    final Tuple2<File, String> routingtables;
-    final Tuple2<File, String> configDefs;
-    final Tuple2<File, String> searchdefinitions;
+    private final Tuple2<File, String> root;
+    private final Tuple2<File, String> routingtables;
+    private final Tuple2<File, String> configDefs;
 
     public AppSubDirs(File root) {
         this.root = new Tuple2<>(root, root.getName());
-        rules = createTuple(ApplicationPackage.RULES_DIR.getRelative());
-        searchchains = createTuple(ApplicationPackage.SEARCHCHAINS_DIR);
-        docprocchains = createTuple(ApplicationPackage.DOCPROCCHAINS_DIR);
         routingtables = createTuple(ApplicationPackage.ROUTINGTABLES_DIR);
         configDefs = createTuple(ApplicationPackage.CONFIG_DEFINITIONS_DIR);
-        searchdefinitions = createTuple(ApplicationPackage.SEARCH_DEFINITIONS_DIR.getRelative());
     }
 
     private Tuple2<File, String> createTuple(String name) {
@@ -43,23 +35,11 @@ public class AppSubDirs {
         return root.first;
     }
 
-    public File rules() {
-        return rules.first;
-    }
-
-    public File searchchains() {
-        return searchchains.first;
-    }
-
-    public File docprocchains() {
-        return docprocchains.first;
-    }
-
     public File configDefs() {
         return configDefs.first;
     }
-
-    @Deprecated // Remove after March 2020
-    public File searchdefinitions() { return searchdefinitions.first; }
+    public Tuple2<File, String> routingTables() {
+        return routingtables;
+    }
 
 }
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 b0c4f74f9f6..79a8c6ea16c 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
@@ -40,7 +40,7 @@ public class ApplicationPackageXmlFilesValidator {
         validateOptional(validators.hostsXmlValidator(), FilesApplicationPackage.HOSTS);
         validateOptional(validators.deploymentXmlValidator(), FilesApplicationPackage.DEPLOYMENT_FILE.getName());
         validateOptional(validators.validationOverridesXmlValidator(), FilesApplicationPackage.VALIDATION_OVERRIDES.getName());
-        validateRouting(appDirs.routingtables);
+        validateRouting(appDirs.routingTables());
     }
 
     // For testing
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 da5bff984db..db875f669fe 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
@@ -148,14 +148,13 @@ public class FilesApplicationPackage implements ApplicationPackage {
      * @param metaData metadata for this application package
      * @param includeSourceFiles include files from source dirs
      */
-    @SuppressWarnings("deprecation")
     private FilesApplicationPackage(File appDir, File preprocessedDir, ApplicationMetaData metaData, boolean includeSourceFiles) {
         verifyAppDir(appDir);
         this.includeSourceFiles = includeSourceFiles;
         this.appDir = appDir;
         this.preprocessedDir = preprocessedDir;
         appSubDirs = new AppSubDirs(appDir);
-        configDefsDir = new File(appDir, ApplicationPackage.CONFIG_DEFINITIONS_DIR);
+        configDefsDir = new File(appDir, CONFIG_DEFINITIONS_DIR);
         addUserIncludeDirs();
         this.metaData = metaData;
         transformerFactory = TransformerFactory.newInstance();
@@ -236,9 +235,8 @@ public class FilesApplicationPackage implements ApplicationPackage {
         return getHostsFile().getPath();
     }
 
-    @SuppressWarnings("deprecation")
     private File getHostsFile() {
-        return new File(appDir, ApplicationPackage.HOSTS);
+        return new File(appDir, HOSTS);
     }
 
     @Override
@@ -246,9 +244,8 @@ public class FilesApplicationPackage implements ApplicationPackage {
         return getServicesFile().getPath();
     }
 
-    @SuppressWarnings("deprecation")
     private File getServicesFile() {
-        return new File(appDir, ApplicationPackage.SERVICES);
+        return new File(appDir, SERVICES);
     }
 
     @Override
@@ -338,7 +335,7 @@ public class FilesApplicationPackage implements ApplicationPackage {
             addAllDefsFromConfigDir(defs, new File("src/main/resources/configdefinitions"));
             addAllDefsFromConfigDir(defs, new File("src/test/resources/configdefinitions"));
         }
-        addAllDefsFromBundles(defs, FilesApplicationPackage.getComponents(appDir));
+        addAllDefsFromBundles(defs, getComponents(appDir));
         return defs;
     }
 
@@ -427,13 +424,13 @@ public class FilesApplicationPackage implements ApplicationPackage {
     static List<File> getSearchDefinitionFiles(File appDir) {
         List<File> schemaFiles = new ArrayList<>();
 
-        File sdDir = new File(appDir, ApplicationPackage.SEARCH_DEFINITIONS_DIR.getRelative());
+        File sdDir = new File(appDir, SEARCH_DEFINITIONS_DIR.getRelative());
         if (sdDir.isDirectory())
-            schemaFiles.addAll(Arrays.asList(sdDir.listFiles((dir, name) -> name.matches(".*\\" + ApplicationPackage.SD_NAME_SUFFIX))));
+            schemaFiles.addAll(Arrays.asList(sdDir.listFiles((dir, name) -> name.matches(".*\\" + SD_NAME_SUFFIX))));
 
-        sdDir = new File(appDir, ApplicationPackage.SCHEMAS_DIR.getRelative());
+        sdDir = new File(appDir, SCHEMAS_DIR.getRelative());
         if (sdDir.isDirectory())
-            schemaFiles.addAll(Arrays.asList(sdDir.listFiles((dir, name) -> name.matches(".*\\" + ApplicationPackage.SD_NAME_SUFFIX))));
+            schemaFiles.addAll(Arrays.asList(sdDir.listFiles((dir, name) -> name.matches(".*\\" + SD_NAME_SUFFIX))));
 
         return schemaFiles;
     }
@@ -445,16 +442,16 @@ public class FilesApplicationPackage implements ApplicationPackage {
     // Only for use by deploy processor
     public static List<Component> getComponents(File appDir) {
         List<Component> components = new ArrayList<>();
-        for (Bundle bundle : Bundle.getBundles(new File(appDir, ApplicationPackage.COMPONENT_DIR))) {
-            components.add(new Component(bundle, new ComponentInfo(new File(ApplicationPackage.COMPONENT_DIR, bundle.getFile().getName()).getPath())));
+        for (Bundle bundle : Bundle.getBundles(new File(appDir, COMPONENT_DIR))) {
+            components.add(new Component(bundle, new ComponentInfo(new File(COMPONENT_DIR, bundle.getFile().getName()).getPath())));
         }
         return components;
     }
 
     private static List<ComponentInfo> getComponentsInfo(File appDir) {
         List<ComponentInfo> components = new ArrayList<>();
-        for (Bundle bundle : Bundle.getBundles(new File(appDir, ApplicationPackage.COMPONENT_DIR))) {
-            components.add(new ComponentInfo(new File(ApplicationPackage.COMPONENT_DIR, bundle.getFile().getName()).getPath()));
+        for (Bundle bundle : Bundle.getBundles(new File(appDir, COMPONENT_DIR))) {
+            components.add(new ComponentInfo(new File(COMPONENT_DIR, bundle.getFile().getName()).getPath()));
         }
         return components;
     }
@@ -545,10 +542,10 @@ public class FilesApplicationPackage implements ApplicationPackage {
         if (new File(name).isAbsolute())
             throw new IllegalArgumentException("Absolute path to ranking expression file is not allowed: " + name);
 
-        File sdDir = new File(appDir, ApplicationPackage.SCHEMAS_DIR.getRelative());
+        File sdDir = new File(appDir, SCHEMAS_DIR.getRelative());
         File expressionFile = new File(sdDir, name);
         if ( ! expressionFile.exists()) {
-            sdDir = new File(appDir, ApplicationPackage.SEARCH_DEFINITIONS_DIR.getRelative());
+            sdDir = new File(appDir, SEARCH_DEFINITIONS_DIR.getRelative());
             expressionFile = new File(sdDir, name);
         }
         return expressionFile;
@@ -611,7 +608,7 @@ public class FilesApplicationPackage implements ApplicationPackage {
         File servicesFile = validateServicesFile();
         preprocessXML(new File(preprocessedDir, SERVICES), servicesFile, zone);
         preprocessXML(new File(preprocessedDir, HOSTS), getHostsFile(), zone);
-        FilesApplicationPackage preprocessed = FilesApplicationPackage.fromFile(preprocessedDir, includeSourceFiles);
+        FilesApplicationPackage preprocessed = fromFile(preprocessedDir, includeSourceFiles);
         preprocessed.copyUserDefsIntoApplication();
         return preprocessed;
     }
@@ -629,7 +626,7 @@ public class FilesApplicationPackage implements ApplicationPackage {
         ConfigDefinitionDir defDir = new ConfigDefinitionDir(destination);
         // Copy the user's def files from components.
         List<Bundle> bundlesAdded = new ArrayList<>();
-        for (FilesApplicationPackage.Component component : FilesApplicationPackage.getComponents(appSubDirs.root())) {
+        for (Component component : getComponents(appSubDirs.root())) {
             Bundle bundle = component.getBundle();
             defDir.addConfigDefinitionsFromBundle(bundle, bundlesAdded);
             bundlesAdded.add(bundle);
@@ -645,7 +642,7 @@ public class FilesApplicationPackage implements ApplicationPackage {
         MessageDigest md5;
         try {
             md5 = MessageDigest.getInstance("MD5");
-            for (File file : appDir.listFiles((dir, name) -> !name.equals(ApplicationPackage.EXT_DIR) && !name.startsWith("."))) {
+            for (File file : appDir.listFiles((dir, name) -> !name.equals(EXT_DIR) && !name.startsWith("."))) {
                 addPathToDigest(file, "", md5, true, false);
             }
             return toLowerCase(HexDump.toHexString(md5.digest()));
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java
index 6888626633b..e779d59ba24 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java
@@ -7,7 +7,11 @@ import com.yahoo.config.application.api.FileRegistry;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 /**
@@ -50,7 +54,7 @@ public class PreGeneratedFileRegistry implements FileRegistry {
     }
 
     public static String exportRegistry(FileRegistry registry) {
-        List<FileRegistry.Entry> entries = registry.export();
+        List<Entry> entries = registry.export();
         StringBuilder builder = new StringBuilder();
 
         builder.append(registry.fileSourceHost()).append('\n');
@@ -66,7 +70,11 @@ public class PreGeneratedFileRegistry implements FileRegistry {
     }
 
     public FileReference addFile(String relativePath) {
-        return new FileReference(path2Hash.get(relativePath));
+        String reference = path2Hash.get(relativePath);
+        if (reference == null) {
+            throw new IllegalArgumentException("File '" + relativePath + "' not found");
+        }
+        return new FileReference(reference);
     }
 
     @Override