diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-07-16 10:36:47 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-07-16 10:36:47 +0200 |
commit | b84296789da52b427d09d000836e4a846da0ac53 (patch) | |
tree | 32d7ec1d257b691bcaa5a3d2af7b90955d9d5fc7 | |
parent | 236c15593258ec5e0d495332edc64468df269fc4 (diff) |
Be more specific when verifying application dir
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java | 13 |
1 files changed, 9 insertions, 4 deletions
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 81fbc764bb6..eee05fdcc4e 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 @@ -56,6 +56,7 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.logging.Level; @@ -211,8 +212,12 @@ public class FilesApplicationPackage implements ApplicationPackage { } private void verifyAppDir(File appDir) { - if (appDir==null || !appDir.isDirectory()) { - throw new IllegalArgumentException("Path '" + appDir + "' is not a directory."); + Objects.requireNonNull(appDir, "Path cannot be null"); + if ( ! appDir.exists()) { + throw new IllegalArgumentException("Path '" + appDir + "' does not exist"); + } + if ( ! appDir.isDirectory()) { + throw new IllegalArgumentException("Path '" + appDir + "' is not a directory"); } if (! appDir.canRead()){ throw new IllegalArgumentException("Cannot read from application directory '" + appDir + "'"); @@ -308,7 +313,7 @@ public class FilesApplicationPackage implements ApplicationPackage { ret.add(new NamedReader(f.getName(), new FileReader(f))); } } catch (Exception e) { - throw new IllegalArgumentException("Couldn't get search definition contents.", e); + throw new IllegalArgumentException("Couldn't get schema contents.", e); } return ret; } @@ -518,7 +523,7 @@ public class FilesApplicationPackage implements ApplicationPackage { return bundle; } - } // class Component + } /** * Reads a ranking expression from file to a string and returns it. |