Add equals() and static create method

2 files changed, 40 insertions, 4 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 2c14addfeee..c3ec39683be 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
@@ -6,6 +6,8 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.GitBranch;
 import com.yahoo.vespa.hosted.controller.api.identifiers.GitCommit;
 import com.yahoo.vespa.hosted.controller.api.identifiers.GitRepository;
 
+import java.util.Objects;
+
 /**
  * Additional options to be sent along the application package and the application test package
  * when submitting an application to the controller
@@ -19,6 +21,14 @@ public class SubmitOptions {
     public GitBranch gitBranch;
     public GitCommit gitCommit;
 
+    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);
+        return options;
+    }
+
     @Override
     public String toString() {
         return "SubmitOptions{" +
@@ -27,4 +37,19 @@ public class SubmitOptions {
                 ", gitCommit=" + gitCommit +
                 '}';
     }
+
+    @Override
+    public boolean equals(Object o) {
+        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);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(gitRepository, gitBranch, gitCommit);
+    }
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitResult.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitResult.java
index ee40a1e6ee8..a7f136cf3ce 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitResult.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitResult.java
@@ -2,10 +2,8 @@
 package com.yahoo.vespa.hosted.controller.api.application.v4.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.yahoo.component.Version;
-import com.yahoo.vespa.hosted.controller.api.identifiers.GitBranch;
-import com.yahoo.vespa.hosted.controller.api.identifiers.GitCommit;
-import com.yahoo.vespa.hosted.controller.api.identifiers.GitRepository;
+
+import java.util.Objects;
 
 /**
  * Represents the response from application submit request
@@ -23,4 +21,17 @@ public class SubmitResult {
                 "version='" + version + '\'' +
                 '}';
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SubmitResult that = (SubmitResult) o;
+        return Objects.equals(version, that.version);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(version);
+    }
 }