Delete unused code

3 files changed, 8 insertions, 71 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 63de0fd8373..5a38154b7c0 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
@@ -211,20 +211,8 @@ public abstract class ControllerHttpClient {
     private static String metaToJson(Deployment deployment) {
         Slime slime = new Slime();
         Cursor rootObject = slime.setObject();
-
-        if (deployment.repository().isPresent()) {
-            Cursor revisionObject = rootObject.setObject("sourceRevision");
-            deployment.repository().ifPresent(repository -> revisionObject.setString("repository", repository));
-            deployment.branch().ifPresent(branch -> revisionObject.setString("branch", branch));
-            deployment.commit().ifPresent(commit -> revisionObject.setString("commit", commit));
-            deployment.build().ifPresent(build -> rootObject.setLong("buildNumber", build));
-        }
-
         deployment.version().ifPresent(version -> rootObject.setString("vespaVersion", version));
-
-        if (deployment.ignoreValidationErrors()) rootObject.setBool("ignoreValidationErrors", true);
         rootObject.setBool("deployDirectly", true);
-
         return toJson(slime);
     }
 
@@ -244,7 +232,7 @@ public abstract class ControllerHttpClient {
     private static MultiPartStreamer toDataStream(Deployment deployment) {
         MultiPartStreamer streamer = new MultiPartStreamer();
         streamer.addJson("deployOptions", metaToJson(deployment));
-        deployment.applicationZip().ifPresent(zip -> streamer.addFile("applicationZip", zip));
+        streamer.addFile("applicationZip", deployment.applicationZip());
         return streamer;
     }
 
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/Deployment.java b/hosted-api/src/main/java/ai/vespa/hosted/api/Deployment.java
index 8f981ca5f05..e745f555847 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/Deployment.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/Deployment.java
@@ -9,59 +9,25 @@ import java.util.OptionalLong;
  */
 public class Deployment {
 
-    // Deployment options
     private final Optional<String> version;
-    private final boolean ignoreValidationErrors;
+    private final Path applicationZip;
 
-    // Provide an application package ...
-    private final Optional<Path> applicationZip;
-
-    // ... or reference a previously submitted one.
-    private final Optional<String> repository;
-    private final Optional<String> branch;
-    private final Optional<String> commit;
-    private final OptionalLong build;
-
-    private Deployment(Optional<String> version, boolean ignoreValidationErrors, Optional<Path> applicationZip,
-                      Optional<String> repository, Optional<String> branch, Optional<String> commit, OptionalLong build) {
+    private Deployment(Optional<String> version, Path applicationZip) {
         this.version = version;
-        this.ignoreValidationErrors = ignoreValidationErrors;
         this.applicationZip = applicationZip;
-        this.repository = repository;
-        this.branch = branch;
-        this.commit = commit;
-        this.build = build;
     }
 
-
     /** Returns a deployment which will use the provided application package. */
     public static Deployment ofPackage(Path applicationZipFile) {
-        return new Deployment(Optional.empty(), false, Optional.of(applicationZipFile),
-                              Optional.empty(), Optional.empty(), Optional.empty(), OptionalLong.empty());
-    }
-
-    /** Returns a deployment which will use the previously submitted package with the given reference. */
-    public static Deployment ofReference(String repository, String branch, String commit, long build) {
-        return new Deployment(Optional.empty(), false, Optional.empty(),
-                              Optional.of(repository), Optional.of(branch), Optional.of(commit), OptionalLong.of(build));
+        return new Deployment(Optional.empty(), applicationZipFile);
     }
 
     /** Returns a copy of this which will have the specified Vespa version on its nodes. */
     public Deployment atVersion(String vespaVersion) {
-        return new Deployment(Optional.of(vespaVersion), ignoreValidationErrors, applicationZip, repository, branch, commit, build);
-    }
-
-    /** Returns a copy of this which will additionally ignore validation errors upon deployment. */
-    public Deployment ignoringValidationErrors() {
-        return new Deployment(version, true, applicationZip, repository, branch, commit, build);
+        return new Deployment(Optional.of(vespaVersion), applicationZip);
     }
 
     public Optional<String> version() { return version; }
-    public boolean ignoreValidationErrors() { return ignoreValidationErrors; }
-    public Optional<Path> applicationZip() { return applicationZip; }
-    public Optional<String> repository() { return repository; }
-    public Optional<String> branch() { return branch; }
-    public Optional<String> commit() { return commit; }
-    public OptionalLong build() { return build; }
+    public Path applicationZip() { return applicationZip; }
 
 }
diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/DeployMojo.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/DeployMojo.java
index 75f0d2d1f48..32ff03ae202 100644
--- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/DeployMojo.java
+++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/DeployMojo.java
@@ -26,36 +26,19 @@ public class DeployMojo extends AbstractVespaMojo {
     @Parameter(property = "vespaVersion")
     private String vespaVersion;
 
-    @Parameter(property = "ignoreValidationErrors")
-    private String ignoreValidationErrors;
-
     @Parameter(property = "environment")
     private String environment;
 
     @Parameter(property = "region")
     private String region;
 
-    @Parameter(property = "repository")
-    private String repository;
-
-    @Parameter(property = "branch")
-    private String branch;
-
-    @Parameter(property = "commit")
-    private String commit;
-
-    @Parameter(property = "build")
-    private Long build;
-
     @Parameter(property = "follow", defaultValue = "true")
     private boolean follow;
 
     @Override
     protected void doExecute() {
-        Deployment deployment = build == null
-                ? Deployment.ofPackage(Paths.get(firstNonBlank(applicationZip, projectPathOf("target", "application.zip"))))
-                : Deployment.ofReference(repository, branch, commit, build);
-        if ("true".equalsIgnoreCase(ignoreValidationErrors)) deployment = deployment.ignoringValidationErrors(); // TODO unused, GC or fix.
+        Deployment deployment = Deployment.ofPackage(Paths.get(firstNonBlank(applicationZip,
+                                                                             projectPathOf("target", "application.zip"))));
         if (vespaVersion != null) deployment = deployment.atVersion(vespaVersion);
 
         ZoneId zone = environment == null || region == null ? controller.devZone() : ZoneId.from(environment, region);