diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-03-06 09:55:10 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2018-03-06 09:55:10 +0100 |
commit | 740ac77765fc90ad412b2acfea45dafd824581d6 (patch) | |
tree | b539497566fbc6765d70dd94f40d54fee0c64b4f /serviceview | |
parent | 1081ee11b211b66a54a5983f7e5057e14190815d (diff) |
Cleanup
Diffstat (limited to 'serviceview')
-rw-r--r-- | serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ConfigClient.java | 12 | ||||
-rw-r--r-- | serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/StateClient.java | 32 |
2 files changed, 23 insertions, 21 deletions
diff --git a/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ConfigClient.java b/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ConfigClient.java index b31afcd4df1..bc40586b473 100644 --- a/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ConfigClient.java +++ b/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ConfigClient.java @@ -10,16 +10,16 @@ import javax.ws.rs.core.MediaType; /** * Client to fetch the model config from the configserver. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public interface ConfigClient { @GET @Path("/config/v2/tenant/{tenantName}/application/{applicationName}/environment/{environmentName}/region/{regionName}/instance/{instanceName}/cloud.config.model") @Produces(MediaType.APPLICATION_JSON) - public ModelResponse getServiceModel(@PathParam("tenantName") String tenantName, - @PathParam("applicationName") String applicationName, - @PathParam("environmentName") String environmentName, - @PathParam("regionName") String regionName, - @PathParam("instanceName") String instanceName); + ModelResponse getServiceModel(@PathParam("tenantName") String tenantName, + @PathParam("applicationName") String applicationName, + @PathParam("environmentName") String environmentName, + @PathParam("regionName") String regionName, + @PathParam("instanceName") String instanceName); } diff --git a/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/StateClient.java b/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/StateClient.java index fcb5058920a..5e5ee023d84 100644 --- a/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/StateClient.java +++ b/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/StateClient.java @@ -1,39 +1,41 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.serviceview.bindings; -import java.util.HashMap; - 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 Steinar Knutsen + */ public interface StateClient { @GET @Path("v1/") @Produces(MediaType.APPLICATION_JSON) - public ApplicationView getDefaultUserInfo(); + ApplicationView getDefaultUserInfo(); @GET @Path("v1/tenant/{tenantName}/application/{applicationName}/environment/{environmentName}/region/{regionName}/instance/{instanceName}") @Produces(MediaType.APPLICATION_JSON) - public ApplicationView getUserInfo(@PathParam("tenantName") String tenantName, - @PathParam("applicationName") String applicationName, - @PathParam("environmentName") String environmentName, - @PathParam("regionName") String regionName, - @PathParam("instanceName") String instanceName); + ApplicationView getUserInfo(@PathParam("tenantName") String tenantName, + @PathParam("applicationName") String applicationName, + @PathParam("environmentName") String environmentName, + @PathParam("regionName") String regionName, + @PathParam("instanceName") String instanceName); @SuppressWarnings("rawtypes") @GET @Path("v1/tenant/{tenantName}/application/{applicationName}/environment/{environmentName}/region/{regionName}/instance/{instanceName}/service/{serviceIdentifier}/{apiParams: .*}") @Produces(MediaType.APPLICATION_JSON) - public HashMap singleService(@PathParam("tenantName") String tenantName, - @PathParam("applicationName") String applicationName, - @PathParam("environmentName") String environmentName, - @PathParam("regionName") String regionName, - @PathParam("instanceName") String instanceName, - @PathParam("serviceIdentifier") String identifier, - @PathParam("apiParams") String apiParams); + HashMap singleService(@PathParam("tenantName") String tenantName, + @PathParam("applicationName") String applicationName, + @PathParam("environmentName") String environmentName, + @PathParam("regionName") String regionName, + @PathParam("instanceName") String instanceName, + @PathParam("serviceIdentifier") String identifier, + @PathParam("apiParams") String apiParams); } |