summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2018-07-24 10:25:04 +0200
committerValerij Fredriksen <valerijf@oath.com>2018-07-24 10:25:04 +0200
commit0710480e9f52e5b2723a90c2a6b5de6f05fbb47f (patch)
treea6622160f7ad3abff45fba693ac9024f0657e03b
parent8bd33c8b9d64d474a011c74b346702a41635d301 (diff)
Update SubmitOptions to match SourceRevision
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitOptions.java26
1 files changed, 13 insertions, 13 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitOptions.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitOptions.java
index c3ec39683be..fb97a3c1004 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitOptions.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitOptions.java
@@ -17,24 +17,24 @@ import java.util.Objects;
@JsonIgnoreProperties(ignoreUnknown = true)
public class SubmitOptions {
- public GitRepository gitRepository;
- public GitBranch gitBranch;
- public GitCommit gitCommit;
+ public GitRepository repository;
+ public GitBranch branch;
+ public GitCommit commit;
public static SubmitOptions from(String repository, String branch, String commit) {
SubmitOptions options = new SubmitOptions();
- options.gitRepository = new GitRepository(repository);
- options.gitBranch = new GitBranch(branch);
- options.gitCommit = new GitCommit(commit);
+ options.repository = new GitRepository(repository);
+ options.branch = new GitBranch(branch);
+ options.commit = new GitCommit(commit);
return options;
}
@Override
public String toString() {
return "SubmitOptions{" +
- "gitRepository=" + gitRepository +
- ", gitBranch=" + gitBranch +
- ", gitCommit=" + gitCommit +
+ "repository=" + repository +
+ ", branch=" + branch +
+ ", commit=" + commit +
'}';
}
@@ -43,13 +43,13 @@ public class SubmitOptions {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
SubmitOptions that = (SubmitOptions) o;
- return Objects.equals(gitRepository, that.gitRepository) &&
- Objects.equals(gitBranch, that.gitBranch) &&
- Objects.equals(gitCommit, that.gitCommit);
+ return Objects.equals(repository, that.repository) &&
+ Objects.equals(branch, that.branch) &&
+ Objects.equals(commit, that.commit);
}
@Override
public int hashCode() {
- return Objects.hash(gitRepository, gitBranch, gitCommit);
+ return Objects.hash(repository, branch, commit);
}
}