diff options
author | Arne H Juul <arnej@yahooinc.com> | 2022-02-25 13:08:58 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2022-02-25 15:21:30 +0000 |
commit | 2c3f8d3f2034697446b18c804eb714e9071b2474 (patch) | |
tree | 5e8cd79bc817ea58a5d4b7c8c462a068d944c8d8 /config-model/src/main/java/com/yahoo | |
parent | 0ca11c3ea9e563f331f552c18ae8a135060865e5 (diff) |
unit test filename sanity check also
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java index 1f011883bfe..f96d59df150 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java @@ -60,7 +60,7 @@ public class IntermediateCollection { throw new IllegalArgumentException("The file containing schema '" + parsed.name() + "' must be named '" + parsed.name() + ApplicationPackage.SD_NAME_SUFFIX - + "', not " + fileName); + + "', was '" + stripDirs(fileName) + "'"); } } @@ -76,6 +76,14 @@ public class IntermediateCollection { return filename; } + private String stripDirs(String filename) { + int pos = filename.lastIndexOf('/'); + if (pos != -1) { + return filename.substring(pos + 1); + } + return filename; + } + /** * parse a schema from the given reader and add result to collection **/ |