aboutsummaryrefslogtreecommitdiffstats
path: root/hosted-api
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-01-09 13:41:27 +0100
committerJon Marius Venstad <venstad@gmail.com>2020-01-09 13:41:27 +0100
commit0353b17e52678ca85979e6fe2308afbef5ac8263 (patch)
treed01c1a00c420c05b1dc710c6e4d6581c40bff0a4 /hosted-api
parent7dadf68de87b6cbabffd248f306df521e90c125b (diff)
Set commit and sourceUrl fields when present, in submit mojo
Diffstat (limited to 'hosted-api')
-rw-r--r--hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java1
-rw-r--r--hosted-api/src/main/java/ai/vespa/hosted/api/Submission.java7
2 files changed, 7 insertions, 1 deletions
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
index c5626f7d690..4559deddeda 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
@@ -291,6 +291,7 @@ public abstract class ControllerHttpClient {
rootObject.setString("repository", submission.repository());
rootObject.setString("branch", submission.branch());
rootObject.setString("commit", submission.commit());
+ submission.sourceUrl().ifPresent(url -> rootObject.setString("sourceUrl", url));
rootObject.setString("authorEmail", submission.authorEmail());
submission.projectId().ifPresent(projectId -> rootObject.setLong("projectId", projectId));
return toJson(slime);
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/Submission.java b/hosted-api/src/main/java/ai/vespa/hosted/api/Submission.java
index fe2dbaf977e..6f392de86e7 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/Submission.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/Submission.java
@@ -2,6 +2,7 @@
package ai.vespa.hosted.api;
import java.nio.file.Path;
+import java.util.Optional;
import java.util.OptionalLong;
/**
@@ -14,15 +15,18 @@ public class Submission {
private final String repository;
private final String branch;
private final String commit;
+ private final Optional<String> sourceUrl;
private final String authorEmail;
private final Path applicationZip;
private final Path applicationTestZip;
private final OptionalLong projectId;
- public Submission(String repository, String branch, String commit, String authorEmail, Path applicationZip, Path applicationTestZip, OptionalLong projectId) {
+ public Submission(String repository, String branch, String commit, Optional<String> sourceUrl, String authorEmail,
+ Path applicationZip, Path applicationTestZip, OptionalLong projectId) {
this.repository = repository;
this.branch = branch;
this.commit = commit;
+ this.sourceUrl = sourceUrl;
this.authorEmail = authorEmail;
this.applicationZip = applicationZip;
this.applicationTestZip = applicationTestZip;
@@ -32,6 +36,7 @@ public class Submission {
public String repository() { return repository; }
public String branch() { return branch; }
public String commit() { return commit; }
+ public Optional<String> sourceUrl() { return sourceUrl; }
public String authorEmail() { return authorEmail; }
public Path applicationZip() { return applicationZip; }
public Path applicationTestZip() { return applicationTestZip; }