You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/07/05 15:54:52 UTC
[10/17] ambari git commit: AMBARI-21366. ADDENDUM - Create property
descriptions for internal Log Search configs (oleewere)
AMBARI-21366. ADDENDUM - Create property descriptions for internal Log Search configs (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ec0d01fc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ec0d01fc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ec0d01fc
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: ec0d01fcb4c9cf839de24cfa8e9c7f611be24d6e
Parents: a740b50
Author: oleewere <ol...@gmail.com>
Authored: Mon Jul 3 15:30:53 2017 +0200
Committer: oleewere <ol...@gmail.com>
Committed: Mon Jul 3 15:30:53 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/ambari/logsearch/rest/InfoResource.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec0d01fc/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/InfoResource.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/InfoResource.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/InfoResource.java
index f085678..6ea0bab 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/InfoResource.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/InfoResource.java
@@ -23,6 +23,7 @@ import javax.inject.Named;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -48,6 +49,7 @@ public class InfoResource {
@GET
@Path("/auth")
+ @Produces({"application/json"})
@ApiOperation(GET_AUTH_DETAILS_OD)
public Map<String, Boolean> getAuthInfo() {
return infoManager.getAuthMap();
@@ -55,6 +57,7 @@ public class InfoResource {
@GET
@Path("/properties")
+ @Produces({"application/json"})
@ApiOperation(GET_ALL_PROPERTIES_INFO_OD)
public Map<String, List<PropertyDescriptionData>> getPropertyDescriptions() {
return infoManager.getPropertyDescriptions();
@@ -62,6 +65,7 @@ public class InfoResource {
@GET
@Path("/properties/{propertyFile}")
+ @Produces({"application/json"})
@ApiOperation(GET_LOGSEARCH_PROPERTIES_INFO_OD)
public List<PropertyDescriptionData> getPropertyFileDescription(@PathParam("propertyFile") String propertyFile) {
return infoManager.getLogSearchPropertyDescriptions(propertyFile);