No more /serviceview/v1/

4 files changed, 0 insertions, 47 deletions

diff --git a/controller-api/pom.xml b/controller-api/pom.xml
index 5b81b793534..dc2ec981e66 100644
--- a/controller-api/pom.xml
+++ b/controller-api/pom.xml
@@ -34,13 +34,6 @@
 
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
-            <artifactId>serviceview</artifactId>
-            <scope>provided</scope>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
             <artifactId>config-provisioning</artifactId>
             <scope>provided</scope>
             <version>${project.version}</version>
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/EnvironmentResource.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/EnvironmentResource.java
index 389cda605af..7953fbc4055 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/EnvironmentResource.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/EnvironmentResource.java
@@ -70,9 +70,6 @@ public interface EnvironmentResource {
                                    @PathParam("instanceId") InstanceId instanceId,
                                    @QueryParam("timeout") long timeoutInSeconds);
 
-    @Path("{environmentId}/region/{regionId}/instance/{instanceId}/service")
-    ServiceViewResource service();
-
     @PUT
     @Path("{environmentId}/region/{regionId}/instance/{instanceId}/global-rotation/override")
     String setRotationOut(@PathParam("tenantId") TenantId tenantId,
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/ServiceViewResource.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/ServiceViewResource.java
deleted file mode 100644
index 1d2860f5dd3..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/ServiceViewResource.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright Yahoo. 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.serviceview.bindings.ApplicationView;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-
-/**
- * @author Stian Kristoffersen
- */
-@Path("")
-@Produces(MediaType.APPLICATION_JSON)
-public interface ServiceViewResource {
-
-    @GET
-    @Path("")
-    @Produces(MediaType.APPLICATION_JSON)
-    ApplicationView getUserInfo();
-
-    @GET
-    @Path("{serviceIdentifier}/{apiParams: .*}")
-    @Produces(MediaType.APPLICATION_JSON)
-    @SuppressWarnings("rawtypes")
-    HashMap singleService(@PathParam("serviceIdentifier") String identifier,
-                          @PathParam("apiParams") String apiParams);
-
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
index 6dccf493d92..cc0baf09c6b 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
@@ -18,7 +18,6 @@ import com.yahoo.vespa.hosted.controller.api.integration.deployment.TestReport;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterCloud;
 import com.yahoo.vespa.hosted.controller.api.integration.noderepository.RestartFilter;
 import com.yahoo.vespa.hosted.controller.api.integration.secrets.TenantSecretStore;
-import com.yahoo.vespa.serviceview.bindings.ApplicationView;
 
 import java.io.InputStream;
 import java.net.URI;
@@ -53,10 +52,6 @@ public interface ConfigServer {
 
     boolean isSuspended(DeploymentId deployment);
 
-    ApplicationView getApplicationView(String tenantName, String applicationName, String instanceName, String environment, String region);
-
-    Map<?,?> getServiceApiResponse(DeploymentId deployment, String serviceName, Path restPath);
-
     /** Returns a proxied response from a given path running on a given service and node */
     ProxyResponse getServiceNodePage(DeploymentId deployment, String serviceName, DomainName node, Path subPath, Query query);