add cluster name back to cluster state API

This commit is contained in:
Shay Banon 2012-10-22 15:35:04 +02:00
parent a3ffc65909
commit e40f4d2b1a
1 changed files with 6 additions and 0 deletions

View File

@ -29,6 +29,7 @@ import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.common.settings.SettingsFilter;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.rest.*; import org.elasticsearch.rest.*;
import org.elasticsearch.rest.action.support.RestActions; import org.elasticsearch.rest.action.support.RestActions;
import org.elasticsearch.rest.action.support.RestXContentBuilder; import org.elasticsearch.rest.action.support.RestXContentBuilder;
@ -69,6 +70,7 @@ public class RestClusterStateAction extends BaseRestHandler {
try { try {
XContentBuilder builder = RestXContentBuilder.restContentBuilder(request); XContentBuilder builder = RestXContentBuilder.restContentBuilder(request);
builder.startObject(); builder.startObject();
builder.field(Fields.CLUSTER_NAME, response.clusterName().value());
response.state().settingsFilter(settingsFilter).toXContent(builder, request); response.state().settingsFilter(settingsFilter).toXContent(builder, request);
builder.endObject(); builder.endObject();
channel.sendResponse(new XContentRestResponse(request, RestStatus.OK, builder)); channel.sendResponse(new XContentRestResponse(request, RestStatus.OK, builder));
@ -90,4 +92,8 @@ public class RestClusterStateAction extends BaseRestHandler {
} }
}); });
} }
static final class Fields {
static final XContentBuilderString CLUSTER_NAME = new XContentBuilderString("cluster_name");
}
} }