[CORE] Remove component settings from AbstractComponent

Today we have two ways of getting a setting, either with the full settings key or with only
the last part of the key where the prefix is implicit depending on the package the class is in via
component settings. this is trappy as well as confusing for users and can break easily if a class is moved
to a new package since the prefix then implicitly changes.
This commit removes the component settings from the codebase.

Author: s1monw

src/main/java/org/elasticsearch/action/admin/cluster/node/restart/TransportNodesRestartAction.java

@@ -61,7 +61,7 @@ public TransportNodesRestartAction(Settings settings, ClusterName clusterName, T
                                        Node node, ActionFilters actionFilters) {
         super(settings, NodesRestartAction.NAME, clusterName, threadPool, clusterService, transportService, actionFilters);
         this.node = node;
-        disabled = componentSettings.getAsBoolean("disabled", false);
+        disabled = this.settings.getAsBoolean("admin.cluster.node.restart.disabled", false);
     }
 
     @Override

src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java

@@ -62,8 +62,8 @@ public TransportNodesShutdownAction(Settings settings, TransportService transpor
         super(settings, NodesShutdownAction.NAME, transportService, clusterService, threadPool, actionFilters);
         this.node = node;
         this.clusterName = clusterName;
-        this.disabled = settings.getAsBoolean("action.disable_shutdown", componentSettings.getAsBoolean("disabled", false));
-        this.delay = componentSettings.getAsTime("delay", TimeValue.timeValueMillis(200));
+        this.disabled = settings.getAsBoolean("action.disable_shutdown", this.settings.getAsBoolean("action.admin.cluster.node.shutdown.disabled", false));
+        this.delay = this.settings.getAsTime("action.admin.cluster.node.shutdown.delay", TimeValue.timeValueMillis(200));
 
         this.transportService.registerHandler(SHUTDOWN_NODE_ACTION_NAME, new NodeShutdownRequestHandler());
     }

src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java

@@ -86,7 +86,7 @@ public TransportBulkAction(Settings settings, ThreadPool threadPool, TransportSe
         this.createIndexAction = createIndexAction;
 
         this.autoCreateIndex = new AutoCreateIndex(settings);
-        this.allowIdGeneration = componentSettings.getAsBoolean("action.allow_id_generation", true);
+        this.allowIdGeneration = this.settings.getAsBoolean("action.bulk.action.allow_id_generation", true);
     }
 
     @Override

src/main/java/org/elasticsearch/action/search/TransportSearchAction.java

@@ -69,7 +69,7 @@ public TransportSearchAction(Settings settings, ThreadPool threadPool,
         this.scanAction = scanAction;
         this.countAction = countAction;
 
-        this.optimizeSingleShard = componentSettings.getAsBoolean("optimize_single_shard", true);
+        this.optimizeSingleShard = this.settings.getAsBoolean("action.search.optimize_single_shard", true);
 
 
     }

src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java

