diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2019-08-22 14:22:36 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2019-08-22 15:08:14 +0200 |
commit | 37cc1486513e3d530c9e6a6534f1297b61f65ba7 (patch) | |
tree | 1263ca10ae995943e2540c4440ddffe61dc48e55 /vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java | |
parent | eacb70bcd42801f4226c9e781bee27c9ab22df34 (diff) |
Factor out abstract mojo on deployment level
Diffstat (limited to 'vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java')
-rw-r--r-- | vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java index 6b7af01a3ea..e2bbbb86706 100644 --- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java +++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java @@ -2,8 +2,6 @@ package ai.vespa.hosted.plugin; import ai.vespa.hosted.api.ControllerHttpClient; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.Environment; -import com.yahoo.config.provision.zone.ZoneId; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; @@ -70,17 +68,6 @@ public abstract class AbstractVespaMojo extends AbstractMojo { : ControllerHttpClient.withKeyAndCertificate(URI.create(endpoint), Paths.get(privateKeyFile), Paths.get(certificateFile)); } - protected ZoneId zoneOf(String environment, String region) { - if (region == null) - return controller.defaultZone(environment != null ? Environment.from(environment) - : Environment.dev); - - if (environment == null) - throw new IllegalArgumentException("Environment must be specified if region is specified"); - - return ZoneId.from(environment, region); - } - protected String projectPathOf(String first, String... rest) { return project.getBasedir().toPath().resolve(Path.of(first, rest)).toString(); } |