You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/11/19 00:42:50 UTC
[06/24] incubator-brooklyn git commit: [BROOKLYN-185] Revert to
original API tags
[BROOKLYN-185] Revert to original API tags
The @Api description field is no longer used in swagger-1.5.3; move the
description back into the value field.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/13a97d7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/13a97d7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/13a97d7d
Branch: refs/heads/master
Commit: 13a97d7db374903fedbd896bb0a78734331bd123
Parents: 8dea764
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Thu Oct 22 20:24:53 2015 +0300
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Wed Nov 11 17:42:43 2015 +0200
----------------------------------------------------------------------
.../brooklyn/camp/server/rest/resource/ApidocRestResource.java | 2 +-
.../server/rest/resource/ApplicationComponentRestResource.java | 2 +-
.../rest/resource/ApplicationComponentTemplateRestResource.java | 2 +-
.../brooklyn/camp/server/rest/resource/AssemblyRestResource.java | 2 +-
.../camp/server/rest/resource/AssemblyTemplateRestResource.java | 2 +-
.../camp/server/rest/resource/PlatformComponentRestResource.java | 2 +-
.../rest/resource/PlatformComponentTemplateRestResource.java | 2 +-
.../brooklyn/camp/server/rest/resource/PlatformRestResource.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/AccessApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/ApplicationApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/EffectorApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/EntityApi.java | 2 +-
.../main/java/org/apache/brooklyn/rest/api/EntityConfigApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/LocationApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/PolicyApi.java | 2 +-
.../main/java/org/apache/brooklyn/rest/api/PolicyConfigApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/ScriptApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/SensorApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/ServerApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/UsageApi.java | 2 +-
.../src/main/java/org/apache/brooklyn/rest/api/VersionApi.java | 2 +-
.../java/org/apache/brooklyn/rest/resources/ApidocResource.java | 2 +-
24 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApidocRestResource.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApidocRestResource.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApidocRestResource.java
index 850ae22..3c5f96d 100644
--- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApidocRestResource.java
+++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApidocRestResource.java
@@ -23,7 +23,7 @@ import javax.ws.rs.Path;
@Path(ApidocRestResource.API_URI_PATH)
-@Api(value = "org.apache.brooklyn.camp.server.rest.resource.ApidocRestResource", description = "Web API Documentation")
+@Api("Web API Documentation")
public class ApidocRestResource extends org.apache.brooklyn.rest.apidoc.ApiListingResource {
public static final String API_URI_PATH = PlatformRestResource.CAMP_URI_PATH + "/apidoc";
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApplicationComponentRestResource.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApplicationComponentRestResource.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApplicationComponentRestResource.java
index fa649b0..5b2df5b 100644
--- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApplicationComponentRestResource.java
+++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApplicationComponentRestResource.java
@@ -30,7 +30,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path(ApplicationComponentRestResource.URI_PATH)
-@Api(value = "org.apache.brooklyn.camp.server.rest.resource.ApplicationComponentRestResource", description = "Application Component resources")
+@Api("Application Component resources")
@Produces("application/json")
public class ApplicationComponentRestResource extends AbstractCampRestResource {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApplicationComponentTemplateRestResource.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApplicationComponentTemplateRestResource.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApplicationComponentTemplateRestResource.java
index 758a867..32c626e 100644
--- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApplicationComponentTemplateRestResource.java
+++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/ApplicationComponentTemplateRestResource.java
@@ -30,7 +30,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path(ApplicationComponentTemplateRestResource.URI_PATH)
-@Api(value = "org.apache.brooklyn.camp.server.rest.resource.ApplicationComponentTemplateRestResource", description = "Application Component Template resources")
+@Api("Application Component Template resources")
@Produces("application/json")
public class ApplicationComponentTemplateRestResource extends AbstractCampRestResource {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyRestResource.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyRestResource.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyRestResource.java
index a5b22f3..892cdb5 100644
--- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyRestResource.java
+++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyRestResource.java
@@ -30,7 +30,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path(AssemblyRestResource.URI_PATH)
-@Api(value = "org.apache.brooklyn.camp.server.rest.resource.AssemblyRestResource", description = "Assembly resources")
+@Api("Assembly resources")
@Produces("application/json")
public class AssemblyRestResource extends AbstractCampRestResource {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyTemplateRestResource.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyTemplateRestResource.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyTemplateRestResource.java
index 9066d0d..c3ccae6 100644
--- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyTemplateRestResource.java
+++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyTemplateRestResource.java
@@ -41,7 +41,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path(AssemblyTemplateRestResource.URI_PATH)
-@Api(value = "org.apache.brooklyn.camp.server.rest.resource.AssemblyTemplateRestResource", description = "Assembly Template resources")
+@Api("Assembly Template resources")
@Produces("application/json")
public class AssemblyTemplateRestResource extends AbstractCampRestResource {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformComponentRestResource.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformComponentRestResource.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformComponentRestResource.java
index e006bc5..77d20dc 100644
--- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformComponentRestResource.java
+++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformComponentRestResource.java
@@ -30,7 +30,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path(PlatformComponentRestResource.URI_PATH)
-@Api(value = "org.apache.brooklyn.camp.server.rest.resource.PlatformComponentRestResource", description = "Platform Component resources")
+@Api("Platform Component resources")
@Produces("application/json")
public class PlatformComponentRestResource extends AbstractCampRestResource {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformComponentTemplateRestResource.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformComponentTemplateRestResource.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformComponentTemplateRestResource.java
index 63e96d4..b334757 100644
--- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformComponentTemplateRestResource.java
+++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformComponentTemplateRestResource.java
@@ -30,7 +30,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path(PlatformComponentTemplateRestResource.URI_PATH)
-@Api(value = "org.apache.brooklyn.camp.server.rest.resource.PlatformComponentTemplateRestResource", description = "Platform Component Template resources")
+@Api("Platform Component Template resources")
@Produces("application/json")
public class PlatformComponentTemplateRestResource extends AbstractCampRestResource {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformRestResource.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformRestResource.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformRestResource.java
index 4259fb4..9d98877 100644
--- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformRestResource.java
+++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/PlatformRestResource.java
@@ -43,7 +43,7 @@ import io.swagger.annotations.ApiOperation;
//import io.brooklyn.camp.rest.apidoc.Apidoc;
@Path(PlatformRestResource.CAMP_URI_PATH)
-@Api(value = "org.apache.brooklyn.camp.server.rest.resource.PlatformRestResource", description = "Platform (root)")
+@Api("Platform (root)")
@Produces("application/json")
public class PlatformRestResource extends AbstractCampRestResource {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/AccessApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/AccessApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/AccessApi.java
index 50f5c05..b2af640 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/AccessApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/AccessApi.java
@@ -36,7 +36,7 @@ import io.swagger.annotations.ApiParam;
@Beta
@Path("/v1/access")
-@Api(value = "org.apache.brooklyn.rest.api.AccessApi", description = "Access Control")
+@Api("Access Control")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface AccessApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java
index 7bf02e5..2482608 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java
@@ -32,7 +32,7 @@ import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
@Path("/v1/activities")
-@Api(value = "org.apache.brooklyn.rest.api.ActivityApi", description = "Activities")
+@Api("Activities")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface ActivityApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ApplicationApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ApplicationApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ApplicationApi.java
index 8686a66..c412644 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ApplicationApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ApplicationApi.java
@@ -47,7 +47,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path("/v1/applications")
-@Api(value = "org.apache.brooklyn.rest.api.ApplicationApi", description = "Applications")
+@Api("Applications")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface ApplicationApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java
index 79b36f3..bd93fb2 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java
@@ -48,7 +48,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path("/v1/catalog")
-@Api(value = "org.apache.brooklyn.rest.api.CatalogApi", description = "Catalog")
+@Api("Catalog")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public interface CatalogApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EffectorApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EffectorApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EffectorApi.java
index f05ba72..e6fae45 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EffectorApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EffectorApi.java
@@ -33,7 +33,7 @@ import java.util.List;
import java.util.Map;
@Path("/v1/applications/{application}/entities/{entity}/effectors")
-@Api(value = "org.apache.brooklyn.rest.api.EffectorApi", description = "Entity Effectors")
+@Api("Entity Effectors")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface EffectorApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java
index b553c39..d081526 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java
@@ -36,7 +36,7 @@ import java.util.List;
import java.util.Map;
@Path("/v1/applications/{application}/entities")
-@Api(value = "org.apache.brooklyn.rest.api.EntityApi", description = "Entities")
+@Api("Entities")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface EntityApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityConfigApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityConfigApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityConfigApi.java
index e7558e0..af68eb3 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityConfigApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityConfigApi.java
@@ -40,7 +40,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path("/v1/applications/{application}/entities/{entity}/config")
-@Api(value = "org.apache.brooklyn.rest.api.EntityConfigApi", description = "Entity Config")
+@Api("Entity Config")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface EntityConfigApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/LocationApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/LocationApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/LocationApi.java
index 47e8426..5eb25ac 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/LocationApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/LocationApi.java
@@ -43,7 +43,7 @@ import io.swagger.annotations.ApiParam;
@SuppressWarnings("deprecation")
@Path("/v1/locations")
-@Api(value = "org.apache.brooklyn.rest.api.LocationApi", description = "Locations")
+@Api("Locations")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface LocationApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyApi.java
index d992d7d..983af7d 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyApi.java
@@ -33,7 +33,7 @@ import java.util.List;
import java.util.Map;
@Path("/v1/applications/{application}/entities/{entity}/policies")
-@Api(value = "org.apache.brooklyn.rest.api.PolicyApi", description = "Entity Policies")
+@Api("Entity Policies")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface PolicyApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyConfigApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyConfigApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyConfigApi.java
index b546425..223c6ac 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyConfigApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyConfigApi.java
@@ -32,7 +32,7 @@ import java.util.List;
import java.util.Map;
@Path("/v1/applications/{application}/entities/{entity}/policies/{policy}/config")
-@Api(value = "org.apache.brooklyn.rest.api.PolicyConfigApi", description = "Entity Policy Config")
+@Api("Entity Policy Config")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface PolicyConfigApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ScriptApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ScriptApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ScriptApi.java
index b0e89eb..ed90618 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ScriptApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ScriptApi.java
@@ -32,7 +32,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
@Path("/v1/script")
-@Api(value = "org.apache.brooklyn.rest.api.ScriptApi", description = "Scripting")
+@Api("Scripting")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface ScriptApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/SensorApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/SensorApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/SensorApi.java
index 4025b7f..73c37cc 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/SensorApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/SensorApi.java
@@ -41,7 +41,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path("/v1/applications/{application}/entities/{entity}/sensors")
-@Api(value = "org.apache.brooklyn.rest.api.SensorApi", description = "Entity Sensors")
+@Api("Entity Sensors")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface SensorApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
index 77254cf..5678d7b 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/ServerApi.java
@@ -45,7 +45,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path("/v1/server")
-@Api(value = "org.apache.brooklyn.rest.api.ServerApi", description = "Server")
+@Api("Server")
@Produces(MediaType.APPLICATION_JSON)
@Beta
public interface ServerApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/UsageApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/UsageApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/UsageApi.java
index a294c7f..b483cf0 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/UsageApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/UsageApi.java
@@ -37,7 +37,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@Path("/v1/usage")
-@Api(value = "org.apache.brooklyn.rest.api.UsageApi", description = "Usage")
+@Api("Usage")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public interface UsageApi {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/VersionApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/VersionApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/VersionApi.java
index eac0cb1..f1e4601 100644
--- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/VersionApi.java
+++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/VersionApi.java
@@ -28,7 +28,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
@Path("/v1/version")
-@Api(value = "org.apache.brooklyn.rest.api.VersionApi", description = "Version")
+@Api("Version")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
/** @deprecated since 0.7.0; use /v1/server/version */
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13a97d7d/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApidocResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApidocResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApidocResource.java
index e748516..95bbf59 100644
--- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApidocResource.java
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApidocResource.java
@@ -24,7 +24,7 @@ import javax.ws.rs.Path;
/**
* @author Ciprian Ciubotariu <ch...@gmx.net>
*/
-@Api(value = "org.apache.brooklyn.rest.resources.ApidocResource", description = "API Documentation")
+@Api("API Documentation")
@Path("/v1/apidoc")
public class ApidocResource extends org.apache.brooklyn.rest.apidoc.ApiListingResource {