From c15a612b8abec6cca4e50f44efe1e2c497c6f691 Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Sat, 9 Oct 2010 04:06:03 +0200
Subject: [PATCH] optimize get/delete/index response xcontent generation

---
 .../elasticsearch/action/get/GetResponse.java | 26 +++++++++++--------
 .../indices/delete/RestDeleteIndexAction.java | 12 ++++++---
 .../rest/action/index/RestIndexAction.java    | 17 +++++++++---
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetResponse.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetResponse.java
index a1a14d56ecc..93d8e2ddafb 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetResponse.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetResponse.java
@@ -27,10 +27,7 @@ import org.elasticsearch.common.compress.lzf.LZFDecoder;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
-import org.elasticsearch.common.xcontent.ToXContent;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.common.xcontent.*;
 import org.elasticsearch.rest.action.support.RestXContentBuilder;
 
 import java.io.IOException;
@@ -219,24 +216,31 @@ public class GetResponse implements ActionResponse, Streamable, Iterable<GetFiel
         return fields.values().iterator();
     }
 
+    static final class Fields {
+        static final XContentBuilderString _INDEX = new XContentBuilderString("_index");
+        static final XContentBuilderString _TYPE = new XContentBuilderString("_type");
+        static final XContentBuilderString _ID = new XContentBuilderString("_id");
+        static final XContentBuilderString FIELDS = new XContentBuilderString("fields");
+    }
+
     @Override public void toXContent(XContentBuilder builder, Params params) throws IOException {
         if (!exists()) {
             builder.startObject();
-            builder.field("_index", index);
-            builder.field("_type", type);
-            builder.field("_id", id);
+            builder.field(Fields._INDEX, index);
+            builder.field(Fields._TYPE, type);
+            builder.field(Fields._ID, id);
             builder.endObject();
         } else {
             builder.startObject();
-            builder.field("_index", index);
-            builder.field("_type", type);
-            builder.field("_id", id);
+            builder.field(Fields._INDEX, index);
+            builder.field(Fields._TYPE, type);
+            builder.field(Fields._ID, id);
             if (source != null) {
                 RestXContentBuilder.restDocumentSource(source, builder, params);
             }
 
             if (fields != null && !fields.isEmpty()) {
-                builder.startObject("fields");
+                builder.startObject(Fields.FIELDS);
                 for (GetField field : fields.values()) {
                     if (field.values().isEmpty()) {
                         continue;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java
index 52bdb9ab814..b7e291dbee3 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java
@@ -26,6 +26,7 @@ import org.elasticsearch.client.Client;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentBuilderString;
 import org.elasticsearch.indices.IndexMissingException;
 import org.elasticsearch.rest.*;
 import org.elasticsearch.rest.action.support.RestXContentBuilder;
@@ -37,7 +38,7 @@ import static org.elasticsearch.common.unit.TimeValue.*;
 import static org.elasticsearch.rest.RestResponse.Status.*;
 
 /**
- * @author kimchy (Shay Banon)
+ * @author kimchy (shay.banon)
  */
 public class RestDeleteIndexAction extends BaseRestHandler {
 
@@ -54,8 +55,8 @@ public class RestDeleteIndexAction extends BaseRestHandler {
                 try {
                     XContentBuilder builder = RestXContentBuilder.restContentBuilder(request);
                     builder.startObject()
-                            .field("ok", true)
-                            .field("acknowledged", response.acknowledged())
+                            .field(Fields.OK, true)
+                            .field(Fields.ACKNOWLEDGED, response.acknowledged())
                             .endObject();
                     channel.sendResponse(new XContentRestResponse(request, OK, builder));
                 } catch (IOException e) {
@@ -78,4 +79,9 @@ public class RestDeleteIndexAction extends BaseRestHandler {
             }
         });
     }
+
+    static final class Fields {
+        static final XContentBuilderString OK = new XContentBuilderString("ok");
+        static final XContentBuilderString ACKNOWLEDGED = new XContentBuilderString("acknowledged");
+    }
 }
\ No newline at end of file
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java
index a22aafbca77..45507464863 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java
@@ -27,6 +27,7 @@ import org.elasticsearch.client.Client;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentBuilderString;
 import org.elasticsearch.rest.*;
 import org.elasticsearch.rest.action.support.RestXContentBuilder;
 
@@ -90,10 +91,10 @@ public class RestIndexAction extends BaseRestHandler {
                 try {
                     XContentBuilder builder = RestXContentBuilder.restContentBuilder(request);
                     builder.startObject()
-                            .field("ok", true)
-                            .field("_index", result.index())
-                            .field("_type", result.type())
-                            .field("_id", result.id())
+                            .field(Fields.OK, true)
+                            .field(Fields._INDEX, result.index())
+                            .field(Fields._TYPE, result.type())
+                            .field(Fields._ID, result.id())
                             .endObject();
                     channel.sendResponse(new XContentRestResponse(request, OK, builder));
                 } catch (Exception e) {
@@ -110,4 +111,12 @@ public class RestIndexAction extends BaseRestHandler {
             }
         });
     }
+
+    static final class Fields {
+        static final XContentBuilderString OK = new XContentBuilderString("ok");
+        static final XContentBuilderString _INDEX = new XContentBuilderString("_index");
+        static final XContentBuilderString _TYPE = new XContentBuilderString("_type");
+        static final XContentBuilderString _ID = new XContentBuilderString("_id");
+    }
+
 }
\ No newline at end of file