[BROOKLYN-185] Add SwaggerFilter to BrooklynRestApiLauncher's defaults
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8dea7643 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8dea7643 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8dea7643 Branch: refs/heads/master Commit: 8dea764309fd58ced129c5008db5cd04e012af91 Parents: 5c62562 Author: Ciprian Ciubotariu <[email protected]> Authored: Thu Oct 22 17:42:34 2015 +0300 Committer: Ciprian Ciubotariu <[email protected]> Committed: Wed Nov 11 17:42:43 2015 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/brooklyn/rest/BrooklynRestApi.java | 2 ++ .../java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8dea7643/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynRestApi.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynRestApi.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynRestApi.java index 209eb94..6886f5e 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynRestApi.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynRestApi.java @@ -43,6 +43,7 @@ import org.apache.brooklyn.rest.util.FormMapProvider; import org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider; import com.google.common.collect.Iterables; +import io.swagger.jaxrs.listing.SwaggerSerializers; @SuppressWarnings("deprecation") public class BrooklynRestApi { @@ -69,6 +70,7 @@ public class BrooklynRestApi { public static Iterable<Object> getApidocResources() { List<Object> resources = new ArrayList<Object>(); + resources.add(new SwaggerSerializers()); resources.add(new ApidocResource()); return resources; } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8dea7643/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java index a2d9113..c3ae9cc 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java @@ -100,7 +100,8 @@ public class BrooklynRestApiLauncher { RequestTaggingFilter.class, BrooklynPropertiesSecurityFilter.class, LoggingFilter.class, - HaMasterCheckFilter.class); + HaMasterCheckFilter.class, + SwaggerFilter.class); private boolean forceUseOfDefaultCatalogWithJavaClassPath = false; private Class<? extends SecurityProvider> securityProvider; @@ -309,7 +310,7 @@ public class BrooklynRestApiLauncher { } public static void main(String[] args) throws Exception { - startRestResourcesViaWebXml(); + startRestResourcesViaFilter(); log.info("Press Ctrl-C to quit."); }
