Merge branch 'master' of https://github.com/apache/falcon

apache · Dec 29, 2016 · 089b10d · 089b10d
2 parents 456d4ee + bc4dcf9
commit 089b10d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/client/src/main/java/org/apache/falcon/client/FalconClient.java b/client/src/main/java/org/apache/falcon/client/FalconClient.java
@@ -340,7 +340,7 @@ protected static enum AdminOperations {
      */
     protected static enum ExtensionOperations {
 
-        ENUMERATE("api/extension/enumerate/", HttpMethod.GET, MediaType.APPLICATION_JSON),
+        ENUMERATE("api/extension/enumerate/", HttpMethod.GET, MediaType.TEXT_XML),
         DESCRIBE("api/extension/describe/", HttpMethod.GET, MediaType.TEXT_PLAIN),
         DEFINITION("api/extension/definition", HttpMethod.GET, MediaType.APPLICATION_JSON),
         LIST("api/extension/list", HttpMethod.GET, MediaType.APPLICATION_JSON),
@@ -353,10 +353,10 @@ protected static enum ExtensionOperations {
         SUSPEND("api/extension/suspend", HttpMethod.POST, MediaType.TEXT_XML),
         RESUME("api/extension/resume", HttpMethod.POST, MediaType.TEXT_XML),
         DELETE("api/extension/delete", HttpMethod.POST, MediaType.TEXT_XML),
-        UNREGISTER("api/extension/unregister/", HttpMethod.POST, MediaType.TEXT_PLAIN),
+        UNREGISTER("api/extension/unregister/", HttpMethod.POST, MediaType.TEXT_XML),
         DETAIL("api/extension/detail/", HttpMethod.GET, MediaType.APPLICATION_JSON),
         JOB_DETAILS("api/extension/extensionJobDetails/", HttpMethod.GET, MediaType.APPLICATION_JSON),
-        REGISTER("api/extension/register/", HttpMethod.POST, MediaType.TEXT_PLAIN);
+        REGISTER("api/extension/register/", HttpMethod.POST, MediaType.TEXT_XML);
 
         private String path;
         private String method;
@@ -1106,9 +1106,10 @@ private List<Entity> validateExtensionAndGetEntities(String extensionName, Strin
 
     private JSONObject getExtensionDetailJson(String extensionName) {
         ClientResponse clientResponse = getExtensionDetailResponse(extensionName);
+
         JSONObject extensionDetailJson;
         try {
-            extensionDetailJson = new JSONObject(clientResponse.getEntity(String.class));
+            extensionDetailJson = new JSONObject(getResponse(APIResult.class, clientResponse).getMessage());
         } catch (JSONException e) {
             throw new FalconCLIException("Failed to get details for the given extension", e);
         }

diff --git a/prism/src/main/java/org/apache/falcon/resource/proxy/ExtensionManagerProxy.java b/prism/src/main/java/org/apache/falcon/resource/proxy/ExtensionManagerProxy.java
@@ -356,7 +356,6 @@ private SortedMap<EntityType, List<Entity>> getEntityList(String extensionName,
         }
     }
 
-
     private ExtensionType getExtensionType(String extensionName) {
         ExtensionMetaStore metaStore = ExtensionStore.getMetaStore();
         ExtensionBean extensionDetails = metaStore.getDetail(extensionName);
@@ -581,11 +580,11 @@ public APIResult validate(
     // Extension store related REST API's
     @GET
     @Path("enumerate")
-    @Produces({MediaType.APPLICATION_JSON})
+    @Produces({MediaType.TEXT_PLAIN, MediaType.TEXT_XML})
     public APIResult getExtensions() {
         checkIfExtensionServiceIsEnabled();
         try {
-            return new APIResult(APIResult.Status.SUCCEEDED, super.getExtensions().toString());
+            return super.getExtensions();
         } catch (FalconWebException e) {
             throw FalconWebException.newAPIException(e, Response.Status.INTERNAL_SERVER_ERROR);
         }
@@ -633,7 +632,7 @@ public APIResult getExtensionJobDetail(@PathParam("job-name") String jobName) {
     @POST
     @Path("unregister/{extension-name}")
     @Consumes({MediaType.TEXT_XML, MediaType.TEXT_PLAIN})
-    @Produces(MediaType.TEXT_PLAIN)
+    @Produces({MediaType.TEXT_PLAIN, MediaType.TEXT_XML})
     public APIResult deleteExtensionMetadata(
             @PathParam("extension-name") String extensionName){
         checkIfExtensionServiceIsEnabled();
@@ -647,7 +646,7 @@ public APIResult deleteExtensionMetadata(
     @POST
     @Path("register/{extension-name}")
     @Consumes({MediaType.TEXT_XML, MediaType.TEXT_PLAIN})
-    @Produces(MediaType.TEXT_PLAIN)
+    @Produces({MediaType.TEXT_PLAIN, MediaType.TEXT_XML})
     public APIResult registerExtensionMetadata(
             @PathParam("extension-name") String extensionName,
             @QueryParam("path") String path,
@@ -684,7 +683,6 @@ private List<Entity> generateEntities(String extensionName, InputStream configSt
         // add tags on extension name and job
         String jobName = properties.getProperty(ExtensionProperties.JOB_NAME.getName());
         EntityUtil.applyTags(extensionName, jobName, entities);
-
         return entities;
     }