@@ -38,10 +38,9 @@
 /** A recycler of fixed-size pages. */
 public class PageCacheRecycler extends AbstractComponent {
 
-    public static final String TYPE = "page.type";
-    public static final String LIMIT_HEAP = "page.limit.heap";
-    public static final String LIMIT_PER_THREAD = "page.limit.per_thread";
-    public static final String WEIGHT = "page.weight";
+    public static final String TYPE = "recycler.page.type";
+    public static final String LIMIT_HEAP = "recycler.page.limit.heap";
+    public static final String WEIGHT = "recycler.page.weight";
 
     private final Recycler<byte[]> bytePage;
     private final Recycler<int[]> intPage;
@@ -79,8 +78,8 @@ private static int maxCount(long limit, long pageSize, double weight, double tot
     @Inject
     public PageCacheRecycler(Settings settings, ThreadPool threadPool) {
         super(settings);
-        final Type type = Type.parse(componentSettings.get(TYPE));
-        final long limit = componentSettings.getAsMemory(LIMIT_HEAP, "10%").bytes();
+        final Type type = Type.parse(settings.get(TYPE));
+        final long limit = settings.getAsMemory(LIMIT_HEAP, "10%").bytes();
         final int availableProcessors = EsExecutors.boundedNumberOfProcessors(settings);
         final int searchThreadPoolSize = maximumSearchThreadPoolSize(threadPool, settings);
 
@@ -97,11 +96,11 @@ public PageCacheRecycler(Settings settings, ThreadPool threadPool) {
         // to direct ByteBuffers or sun.misc.Unsafe on a byte[] but this would have other issues
         // that would need to be addressed such as garbage collection of native memory or safety
         // of Unsafe writes.
-        final double bytesWeight = componentSettings.getAsDouble(WEIGHT + ".bytes", 1d);
-        final double intsWeight = componentSettings.getAsDouble(WEIGHT + ".ints", 1d);
-        final double longsWeight = componentSettings.getAsDouble(WEIGHT + ".longs", 1d);
+        final double bytesWeight = settings.getAsDouble(WEIGHT + ".bytes", 1d);
+        final double intsWeight = settings.getAsDouble(WEIGHT + ".ints", 1d);
+        final double longsWeight = settings.getAsDouble(WEIGHT + ".longs", 1d);
         // object pages are less useful to us so we give them a lower weight by default
-        final double objectsWeight = componentSettings.getAsDouble(WEIGHT + ".objects", 0.1d);
+        final double objectsWeight = settings.getAsDouble(WEIGHT + ".objects", 0.1d);
 
         final double totalWeight = bytesWeight + intsWeight + longsWeight + objectsWeight;
 

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

@@ -104,15 +104,15 @@ public TransportClientNodesService(Settings settings, ClusterName clusterName, T
         this.minCompatibilityVersion = version.minimumCompatibilityVersion();
         this.headers = headers;
 
-        this.nodesSamplerInterval = componentSettings.getAsTime("nodes_sampler_interval", timeValueSeconds(5));
-        this.pingTimeout = componentSettings.getAsTime("ping_timeout", timeValueSeconds(5)).millis();
-        this.ignoreClusterName = componentSettings.getAsBoolean("ignore_cluster_name", false);
+        this.nodesSamplerInterval = this.settings.getAsTime("client.transport.nodes_sampler_interval", timeValueSeconds(5));
+        this.pingTimeout = this.settings.getAsTime("client.transport.ping_timeout", timeValueSeconds(5)).millis();
+        this.ignoreClusterName = this.settings.getAsBoolean("client.transport.ignore_cluster_name", false);
 
         if (logger.isDebugEnabled()) {
             logger.debug("node_sampler_interval[" + nodesSamplerInterval + "]");
         }
 
-        if (componentSettings.getAsBoolean("sniff", false)) {
+        if (this.settings.getAsBoolean("client.transport.sniff", false)) {
             this.nodesSampler = new SniffNodesSampler();
         } else {
             this.nodesSampler = new SimpleNodeSampler();

src/main/java/org/elasticsearch/cluster/routing/RoutingService.java

@@ -70,7 +70,7 @@ public RoutingService(Settings settings, ThreadPool threadPool, ClusterService c
         this.threadPool = threadPool;
         this.clusterService = clusterService;
         this.allocationService = allocationService;
-        this.schedule = componentSettings.getAsTime("schedule", timeValueSeconds(10));
+        this.schedule = settings.getAsTime("cluster.routing.schedule", timeValueSeconds(10));
         clusterService.addFirst(this);
     }
 

src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java

@@ -117,7 +117,7 @@ public InternalClusterService(Settings settings, DiscoveryService discoveryServi
 
         this.nodeSettingsService.setClusterService(this);
 
-        this.reconnectInterval = componentSettings.getAsTime("reconnect_interval", TimeValue.timeValueSeconds(10));
+        this.reconnectInterval = this.settings.getAsTime("cluster.service.reconnect_interval", TimeValue.timeValueSeconds(10));
 
         localNodeMasterListeners = new LocalNodeMasterListeners(threadPool);
 

src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java

@@ -49,7 +49,7 @@ public FsBlobStore(Settings settings, Path path) throws IOException {
         super(settings);
         this.path = path;
         Files.createDirectories(path);
-        this.bufferSizeInBytes = (int) settings.getAsBytesSize("buffer_size", new ByteSizeValue(100, ByteSizeUnit.KB)).bytes();
+        this.bufferSizeInBytes = (int) settings.getAsBytesSize("repositories.fs.buffer_size", new ByteSizeValue(100, ByteSizeUnit.KB)).bytes();
     }
 
     @Override

src/main/java/org/elasticsearch/common/blobstore/url/URLBlobStore.java

@@ -57,7 +57,7 @@ public class URLBlobStore extends AbstractComponent implements BlobStore {
     public URLBlobStore(Settings settings, URL path) {
         super(settings);
         this.path = path;
-        this.bufferSizeInBytes = (int) settings.getAsBytesSize("buffer_size", new ByteSizeValue(100, ByteSizeUnit.KB)).bytes();
+        this.bufferSizeInBytes = (int) settings.getAsBytesSize("repositories.uri.buffer_size", new ByteSizeValue(100, ByteSizeUnit.KB)).bytes();
     }
 
     /**

src/main/java/org/elasticsearch/common/component/AbstractComponent.java

@@ -26,51 +26,26 @@
 /**
  *
  */
-public class AbstractComponent {
+public abstract class AbstractComponent {
 
     protected final ESLogger logger;
 
     protected final Settings settings;
 
-    protected final Settings componentSettings;
-
     public AbstractComponent(Settings settings) {
         this.logger = Loggers.getLogger(getClass(), settings);
         this.settings = settings;
-        this.componentSettings = settings.getComponentSettings(getClass());
-    }
-
-    public AbstractComponent(Settings settings, String prefixSettings) {
-        this.logger = Loggers.getLogger(getClass(), settings);
-        this.settings = settings;
-        this.componentSettings = settings.getComponentSettings(prefixSettings, getClass());
     }
 
     public AbstractComponent(Settings settings, Class customClass) {
         this.logger = Loggers.getLogger(customClass, settings);
         this.settings = settings;
-        this.componentSettings = settings.getComponentSettings(customClass);
-    }
-
-    public AbstractComponent(Settings settings, String prefixSettings, Class customClass) {
-        this.logger = Loggers.getLogger(customClass, settings);
-        this.settings = settings;
-        this.componentSettings = settings.getComponentSettings(prefixSettings, customClass);
-    }
-
-    public AbstractComponent(Settings settings, Class loggerClass, Class componentClass) {
-        this.logger = Loggers.getLogger(loggerClass, settings);
-        this.settings = settings;
-        this.componentSettings = settings.getComponentSettings(componentClass);
-    }
-
-    public AbstractComponent(Settings settings, String prefixSettings, Class loggerClass, Class componentClass) {
-        this.logger = Loggers.getLogger(loggerClass, settings);
-        this.settings = settings;
-        this.componentSettings = settings.getComponentSettings(prefixSettings, componentClass);
     }
 
-    public String nodeName() {
+    /**
+     * Returns the nodes name from the settings or the empty string if not set.
+     */
+    public final String nodeName() {
         return settings.get("name", "");
     }
 }

src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java

@@ -42,22 +42,6 @@ protected AbstractLifecycleComponent(Settings settings, Class customClass) {
         super(settings, customClass);
     }
 
-    protected AbstractLifecycleComponent(Settings settings, Class loggerClass, Class componentClass) {
-        super(settings, loggerClass, componentClass);
-    }
-
-    protected AbstractLifecycleComponent(Settings settings, String prefixSettings) {
-        super(settings, prefixSettings);
-    }
-
-    protected AbstractLifecycleComponent(Settings settings, String prefixSettings, Class customClass) {
-        super(settings, prefixSettings, customClass);
-    }
-
-    protected AbstractLifecycleComponent(Settings settings, String prefixSettings, Class loggerClass, Class componentClass) {
-        super(settings, prefixSettings, loggerClass, componentClass);
-    }
-
     @Override
     public Lifecycle.State lifecycleState() {
         return this.lifecycle.state();

src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java

@@ -188,27 +188,6 @@ private Object convertMapsToArrays(Map<String, Object> map) {
         return map;
     }
 
-
-    @Override
-    public Settings getComponentSettings(Class component) {
-        if (component.getName().startsWith("org.elasticsearch")) {
-            return getComponentSettings("org.elasticsearch", component);
-        }
-        // not starting with org.elasticsearch, just remove the first package part (probably org/net/com)
-        return getComponentSettings(component.getName().substring(0, component.getName().indexOf('.')), component);
-    }
-
-    @Override
-    public Settings getComponentSettings(String prefix, Class component) {
-        String type = component.getName();
-        if (!type.startsWith(prefix)) {
-            throw new SettingsException("Component [" + type + "] does not start with prefix [" + prefix + "]");
-        }
-        String settingPrefix = type.substring(prefix.length() + 1); // 1 for the '.'
-        settingPrefix = settingPrefix.substring(0, settingPrefix.length() - component.getSimpleName().length()); // remove the simple class name (keep the dot)
-        return getByPrefix(settingPrefix);
-    }
-
     @Override
     public Settings getByPrefix(String prefix) {
         Builder builder = new Builder();

src/main/java/org/elasticsearch/common/settings/Settings.java

@@ -41,19 +41,6 @@
  */
 public interface Settings extends ToXContent {
 
-    /**
-     * Component settings for a specific component. Returns all the settings for the given class, where the
-     * FQN of the class is used, without the <tt>org.elasticsearch<tt> prefix. If there is no <tt>org.elasticsearch</tt>
-     * prefix, then the prefix used is the first part of the package name (<tt>org</tt> / <tt>com</tt> / ...)
-     */
-    Settings getComponentSettings(Class component);
-
-    /**
-     * Component settings for a specific component. Returns all the settings for the given class, where the
-     * FQN of the class is used, without provided prefix.
-     */
-    Settings getComponentSettings(String prefix, Class component);
-
     /**
      * A settings that are filtered (and key is removed) with the specified prefix.
      */

src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java

@@ -31,7 +31,6 @@
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.cluster.node.DiscoveryNode;
-import org.elasticsearch.cluster.node.DiscoveryNodeService;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.routing.allocation.AllocationService;
 import org.elasticsearch.cluster.routing.allocation.RoutingAllocation;
@@ -103,7 +102,6 @@ public class ZenDiscovery extends AbstractLifecycleComponent<Discovery> implemen
     private final ClusterService clusterService;
     private AllocationService allocationService;
     private final ClusterName clusterName;
-    private final DiscoveryNodeService discoveryNodeService;
     private final DiscoverySettings discoverySettings;
     private final ZenPingService pingService;
     private final MasterFaultDetection masterFD;
@@ -150,20 +148,17 @@ public class ZenDiscovery extends AbstractLifecycleComponent<Discovery> implemen
     @Inject
     public ZenDiscovery(Settings settings, ClusterName clusterName, ThreadPool threadPool,
                         TransportService transportService, final ClusterService clusterService, NodeSettingsService nodeSettingsService,
-                        DiscoveryNodeService discoveryNodeService, ZenPingService pingService, ElectMasterService electMasterService,
+                        ZenPingService pingService, ElectMasterService electMasterService,
                         DiscoverySettings discoverySettings, @ClusterDynamicSettings DynamicSettings dynamicSettings) {
         super(settings);
         this.clusterName = clusterName;
         this.clusterService = clusterService;
         this.transportService = transportService;
-        this.discoveryNodeService = discoveryNodeService;
         this.discoverySettings = discoverySettings;
         this.pingService = pingService;
         this.electMaster = electMasterService;
-
-        // keep using componentSettings for BWC, in case this class gets extended.
-        TimeValue pingTimeout = componentSettings.getAsTime("initial_ping_timeout", timeValueSeconds(3));
-        pingTimeout = componentSettings.getAsTime("ping_timeout", pingTimeout);
+        TimeValue pingTimeout = this.settings.getAsTime("discovery.zen.initial_ping_timeout", timeValueSeconds(3));
+        pingTimeout = this.settings.getAsTime("discovery.zen.ping_timeout", pingTimeout);
         pingTimeout = settings.getAsTime("discovery.zen.ping_timeout", pingTimeout);
         this.pingTimeout = settings.getAsTime(SETTING_PING_TIMEOUT, pingTimeout);
 

src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java

@@ -55,7 +55,7 @@ public ZenPingService(Settings settings, ThreadPool threadPool, TransportService
                           Version version, ElectMasterService electMasterService, @Nullable Set<UnicastHostsProvider> unicastHostsProviders) {
         super(settings);
         ImmutableList.Builder<ZenPing> zenPingsBuilder = ImmutableList.builder();
-        if (componentSettings.getAsBoolean("multicast.enabled", true)) {
+        if (this.settings.getAsBoolean("discovery.zen.ping.multicast.enabled", true)) {
             zenPingsBuilder.add(new MulticastZenPing(settings, threadPool, transportService, clusterName, networkService, version));
         }
         // always add the unicast hosts, so it will be able to receive unicast requests even when working in multicast

src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java

@@ -97,13 +97,13 @@ public MulticastZenPing(Settings settings, ThreadPool threadPool, TransportServi
         this.networkService = networkService;
         this.version = version;
 
-        this.address = componentSettings.get("address");
-        this.port = componentSettings.getAsInt("port", 54328);
-        this.group = componentSettings.get("group", "224.2.2.4");
-        this.bufferSize = componentSettings.getAsInt("buffer_size", 2048);
-        this.ttl = componentSettings.getAsInt("ttl", 3);
+        this.address = this.settings.get("discovery.zen.ping.multicast.address");
+        this.port = this.settings.getAsInt("discovery.zen.ping.multicast.port", 54328);
+        this.group = this.settings.get("discovery.zen.ping.multicast.group", "224.2.2.4");
+        this.bufferSize = this.settings.getAsInt("discovery.zen.ping.multicast.buffer_size", 2048);
+        this.ttl = this.settings.getAsInt("discovery.zen.ping.multicast.ttl", 3);
 
-        this.pingEnabled = componentSettings.getAsBoolean("ping.enabled", true);
+        this.pingEnabled = this.settings.getAsBoolean("discovery.zen.ping.multicast.ping.enabled", true);
 
         logger.debug("using group [{}], with port [{}], ttl [{}], and address [{}]", group, port, ttl, address);
 
@@ -123,7 +123,7 @@ protected void doStart() throws ElasticsearchException {
         try {
             // we know OSX has bugs in the JVM when creating multiple instances of multicast sockets
             // causing for "socket close" exceptions when receive and/or crashes
-            boolean shared = componentSettings.getAsBoolean("shared", Constants.MAC_OS_X);
+            boolean shared = settings.getAsBoolean("discovery.zen.ping.multicast.shared", Constants.MAC_OS_X);
             multicastChannel = MulticastChannel.getChannel(nodeName(), shared,
                     new MulticastChannel.Config(port, group, bufferSize, ttl, networkService.resolvePublishHostAddress(address)),
                     new Receiver());

src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java

@@ -112,8 +112,8 @@ public UnicastZenPing(Settings settings, ThreadPool threadPool, TransportService
             }
         }
 
-        this.concurrentConnects = componentSettings.getAsInt("concurrent_connects", 10);
-        String[] hostArr = componentSettings.getAsArray("hosts");
+        this.concurrentConnects = this.settings.getAsInt("discovery.zen.ping.unicast.concurrent_connects", 10);
+        String[] hostArr = this.settings.getAsArray("discovery.zen.ping.unicast.hosts");
         // trim the hosts
         for (int i = 0; i < hostArr.length; i++) {
             hostArr[i] = hostArr[i].trim();

src/main/java/org/elasticsearch/gateway/GatewayAllocator.java

@@ -80,8 +80,8 @@ public GatewayAllocator(Settings settings,
         this.listGatewayStartedShards = listGatewayStartedShards;
         this.listShardStoreMetaData = listShardStoreMetaData;
 
-        this.listTimeout = componentSettings.getAsTime("list_timeout", settings.getAsTime("gateway.local.list_timeout", TimeValue.timeValueSeconds(30)));
-        this.initialShards = componentSettings.get("initial_shards", settings.get("gateway.local.initial_shards", "quorum"));
+        this.listTimeout = settings.getAsTime("gateway.list_timeout", settings.getAsTime("gateway.local.list_timeout", TimeValue.timeValueSeconds(30)));
+        this.initialShards = settings.get("gateway.initial_shards", settings.get("gateway.local.initial_shards", "quorum"));
 
         logger.debug("using initial_shards [{}], list_timeout [{}]", initialShards, listTimeout);
     }