diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-01-20 12:07:11 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-01-20 12:07:11 +0100 |
commit | 115a3b242be1e6043d927bcd7570de5c6efefa44 (patch) | |
tree | adb71bdb5ebe71d9e4c7185b46f7e67ba09ede3f /hosted-api/src/main/java | |
parent | 0c6b28ef310bb5714b8c2ba10651ae87068e9b59 (diff) |
Make mojo send only specified data, and make it all optional
Diffstat (limited to 'hosted-api/src/main/java')
-rw-r--r-- | hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java | 8 | ||||
-rw-r--r-- | hosted-api/src/main/java/ai/vespa/hosted/api/Submission.java | 25 |
2 files changed, 17 insertions, 16 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 caabdfa1479..f1486ae7117 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 @@ -288,11 +288,11 @@ public abstract class ControllerHttpClient { private static String metaToJson(Submission submission) { Slime slime = new Slime(); Cursor rootObject = slime.setObject(); - rootObject.setString("repository", submission.repository()); - rootObject.setString("branch", submission.branch()); - rootObject.setString("commit", submission.commit()); + submission.repository().ifPresent(repository -> rootObject.setString("repository", repository)); + submission.branch().ifPresent(branch -> rootObject.setString("branch", branch)); + submission.commit().ifPresent(commit -> rootObject.setString("commit", commit)); submission.sourceUrl().ifPresent(url -> rootObject.setString("sourceUrl", url)); - rootObject.setString("authorEmail", submission.authorEmail()); + submission.authorEmail().ifPresent(email -> rootObject.setString("authorEmail", email)); 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 6f392de86e7..22b0c619acc 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 @@ -12,17 +12,18 @@ import java.util.OptionalLong; */ public class Submission { - private final String repository; - private final String branch; - private final String commit; + private final Optional<String> repository; + private final Optional<String> branch; + private final Optional<String> commit; private final Optional<String> sourceUrl; - private final String authorEmail; + private final Optional<String> authorEmail; private final Path applicationZip; private final Path applicationTestZip; - private final OptionalLong projectId; + private final Optional<Long> projectId; - public Submission(String repository, String branch, String commit, Optional<String> sourceUrl, String authorEmail, - Path applicationZip, Path applicationTestZip, OptionalLong projectId) { + public Submission(Optional<String> repository, Optional<String> branch, Optional<String> commit, + Optional<String> sourceUrl, Optional<String> authorEmail, + Path applicationZip, Path applicationTestZip, Optional<Long> projectId) { this.repository = repository; this.branch = branch; this.commit = commit; @@ -33,13 +34,13 @@ public class Submission { this.projectId = projectId; } - public String repository() { return repository; } - public String branch() { return branch; } - public String commit() { return commit; } + public Optional<String> repository() { return repository; } + public Optional<String> branch() { return branch; } + public Optional<String> commit() { return commit; } public Optional<String> sourceUrl() { return sourceUrl; } - public String authorEmail() { return authorEmail; } + public Optional<String> authorEmail() { return authorEmail; } public Path applicationZip() { return applicationZip; } public Path applicationTestZip() { return applicationTestZip; } - public OptionalLong projectId() { return projectId; } + public Optional<Long> projectId() { return projectId; } } |