From ff26700aec61b1e56e42d7097b4c6bbbd7ed9a74 Mon Sep 17 00:00:00 2001 From: Trevor Mack Date: Wed, 8 Jun 2016 15:22:38 -0700 Subject: [PATCH 1/2] updating ChaosMonkeyResource to have application/json content-type --- .../simianarmy/resources/chaos/ChaosMonkeyResource.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/netflix/simianarmy/resources/chaos/ChaosMonkeyResource.java b/src/main/java/com/netflix/simianarmy/resources/chaos/ChaosMonkeyResource.java index 643c76a3..f81c9fcf 100644 --- a/src/main/java/com/netflix/simianarmy/resources/chaos/ChaosMonkeyResource.java +++ b/src/main/java/com/netflix/simianarmy/resources/chaos/ChaosMonkeyResource.java @@ -28,7 +28,9 @@ import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; +import javax.ws.rs.Produces; import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -58,6 +60,7 @@ * The Class ChaosMonkeyResource for json REST apis. */ @Path("/v1/chaos") +@Produces(MediaType.APPLICATION_JSON) @Singleton public class ChaosMonkeyResource { From 700a81b4cbcc02c570270dbc586e8d6673ee17b9 Mon Sep 17 00:00:00 2001 From: Trevor Mack Date: Wed, 8 Jun 2016 15:26:59 -0700 Subject: [PATCH 2/2] updating JanitorMonkeyResource to have application/json content-type --- .../simianarmy/resources/janitor/JanitorMonkeyResource.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/netflix/simianarmy/resources/janitor/JanitorMonkeyResource.java b/src/main/java/com/netflix/simianarmy/resources/janitor/JanitorMonkeyResource.java index a6cc8bc3..cb31f66d 100644 --- a/src/main/java/com/netflix/simianarmy/resources/janitor/JanitorMonkeyResource.java +++ b/src/main/java/com/netflix/simianarmy/resources/janitor/JanitorMonkeyResource.java @@ -24,8 +24,10 @@ import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; +import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -46,6 +48,7 @@ * The Class JanitorMonkeyResource for json REST apis. */ @Path("/v1/janitor") +@Produces(MediaType.APPLICATION_JSON) public class JanitorMonkeyResource { /** The Constant JSON_FACTORY. */