Handle empty source revision

1 files changed, 10 insertions, 6 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/SourceRevision.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/SourceRevision.java
index a9c1155c5ef..47538b4aaca 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/SourceRevision.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/SourceRevision.java
@@ -15,12 +15,9 @@ public class SourceRevision {
     private final String commit;
     
     public SourceRevision(String repository, String branch, String commit) {
-        Objects.requireNonNull(repository, "repository cannot be null");
-        Objects.requireNonNull(branch, "branch cannot be null");
-        Objects.requireNonNull(commit, "commit cannot be null");
-        this.repository = repository;
-        this.branch = branch;
-        this.commit = commit;
+        this.repository = nonBlank(repository, "repository cannot be null or empty");
+        this.branch = nonBlank(branch, "branch cannot be null or empty");
+        this.commit = nonBlank(commit, "commit cannot be null");
     }
     
     public String repository() { return repository; }
@@ -45,4 +42,11 @@ public class SourceRevision {
     public String toString() { return "source revision of repository '" + repository + 
                                       "', branch '" + branch + "' with commit '" + commit  + "'"; }
 
+
+    private static String nonBlank(String s, String message) {
+        Objects.requireNonNull(message);
+        if (s.isBlank()) throw new IllegalArgumentException(message);
+        return s;
+    }
+
 }