Merge pull request #15354 from rjernst/just_node

Remove NodeBuilder

Author: rjernst

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

@@ -37,7 +37,6 @@
 import org.elasticsearch.monitor.os.OsProbe;
 import org.elasticsearch.monitor.process.ProcessProbe;
 import org.elasticsearch.node.Node;
-import org.elasticsearch.node.NodeBuilder;
 import org.elasticsearch.node.internal.InternalSettingsPreparer;
 
 import java.io.ByteArrayOutputStream;
@@ -80,11 +79,11 @@ public void run() {
             }
         });
     }
-    
+
     /** initialize native resources */
     public static void initializeNatives(Path tmpFile, boolean mlockAll, boolean seccomp, boolean ctrlHandler) {
         final ESLogger logger = Loggers.getLogger(Bootstrap.class);
-        
+
         // check if the user is running as root, and bail
         if (Natives.definitelyRunningAsRoot()) {
             if (Boolean.parseBoolean(System.getProperty("es.insecure.allow.root"))) {
@@ -93,12 +92,12 @@ public static void initializeNatives(Path tmpFile, boolean mlockAll, boolean sec
                 throw new RuntimeException("don't run elasticsearch as root.");
             }
         }
-        
+
         // enable secure computing mode
         if (seccomp) {
             Natives.trySeccomp(tmpFile);
         }
-        
+
         // mlockall if requested
         if (mlockAll) {
             if (Constants.WINDOWS) {
@@ -175,11 +174,10 @@ public void run() {
                 .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true)
                 .build();
 
-        NodeBuilder nodeBuilder = NodeBuilder.nodeBuilder().settings(nodeSettings);
-        node = nodeBuilder.build();
+        node = new Node(nodeSettings);
     }
-    
-    /** 
+
+    /**
      * option for elasticsearch.yml etc to turn off our security manager completely,
      * for example if you want to have your own configuration or just disable.
      */
@@ -322,7 +320,7 @@ static void init(String[] args) throws Throwable {
             if (foreground) {
                 Loggers.enableConsoleLogging();
             }
-            
+
             throw e;
         }
     }

core/src/main/java/org/elasticsearch/node/Node.java

@@ -108,8 +108,6 @@
 /**
  * A node represent a node within a cluster (<tt>cluster.name</tt>). The {@link #client()} can be used
  * in order to use a {@link Client} to perform actions/operations against the cluster.
- * <p>In order to create a node, the {@link NodeBuilder} can be used. When done with it, make sure to
- * call {@link #close()} on it.
  */
 public class Node implements Releasable {
 

core/src/main/java/org/elasticsearch/node/NodeBuilder.java

@@ -18,7 +18,7 @@
  */
 
 /**
- * Allow to build a {@link org.elasticsearch.node.Node} using {@link org.elasticsearch.node.NodeBuilder} which is a
+ * Allow to build a {@link org.elasticsearch.node.Node} which is a
  * node within the cluster.
  */
-package org.elasticsearch.node;
+package org.elasticsearch.node;

core/src/main/java/org/elasticsearch/node/package-info.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.tribe;
 
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
-
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterChangedEvent;
@@ -46,8 +45,6 @@
 import org.elasticsearch.discovery.DiscoveryService;
 import org.elasticsearch.gateway.GatewayService;
 import org.elasticsearch.node.Node;
-import org.elasticsearch.node.NodeBuilder;
-import org.elasticsearch.node.internal.InternalSettingsPreparer;
 import org.elasticsearch.rest.RestStatus;
 
 import java.util.EnumSet;

core/src/main/java/org/elasticsearch/tribe/TribeService.java

@@ -28,7 +28,6 @@
 import org.elasticsearch.indices.IndexAlreadyExistsException;
 import org.elasticsearch.monitor.jvm.JvmStats;
 import org.elasticsearch.node.Node;
-import org.elasticsearch.node.NodeBuilder;
 
 import java.io.IOException;
 import java.util.List;
@@ -46,13 +45,13 @@ public static void main(String[] args) throws IOException {
 
         Settings settings = Settings.settingsBuilder()
                 .put("node.master", false).build();
-        Node node1 = NodeBuilder.nodeBuilder().settings(
-                Settings.settingsBuilder().put(settings).put("node.master", true)
-        ).node();
+        Node node1 = new Node(
+                Settings.settingsBuilder().put(settings).put("node.master", true).build()
+        ).start();
 
         Node[] otherNodes = new Node[NUM_ADDITIONAL_NODES];
         for (int i = 0; i < otherNodes.length; i++) {
-            otherNodes[i] = NodeBuilder.nodeBuilder().settings(settings).node();
+            otherNodes[i] = new Node(settings).start();
         }
 
         Client client = node1.client();

core/src/test/java/org/elasticsearch/benchmark/aliases/AliasesBenchmark.java

@@ -27,7 +27,6 @@
 import org.elasticsearch.indices.IndexAlreadyExistsException;
 import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService;
 import org.elasticsearch.node.Node;
-import org.elasticsearch.node.NodeBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 
 import java.util.UUID;
@@ -123,7 +122,7 @@ public void run() {
     }
 
     public static void main(String args[]) throws Exception {
-        Node node = NodeBuilder.nodeBuilder().settings(Settings.settingsBuilder()).node();
+        Node node = new Node(Settings.EMPTY);
         final Client client = node.client();
         try {
             try {

core/src/test/java/org/elasticsearch/benchmark/breaker/CircuitBreakerBenchmark.java

@@ -21,21 +21,21 @@
 
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.StopWatch;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.SizeValue;
 import org.elasticsearch.node.Node;
-import org.elasticsearch.node.NodeBuilder;
 
 // simple test for embedded / single remote lookup
 public class SimpleGetActionBenchmark {
 
     public static void main(String[] args) {
         long OPERATIONS = SizeValue.parseSizeValue("300k").singles();
 
-        Node node = NodeBuilder.nodeBuilder().node();
+        Node node = new Node(Settings.EMPTY);
 
         Client client;
         if (false) {
-            client = NodeBuilder.nodeBuilder().client(true).node().client();
+            client = new Node(Settings.builder().put("node.client", true).build()).start().client();
         } else {
             client = node.client();
         }
@@ -52,4 +52,4 @@ public static void main(String[] args) {
 
         node.close();
     }
-}
+}

core/src/test/java/org/elasticsearch/benchmark/get/SimpleGetActionBenchmark.java

@@ -33,7 +33,6 @@
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.node.NodeBuilder.nodeBuilder;
 
 /**
  */
@@ -92,16 +91,12 @@ public static void main(String[] args) throws Exception {
                 .put("")
                 .put(SETTING_NUMBER_OF_SHARDS, 5)
                 .put(SETTING_NUMBER_OF_REPLICAS, 0)
+                .put("cluster.name",  ManyMappingsBenchmark.class.getSimpleName())
                 .build();
 
-        String clusterName = ManyMappingsBenchmark.class.getSimpleName();
-        Node node = nodeBuilder().clusterName(clusterName)
-                .settings(settingsBuilder().put(settings))
-                .node();
+        Node node = new Node(settings).start();
         if (TWO_NODES) {
-            Node node2 = nodeBuilder().clusterName(clusterName)
-                    .settings(settingsBuilder().put(settings))
-                    .node();
+            Node node2 = new Node(settings).start();
         }
 
         Client client = node.client();
@@ -153,4 +148,4 @@ public static void main(String[] args) throws Exception {
 
     }
 
-}
+}

core/src/test/java/org/elasticsearch/benchmark/mapping/ManyMappingsBenchmark.java

@@ -19,9 +19,9 @@
 package org.elasticsearch.benchmark.percolator;
 
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
-import org.elasticsearch.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.action.percolate.PercolateResponse;
 import org.elasticsearch.client.Client;
+import org.elasticsearch.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.common.StopWatch;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -37,7 +37,6 @@
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-import static org.elasticsearch.node.NodeBuilder.nodeBuilder;
 
 /**
  *
@@ -52,10 +51,10 @@ public static void main(String[] args) throws Exception {
 
         Node[] nodes = new Node[1];
         for (int i = 0; i < nodes.length; i++) {
-            nodes[i] = nodeBuilder().settings(settingsBuilder().put(settings).put("name", "node" + i)).node();
+            nodes[i] = new Node(settingsBuilder().put(settings).put("name", "node" + i).build()).start();
         }
 
-        Node clientNode = nodeBuilder().settings(settingsBuilder().put(settings).put("name", "client")).client(true).node();
+        Node clientNode = new Node(settingsBuilder().put(settings).put("name", "client").put("node.client", true).build()).start();
         Client client = clientNode.client();
 
         client.admin().indices().create(createIndexRequest("test")).actionGet();