Defer validation of tensor URI for a little while.

1 files changed, 12 insertions, 8 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
index 520ff231921..d022b2cf8ab 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
@@ -63,15 +63,19 @@ public class RankingConstantsValidator extends Validator {
     }
 
     private void validateRankingConstant(RankingConstant rankingConstant, ApplicationPackage application) throws FileNotFoundException {
-        String constantFile = rankingConstant.getFileName();
-        if (application.getFileReference(Path.fromString("")).getAbsolutePath().endsWith(FilesApplicationPackage.preprocessed) &&
-            constantFile.startsWith(FilesApplicationPackage.preprocessed))
-            constantFile = constantFile.substring(FilesApplicationPackage.preprocessed.length());
+        // TODO: Handle validation of URI soon too.
+        if (rankingConstant.getPathType() == RankingConstant.PathType.FILE) {
+            String constantFile = rankingConstant.getFileName();
+            if (application.getFileReference(Path.fromString("")).getAbsolutePath().endsWith(FilesApplicationPackage.preprocessed) &&
+                    constantFile.startsWith(FilesApplicationPackage.preprocessed)) {
+                constantFile = constantFile.substring(FilesApplicationPackage.preprocessed.length());
+            }
 
-        ApplicationFile tensorApplicationFile = application.getFile(Path.fromString(constantFile));
-        new ConstantTensorJsonValidator().validate(constantFile,
-                                                   rankingConstant.getTensorType(),
-                                                   tensorApplicationFile.createReader());
+            ApplicationFile tensorApplicationFile = application.getFile(Path.fromString(constantFile));
+            new ConstantTensorJsonValidator().validate(constantFile,
+                    rankingConstant.getTensorType(),
+                    tensorApplicationFile.createReader());
+        }
     }
 
 }