Move from CamelCase to '_' casing, closes #116.

Author: kimchy

.idea/dictionaries/kimchy.xml

@@ -53,29 +53,27 @@ public class TransportDeleteAction extends TransportShardReplicationOperationAct
                                          TransportCreateIndexAction createIndexAction) {
         super(settings, transportService, clusterService, indicesService, threadPool, shardStateAction);
         this.createIndexAction = createIndexAction;
-        this.autoCreateIndex = componentSettings.getAsBoolean("autoCreateIndex", true);
+        this.autoCreateIndex = settings.getAsBoolean("action.auto_create_index", true);
     }
 
     @Override protected void doExecute(final DeleteRequest deleteRequest, final ActionListener<DeleteResponse> listener) {
-        if (autoCreateIndex) {
-            if (!clusterService.state().metaData().hasConcreteIndex(deleteRequest.index())) {
-                createIndexAction.execute(new CreateIndexRequest(deleteRequest.index()), new ActionListener<CreateIndexResponse>() {
-                    @Override public void onResponse(CreateIndexResponse result) {
-                        TransportDeleteAction.super.doExecute(deleteRequest, listener);
-                    }
+        if (autoCreateIndex && !clusterService.state().metaData().hasConcreteIndex(deleteRequest.index())) {
+            createIndexAction.execute(new CreateIndexRequest(deleteRequest.index()), new ActionListener<CreateIndexResponse>() {
+                @Override public void onResponse(CreateIndexResponse result) {
+                    TransportDeleteAction.super.doExecute(deleteRequest, listener);
+                }
 
-                    @Override public void onFailure(Throwable e) {
-                        if (ExceptionsHelper.unwrapCause(e) instanceof IndexAlreadyExistsException) {
-                            // we have the index, do it
-                            TransportDeleteAction.super.doExecute(deleteRequest, listener);
-                        } else {
-                            listener.onFailure(e);
-                        }
+                @Override public void onFailure(Throwable e) {
+                    if (ExceptionsHelper.unwrapCause(e) instanceof IndexAlreadyExistsException) {
+                        // we have the index, do it
+                        TransportDeleteAction.super.doExecute(deleteRequest, listener);
+                    } else {
+                        listener.onFailure(e);
                     }
-                });
-            } else {
-                super.doExecute(deleteRequest, listener);
-            }
+                }
+            });
+        } else {
+            super.doExecute(deleteRequest, listener);
         }
     }
 

modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java

@@ -69,8 +69,8 @@ public class TransportIndexAction extends TransportShardReplicationOperationActi
         super(settings, transportService, clusterService, indicesService, threadPool, shardStateAction);
         this.createIndexAction = createIndexAction;
         this.mappingUpdatedAction = mappingUpdatedAction;
-        this.autoCreateIndex = settings.getAsBoolean("action.autoCreateIndex", true);
-        this.allowIdGeneration = componentSettings.getAsBoolean("allowIdGeneration", true);
+        this.autoCreateIndex = settings.getAsBoolean("action.auto_create_index", true);
+        this.allowIdGeneration = componentSettings.getAsBoolean("allow_id_generation", true);
     }
 
     @Override protected void doExecute(final IndexRequest indexRequest, final ActionListener<IndexResponse> listener) {

modules/elasticsearch/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java

@@ -58,7 +58,7 @@ public class MoreLikeThisRequest implements ActionRequest {
     private String[] fields;
 
     private float percentTermsToMatch = -1;
-    private int minTermFrequency = -1;
+    private int minTermFreq = -1;
     private int maxQueryTerms = -1;
     private String[] stopWords = null;
     private int minDocFreq = -1;
@@ -165,16 +165,16 @@ public float percentTermsToMatch() {
     /**
      * The frequency below which terms will be ignored in the source doc. Defaults to <tt>2</tt>.
      */
-    public MoreLikeThisRequest minTermFrequency(int minTermFrequency) {
-        this.minTermFrequency = minTermFrequency;
+    public MoreLikeThisRequest minTermFreq(int minTermFreq) {
+        this.minTermFreq = minTermFreq;
         return this;
     }
 
     /**
      * The frequency below which terms will be ignored in the source doc. Defaults to <tt>2</tt>.
      */
-    public int minTermFrequency() {
-        return this.minTermFrequency;
+    public int minTermFreq() {
+        return this.minTermFreq;
     }
 
     /**
@@ -470,7 +470,7 @@ public Scroll searchScroll() {
         }
 
         percentTermsToMatch = in.readFloat();
-        minTermFrequency = in.readVInt();
+        minTermFreq = in.readVInt();
         maxQueryTerms = in.readVInt();
         size = in.readVInt();
         if (size > 0) {
@@ -539,7 +539,7 @@ public Scroll searchScroll() {
         }
 
         out.writeFloat(percentTermsToMatch);
-        out.writeVInt(minTermFrequency);
+        out.writeVInt(minTermFreq);
         out.writeVInt(maxQueryTerms);
         if (stopWords == null) {
             out.writeVInt(0);

modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java

@@ -227,7 +227,7 @@ private void addMoreLikeThis(MoreLikeThisRequest request, BoolJsonQueryBuilder b
                 .maxDocFreq(request.maxDocFreq())
                 .minWordLen(request.minWordLen())
                 .maxWordLen(request.maxWordLen())
-                .minTermFrequency(request.minTermFrequency())
+                .minTermFreq(request.minTermFreq())
                 .maxQueryTerms(request.maxQueryTerms())
                 .stopWords(request.stopWords());
         boolBuilder.should(mlt);

modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java

@@ -126,7 +126,7 @@ public String scrollId() {
                 builder.startObject();
                 if (shardFailure.shard() != null) {
                     builder.field("index", shardFailure.shard().index());
-                    builder.field("shardId", shardFailure.shard().shardId());
+                    builder.field("shard", shardFailure.shard().shardId());
                 }
                 builder.field("reason", shardFailure.reason());
                 builder.endObject();

modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchResponse.java

@@ -45,7 +45,9 @@
 import static org.elasticsearch.util.settings.ImmutableSettings.*;
 
 /**
- * @author kimchy (Shay Banon)
+ * A main entry point when starting from the command line.
+ *
+ * @author kimchy (shay.banon)
  */
 public class Bootstrap {
 

modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java

@@ -84,7 +84,11 @@ public class TransportClientNodesService extends AbstractComponent implements Cl
         this.transportService = transportService;
         this.threadPool = threadPool;
 
-        this.nodesSamplerInterval = componentSettings.getAsTime("nodesSamplerInterval", timeValueSeconds(1));
+        this.nodesSamplerInterval = componentSettings.getAsTime("nodes_sampler_interval", timeValueSeconds(1));
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("node_sampler_interval[" + nodesSamplerInterval + "]");
+        }
 
         this.nodesSamplerFuture = threadPool.scheduleWithFixedDelay(nodesSampler, nodesSamplerInterval);
 

modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java

@@ -45,9 +45,9 @@
 @Immutable
 public class IndexMetaData {
 
-    public static final String SETTING_NUMBER_OF_SHARDS = "index.numberOfShards";
+    public static final String SETTING_NUMBER_OF_SHARDS = "index.number_of_shards";
 
-    public static final String SETTING_NUMBER_OF_REPLICAS = "index.numberOfReplicas";
+    public static final String SETTING_NUMBER_OF_REPLICAS = "index.number_of_replicas";
 
     private final String index;
 

modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java

@@ -43,7 +43,7 @@ public class DiscoveryService extends AbstractLifecycleComponent<DiscoveryServic
     @Inject public DiscoveryService(Settings settings, Discovery discovery) {
         super(settings);
         this.discovery = discovery;
-        this.initialStateTimeout = componentSettings.getAsTime("initialStateTimeout", TimeValue.timeValueSeconds(30));
+        this.initialStateTimeout = componentSettings.getAsTime("initial_state_timeout", TimeValue.timeValueSeconds(30));
     }
 
     @Override protected void doStart() throws ElasticSearchException {