From 34c1ec6db07d5ab9c20f98e6f466694199e1958a Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 21 Sep 2023 08:44:19 +0200 Subject: Print relative path in error message --- .../yahoo/vespa/model/filedistribution/UserConfiguredFiles.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java index 0196ffc7ce9..6d1de4bbc0a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java @@ -15,7 +15,6 @@ import com.yahoo.yolean.Exceptions; import java.io.File; import java.io.Serializable; -import java.nio.file.Files; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -142,10 +141,8 @@ public class UserConfiguredFiles implements Serializable { } File file = path.toFile(); - if (file.isDirectory()) { - if (file.listFiles() == null || file.listFiles().length == 0) - throw new IllegalArgumentException("Directory '" + path + "' is empty"); - } + if (file.isDirectory() && (file.listFiles() == null || file.listFiles().length == 0)) + throw new IllegalArgumentException("Directory '" + path.getRelative() + "' is empty"); FileReference reference = registeredFiles.get(path); if (reference == null) { @@ -153,7 +150,7 @@ public class UserConfiguredFiles implements Serializable { registeredFiles.put(path, reference); } if (reference == null) - throw new IllegalArgumentException("No such file or directory '" + path + "'"); + throw new IllegalArgumentException("No such file or directory '" + path.getRelative() + "'"); if (isModelType) { var model = ModelReference.valueOf(builder.getValue()); -- cgit v1.2.3