Remove tenant-pipeline API path (and clean up after athensDomains)

3 files changed, 0 insertions, 50 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/ApplicationApi.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/ApplicationApi.java
index c938b1cd515..7e3f186d9ee 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/ApplicationApi.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/ApplicationApi.java
@@ -1,19 +1,14 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.application.v4;
 
-import com.yahoo.vespa.hosted.controller.api.application.v4.model.AthenzDomainsResponse;
 import com.yahoo.vespa.hosted.controller.api.application.v4.model.TenantInfo;
 import com.yahoo.vespa.hosted.controller.api.identifiers.TenantId;
-import com.yahoo.vespa.hosted.controller.api.application.v4.model.TenantPipelinesInfo;
-
 
 import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import java.util.List;
 
@@ -32,11 +27,4 @@ public interface ApplicationApi {
     @Path(TenantResource.API_PATH + "/{tenantId}")
     TenantResource tenant(@PathParam("tenantId")TenantId tenantId);
 
-    @GET
-    @Path("athensDomain")
-    AthenzDomainsResponse listAthensDomains(@DefaultValue("") @QueryParam("prefix") String prefix);
-
-    @GET
-    @Path("tenant-pipeline")
-    TenantPipelinesInfo listTenantPipelines();
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/AthenzDomainsResponse.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/AthenzDomainsResponse.java
deleted file mode 100644
index 6bf9479d1fc..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/AthenzDomainsResponse.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.application.v4.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.yahoo.vespa.athenz.api.AthenzDomain;
-
-import java.util.List;
-
-/**
- * @author gv
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class AthenzDomainsResponse extends JsonResponse<List<AthenzDomain>> {
-    public AthenzDomainsResponse(List<AthenzDomain> athensDomainList) {
-        super(athensDomainList);
-    }
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantPipelinesInfo.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantPipelinesInfo.java
deleted file mode 100644
index a7f1fb408fe..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantPipelinesInfo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.application.v4.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class TenantPipelinesInfo {
-    public List<TenantPipelineInfo> tenantPipelines = new ArrayList<>();
-
-    public static class TenantPipelineInfo {
-        public String screwdriverId;
-        public String tenant;
-        public String application;
-        public String instance;
-    }
-
-    public List<TenantPipelineInfo> brokenTenantPipelines = new ArrayList<>();
-}