Minor: Improve error message when file missing or dir empty for user config

2 files changed, 8 insertions, 7 deletions

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 0095dec8079..8352a011b88 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
@@ -29,6 +29,7 @@ import static com.yahoo.vespa.model.container.ApplicationContainerCluster.UserCo
  * Utility methods for registering file distribution of files/paths/urls/models defined by the user.
  *
  * @author gjoranv
+ * @author hmusum
  */
 public class UserConfiguredFiles implements Serializable {
 
@@ -57,7 +58,7 @@ public class UserConfiguredFiles implements Serializable {
             try {
                 register(builder, registeredFiles, key);
             } catch (IllegalArgumentException e) {
-                throw new IllegalArgumentException("Unable to register file specified in services.xml for config '" + key + "': " +
+                throw new IllegalArgumentException("Invalid config in services.xml for '" + key + "': " +
                                                    Exceptions.toMessageString(e));
             }
         }
@@ -126,8 +127,7 @@ public class UserConfiguredFiles implements Serializable {
             ConfigPayloadBuilder fileEntry = builder.getObject(name);
             if (isEmptyOptionalPath(entry, fileEntry)) continue;
             if (fileEntry.getValue() == null || fileEntry.getValue().equals("."))
-                throw new IllegalArgumentException("Unable to register file for field '" + name +
-                                                   "': Invalid config value '" + fileEntry.getValue() + "'");
+                throw new IllegalArgumentException("Invalid config value '" + fileEntry.getValue() + "' for field '" + name);
             registerFileEntry(fileEntry, registeredFiles, isModelType);
         }
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java b/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
index 653bdbccf15..deea1a820d9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
@@ -32,6 +32,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Ulf Lilleengen
+ * @author hmusum
  */
 public class UserConfiguredFilesTest {
 
@@ -268,7 +269,8 @@ public class UserConfiguredFilesTest {
             userConfiguredFiles().register(producer);
             fail("Should have thrown exception");
         } catch (IllegalArgumentException e) {
-            assertEquals("Unable to register file specified in services.xml for config 'mynamespace.myname': No such file or directory 'foo.txt'", e.getMessage());
+            assertEquals("Invalid config in services.xml for 'mynamespace.myname': No such file or directory 'foo.txt'",
+                         e.getMessage());
         }
     }
 
@@ -281,7 +283,7 @@ public class UserConfiguredFilesTest {
             userConfiguredFiles().register(producer);
             fail("Should have thrown exception");
         } catch (IllegalArgumentException e) {
-            assertEquals("Unable to register file specified in services.xml for config 'mynamespace.myname': Unable to register file for field 'fileVal': Invalid config value '.'",
+            assertEquals("Invalid config in services.xml for 'mynamespace.myname': Invalid config value '.' for field 'fileVal",
                          e.getMessage());
         }
     }
@@ -296,8 +298,7 @@ public class UserConfiguredFilesTest {
             userConfiguredFiles().register(producer);
             fail("Should have thrown exception");
         } catch (IllegalArgumentException e) {
-            assertEquals("Unable to register file specified in services.xml for config 'mynamespace.myname': Directory '" +
-                                 relativeTempDir + "' is empty",
+            assertEquals("Invalid config in services.xml for 'mynamespace.myname': Directory '" + relativeTempDir + "' is empty",
                          e.getMessage());
         }
     }