Merge pull request #271 from Pandrex247/issue-269

Fixes #269
payara · Apr 29, 2015 · c4fed6b · c4fed6b
2 parents 66e9718 + 6f8b06c
commit c4fed6b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/...rvice/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandDeleteResource.java b/...rvice/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandDeleteResource.java
@@ -93,7 +93,7 @@ public Response processDeleteLegacyFormat(ParameterMap data) {
     }
 
     @DELETE
-    @Produces(Constants.MEDIA_TYPE_JSON+";qs=0.5")
+    @Produces(Constants.MEDIA_TYPE_JSON)
     public CommandResult processDelete(ParameterMap data) {
         if (data == null) {
             data = new ParameterMap();
@@ -111,7 +111,7 @@ public CommandResult processDelete(ParameterMap data) {
         MediaType.APPLICATION_JSON,
         MediaType.APPLICATION_XML,
         MediaType.APPLICATION_FORM_URLENCODED})
-    @Produces(SseFeature.SERVER_SENT_EVENTS+";qs=0.5")
+    @Produces(SseFeature.SERVER_SENT_EVENTS)
     public Response processDeleteSse(ParameterMap data) {
         if (data == null) {
             data = new ParameterMap();
@@ -169,7 +169,7 @@ public ActionReportResult getLegacyFormat() {
     }
 
     @GET
-    @Produces(Constants.MEDIA_TYPE_JSON+";qs=0.5")
+    @Produces(Constants.MEDIA_TYPE_JSON)
     public String get() throws JSONException {
         return options();
     }

diff --git a/...-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandGetResource.java b/...-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandGetResource.java
@@ -76,13 +76,13 @@ public Response processGetLegacyFormat() {
     }
 
     @GET
-    @Produces(Constants.MEDIA_TYPE_JSON+";qs=0.5")
+    @Produces(Constants.MEDIA_TYPE_JSON)
     public CommandResult processGet() {
         return executeCommand(prepareParameters());
     }
 
     @GET
-    @Produces(SseFeature.SERVER_SENT_EVENTS+";qs=0.5")
+    @Produces(SseFeature.SERVER_SENT_EVENTS)
     public Response processSseGet() {
         return executeCommandAsSse(prepareParameters());
     }

diff --git a/...service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandPostResource.java b/...service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandPostResource.java
@@ -99,7 +99,7 @@ public Response processPostLegacyFormat(ParameterMap data) {
 
     @POST
     @Consumes(Constants.MEDIA_TYPE_JSON)
-    @Produces(Constants.MEDIA_TYPE_JSON+";qs=0.5")
+    @Produces(Constants.MEDIA_TYPE_JSON)
     public CommandResult processPost(ParameterMap data) {
         if (data == null) {
             data = new ParameterMap();
@@ -136,7 +136,7 @@ public Response processPost() {
 
     @POST
     @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_FORM_URLENCODED})
-    @Produces(SseFeature.SERVER_SENT_EVENTS+";qs=0.5")
+    @Produces(SseFeature.SERVER_SENT_EVENTS)
     public Response processSsePost(ParameterMap data) {
         if (data == null) {
             data = new ParameterMap();
@@ -150,13 +150,13 @@ public Response processSsePost(ParameterMap data) {
 
     @POST
     @Consumes(MediaType.MULTIPART_FORM_DATA)
-    @Produces(SseFeature.SERVER_SENT_EVENTS+";qs=0.5")
+    @Produces(SseFeature.SERVER_SENT_EVENTS)
     public Response ssePost(FormDataMultiPart formData) {
         return processSsePost(createDataBasedOnForm(formData));
     }
 
     @POST
-    @Produces(SseFeature.SERVER_SENT_EVENTS+";qs=0.5")
+    @Produces(SseFeature.SERVER_SENT_EVENTS)
     public Response processSsePost() {
         try {
             return processSsePost(new ParameterMap());
@@ -173,7 +173,7 @@ public ActionReportResult getLegacyFormat() {
     }
 
     @GET
-    @Produces(Constants.MEDIA_TYPE_JSON+";qs=0.5")
+    @Produces(Constants.MEDIA_TYPE_JSON)
     public String get() {
         try {
             return options();

diff --git a/...st/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateExecCommand.java b/...st/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateExecCommand.java
@@ -139,7 +139,7 @@ public ActionReportResult optionsLegacyFormat() {
     }
 
     @OPTIONS
-    @Produces(Constants.MEDIA_TYPE_JSON+";qs=0.5")
+    @Produces(Constants.MEDIA_TYPE_JSON)
     public String options() throws JSONException {
         try {
             return new RestResourceMetadata(this).toJson().toString(Util.getFormattingIndentLevel());

diff --git a/...rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateListOfResource.java b/...rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateListOfResource.java
@@ -165,7 +165,7 @@ public Response post(FormDataMultiPart formData) {
     }
 
     @OPTIONS
-    @Produces({MediaType.APPLICATION_JSON+";qs=0.5", MediaType.TEXT_HTML+";qs=0.5", MediaType.APPLICATION_XML+";qs=0.5"})
+    @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_HTML, MediaType.APPLICATION_XML})
     public Response options() {
         return Response.ok().entity(buildActionReportResult()).build();
     }

diff --git a/...t/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateRestResource.java b/...t/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateRestResource.java
@@ -134,7 +134,7 @@ public ActionReportResult getEntityLegacyFormat(@QueryParam("expandLevel") @Defa
     }
 
     @GET
-    @Produces(Constants.MEDIA_TYPE_JSON+";qs=0.5")
+    @Produces(Constants.MEDIA_TYPE_JSON)
     public Map<String,String> getEntity(@QueryParam("expandLevel") @DefaultValue("1") int expandLevel) {
         if (childModel == null) {//wrong entity name at this point
             throw new WebApplicationException(Response.Status.NOT_FOUND);
@@ -153,7 +153,7 @@ public Response createOrUpdateEntityLegacyFormat(HashMap<String, String> data) {
     }
 
     @POST
-    @Produces(Constants.MEDIA_TYPE_JSON+";qs=0.5")
+    @Produces(Constants.MEDIA_TYPE_JSON)
     public Response createOrUpdateEntity(HashMap<String, String> data) {
         doCreateOrUpdate(data);
         return Response.status(Status.CREATED).build();
@@ -175,7 +175,7 @@ public Object postLegacyFormat(FormDataMultiPart formData) {
 
     @POST
     @Consumes(MediaType.MULTIPART_FORM_DATA)
-    @Produces(Constants.MEDIA_TYPE_JSON+";qs=0.5")
+    @Produces(Constants.MEDIA_TYPE_JSON)
     public Object post(FormDataMultiPart formData) {
         return createOrUpdateEntity(createDataBasedOnForm(formData)); //execute the deploy command with a copy of the file locally
     }
@@ -196,7 +196,7 @@ public ActionReportResult optionsLegacyFormat() {
     }
 
     @OPTIONS
-    @Produces(Constants.MEDIA_TYPE_JSON+";qs=0.5")
+    @Produces(Constants.MEDIA_TYPE_JSON)
     public RestResourceMetadata options() {
         return new RestResourceMetadata(this);
     }