From 5e94f384c41fecc94c412c3162863c93895dfe4c Mon Sep 17 00:00:00 2001 From: Przemyslaw Gomulka Date: Wed, 16 Jan 2019 09:05:30 +0100 Subject: [PATCH] Remove the use of AbstracLifecycleComponent constructor #37488 (#37488) The AbstracLifecycleComponent used to extend AbstractComponent, so it had to pass settings to the constractor of its supper class. It no longer extends the AbstractComponent so there is no need for this constructor There is also no need for AbstracLifecycleComponent subclasses to have Settings in their constructors if they were only passing it over to super constructor. This is part 1. which will be backported to 6.x with a migration guide/deprecation log. part 2 will have this constructor removed in 7 relates #35560 relates #34488 --- .../azure/classic/management/AzureComputeServiceImpl.java | 1 - .../org/elasticsearch/cloud/gce/GceMetadataService.java | 1 - .../org/elasticsearch/cluster/NodeConnectionsService.java | 1 - .../elasticsearch/cluster/coordination/Coordinator.java | 1 - .../cluster/routing/DelayedAllocationService.java | 4 +--- .../org/elasticsearch/cluster/routing/RoutingService.java | 4 +--- .../cluster/service/ClusterApplierService.java | 1 - .../org/elasticsearch/cluster/service/ClusterService.java | 1 - .../org/elasticsearch/cluster/service/MasterService.java | 1 - .../common/component/AbstractLifecycleComponent.java | 3 +++ .../discovery/UnicastConfiguredHostsResolver.java | 1 - .../discovery/single/SingleNodeDiscovery.java | 1 - .../org/elasticsearch/discovery/zen/ZenDiscovery.java | 1 - .../java/org/elasticsearch/gateway/GatewayService.java | 1 - .../elasticsearch/http/AbstractHttpServerTransport.java | 1 - .../java/org/elasticsearch/indices/IndicesService.java | 1 - .../indices/breaker/CircuitBreakerService.java | 4 +--- .../indices/breaker/HierarchyCircuitBreakerService.java | 2 +- .../indices/breaker/NoneCircuitBreakerService.java | 3 +-- .../indices/cluster/IndicesClusterStateService.java | 1 - .../java/org/elasticsearch/monitor/MonitorService.java | 1 - .../elasticsearch/monitor/jvm/JvmGcMonitorService.java | 1 - .../repositories/blobstore/BlobStoreRepository.java | 1 - .../main/java/org/elasticsearch/search/SearchService.java | 1 - .../elasticsearch/snapshots/SnapshotShardsService.java | 1 - .../org/elasticsearch/snapshots/SnapshotsService.java | 1 - .../java/org/elasticsearch/transport/TcpTransport.java | 1 - .../org/elasticsearch/transport/TransportService.java | 1 - .../org/elasticsearch/watcher/ResourceWatcherService.java | 1 - .../cluster/routing/DelayedAllocationServiceTests.java | 8 ++++---- .../cluster/routing/RoutingServiceTests.java | 3 +-- .../elasticsearch/common/network/NetworkModuleTests.java | 3 --- .../org/elasticsearch/index/shard/IndexShardTests.java | 1 - .../java/org/elasticsearch/rest/RestControllerTests.java | 1 - .../elasticsearch/snapshots/SnapshotsServiceTests.java | 2 +- .../java/org/elasticsearch/test/MockHttpTransport.java | 5 ----- .../src/main/java/org/elasticsearch/xpack/ccr/Ccr.java | 2 +- .../org/elasticsearch/xpack/ccr/CcrRepositoryManager.java | 1 - .../elasticsearch/xpack/ccr/repository/CcrRepository.java | 1 - .../xpack/ccr/repository/CcrRestoreSourceService.java | 4 ---- .../ccr/repository/CcrRestoreSourceServiceTests.java | 2 +- .../java/org/elasticsearch/license/LicenseService.java | 1 - .../elasticsearch/xpack/monitoring/MonitoringService.java | 1 - .../xpack/monitoring/cleaner/CleanerService.java | 1 - .../xpack/monitoring/exporter/Exporters.java | 1 - .../xpack/monitoring/MonitoringServiceTests.java | 1 - 46 files changed, 16 insertions(+), 65 deletions(-) diff --git a/plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/management/AzureComputeServiceImpl.java b/plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/management/AzureComputeServiceImpl.java index 710dfa7e71d..b8e885b9470 100644 --- a/plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/management/AzureComputeServiceImpl.java +++ b/plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/management/AzureComputeServiceImpl.java @@ -52,7 +52,6 @@ public class AzureComputeServiceImpl extends AbstractLifecycleComponent private final String serviceName; public AzureComputeServiceImpl(Settings settings) { - super(settings); String subscriptionId = getRequiredSetting(settings, Management.SUBSCRIPTION_ID_SETTING); serviceName = getRequiredSetting(settings, Management.SERVICE_NAME_SETTING); diff --git a/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceMetadataService.java b/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceMetadataService.java index 248d9a04479..1fae7e63854 100644 --- a/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceMetadataService.java +++ b/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceMetadataService.java @@ -53,7 +53,6 @@ public class GceMetadataService extends AbstractLifecycleComponent { private HttpTransport gceHttpTransport; public GceMetadataService(Settings settings) { - super(settings); this.settings = settings; } diff --git a/server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java b/server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java index 80107658540..90526aaa9fd 100644 --- a/server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java +++ b/server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java @@ -75,7 +75,6 @@ public class NodeConnectionsService extends AbstractLifecycleComponent { @Inject public NodeConnectionsService(Settings settings, ThreadPool threadPool, TransportService transportService) { - super(settings); this.threadPool = threadPool; this.transportService = transportService; this.reconnectInterval = NodeConnectionsService.CLUSTER_NODE_RECONNECT_INTERVAL_SETTING.get(settings); diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java b/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java index 805eef9a89c..72fe2e081de 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java @@ -145,7 +145,6 @@ public class Coordinator extends AbstractLifecycleComponent implements Discovery NamedWriteableRegistry namedWriteableRegistry, AllocationService allocationService, MasterService masterService, Supplier persistedStateSupplier, UnicastHostsProvider unicastHostsProvider, ClusterApplier clusterApplier, Collection> onJoinValidators, Random random) { - super(settings); this.settings = settings; this.transportService = transportService; this.masterService = masterService; diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java b/server/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java index b8fb432f311..9349de94a66 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java @@ -30,7 +30,6 @@ import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.inject.Inject; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.common.util.concurrent.FutureUtils; @@ -130,9 +129,8 @@ public class DelayedAllocationService extends AbstractLifecycleComponent impleme } @Inject - public DelayedAllocationService(Settings settings, ThreadPool threadPool, ClusterService clusterService, + public DelayedAllocationService(ThreadPool threadPool, ClusterService clusterService, AllocationService allocationService) { - super(settings); this.threadPool = threadPool; this.clusterService = clusterService; this.allocationService = allocationService; diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java index 5d711cabce7..57f7a313942 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java @@ -30,7 +30,6 @@ import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.Priority; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.inject.Inject; -import org.elasticsearch.common.settings.Settings; import java.util.concurrent.atomic.AtomicBoolean; @@ -57,8 +56,7 @@ public class RoutingService extends AbstractLifecycleComponent { private AtomicBoolean rerouting = new AtomicBoolean(); @Inject - public RoutingService(Settings settings, ClusterService clusterService, AllocationService allocationService) { - super(settings); + public RoutingService(ClusterService clusterService, AllocationService allocationService) { this.clusterService = clusterService; this.allocationService = allocationService; } diff --git a/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java b/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java index 5bd441419d1..fa3d4997efb 100644 --- a/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java +++ b/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java @@ -102,7 +102,6 @@ public class ClusterApplierService extends AbstractLifecycleComponent implements private NodeConnectionsService nodeConnectionsService; public ClusterApplierService(String nodeName, Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool) { - super(settings); this.clusterSettings = clusterSettings; this.threadPool = threadPool; this.state = new AtomicReference<>(); diff --git a/server/src/main/java/org/elasticsearch/cluster/service/ClusterService.java b/server/src/main/java/org/elasticsearch/cluster/service/ClusterService.java index 12d45c4fb88..f66ca073895 100644 --- a/server/src/main/java/org/elasticsearch/cluster/service/ClusterService.java +++ b/server/src/main/java/org/elasticsearch/cluster/service/ClusterService.java @@ -78,7 +78,6 @@ public class ClusterService extends AbstractLifecycleComponent { public ClusterService(Settings settings, ClusterSettings clusterSettings, MasterService masterService, ClusterApplierService clusterApplierService) { - super(settings); this.settings = settings; this.nodeName = Node.NODE_NAME_SETTING.get(settings); this.masterService = masterService; diff --git a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java index 472ffcd73ef..50cf4ffe9de 100644 --- a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java +++ b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java @@ -87,7 +87,6 @@ public class MasterService extends AbstractLifecycleComponent { private volatile Batcher taskBatcher; public MasterService(String nodeName, Settings settings, ThreadPool threadPool) { - super(settings); this.nodeName = nodeName; // TODO: introduce a dedicated setting for master service this.slowTaskLoggingThreshold = CLUSTER_SERVICE_SLOW_TASK_LOGGING_THRESHOLD_SETTING.get(settings); diff --git a/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java b/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java index f7dc6c55506..2caaa43fbcd 100644 --- a/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java +++ b/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java @@ -34,6 +34,9 @@ public abstract class AbstractLifecycleComponent implements LifecycleComponent { private final List listeners = new CopyOnWriteArrayList<>(); + protected AbstractLifecycleComponent() {} + + @Deprecated protected AbstractLifecycleComponent(Settings settings) { // TODO drop settings from ctor } diff --git a/server/src/main/java/org/elasticsearch/discovery/UnicastConfiguredHostsResolver.java b/server/src/main/java/org/elasticsearch/discovery/UnicastConfiguredHostsResolver.java index 5200d9d36f6..fcc716a7785 100644 --- a/server/src/main/java/org/elasticsearch/discovery/UnicastConfiguredHostsResolver.java +++ b/server/src/main/java/org/elasticsearch/discovery/UnicastConfiguredHostsResolver.java @@ -56,7 +56,6 @@ public class UnicastConfiguredHostsResolver extends AbstractLifecycleComponent i public UnicastConfiguredHostsResolver(String nodeName, Settings settings, TransportService transportService, UnicastHostsProvider hostsProvider) { - super(settings); this.settings = settings; this.nodeName = nodeName; this.transportService = transportService; diff --git a/server/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java b/server/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java index 238f72f72f4..2a415a74cd0 100644 --- a/server/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java +++ b/server/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java @@ -59,7 +59,6 @@ public class SingleNodeDiscovery extends AbstractLifecycleComponent implements D public SingleNodeDiscovery(final Settings settings, final TransportService transportService, final MasterService masterService, final ClusterApplier clusterApplier, final GatewayMetaState gatewayMetaState) { - super(Objects.requireNonNull(settings)); this.clusterName = ClusterName.CLUSTER_NAME_SETTING.get(settings); this.transportService = Objects.requireNonNull(transportService); masterService.setClusterStateSupplier(() -> clusterState); diff --git a/server/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/server/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java index 05d0bfa2718..0ee69bbfeec 100644 --- a/server/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/server/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -161,7 +161,6 @@ public class ZenDiscovery extends AbstractLifecycleComponent implements Discover NamedWriteableRegistry namedWriteableRegistry, MasterService masterService, ClusterApplier clusterApplier, ClusterSettings clusterSettings, UnicastHostsProvider hostsProvider, AllocationService allocationService, Collection> onJoinValidators, GatewayMetaState gatewayMetaState) { - super(settings); this.onJoinValidators = JoinTaskExecutor.addBuiltInJoinValidators(onJoinValidators); this.masterService = masterService; this.clusterApplier = clusterApplier; diff --git a/server/src/main/java/org/elasticsearch/gateway/GatewayService.java b/server/src/main/java/org/elasticsearch/gateway/GatewayService.java index 1574874634c..c71ae402350 100644 --- a/server/src/main/java/org/elasticsearch/gateway/GatewayService.java +++ b/server/src/main/java/org/elasticsearch/gateway/GatewayService.java @@ -95,7 +95,6 @@ public class GatewayService extends AbstractLifecycleComponent implements Cluste final ThreadPool threadPool, final TransportNodesListGatewayMetaState listGatewayMetaState, final IndicesService indicesService, final Discovery discovery) { - super(settings); this.allocationService = allocationService; this.clusterService = clusterService; this.threadPool = threadPool; diff --git a/server/src/main/java/org/elasticsearch/http/AbstractHttpServerTransport.java b/server/src/main/java/org/elasticsearch/http/AbstractHttpServerTransport.java index 4b53ac902d9..92f305cb67a 100644 --- a/server/src/main/java/org/elasticsearch/http/AbstractHttpServerTransport.java +++ b/server/src/main/java/org/elasticsearch/http/AbstractHttpServerTransport.java @@ -87,7 +87,6 @@ public abstract class AbstractHttpServerTransport extends AbstractLifecycleCompo protected AbstractHttpServerTransport(Settings settings, NetworkService networkService, BigArrays bigArrays, ThreadPool threadPool, NamedXContentRegistry xContentRegistry, Dispatcher dispatcher) { - super(settings); this.settings = settings; this.networkService = networkService; this.bigArrays = bigArrays; diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java index e3c1a77b843..b881ba73a28 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -205,7 +205,6 @@ public class IndicesService extends AbstractLifecycleComponent ScriptService scriptService, Client client, MetaStateService metaStateService, Collection>> engineFactoryProviders, Map> indexStoreFactories) { - super(settings); this.settings = settings; this.threadPool = threadPool; this.pluginsService = pluginsService; diff --git a/server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java b/server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java index cc6b7d5ef85..90a814b29b3 100644 --- a/server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java +++ b/server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java @@ -23,7 +23,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.component.AbstractLifecycleComponent; -import org.elasticsearch.common.settings.Settings; /** * Interface for Circuit Breaker services, which provide breakers to classes @@ -32,8 +31,7 @@ import org.elasticsearch.common.settings.Settings; public abstract class CircuitBreakerService extends AbstractLifecycleComponent { private static final Logger logger = LogManager.getLogger(CircuitBreakerService.class); - protected CircuitBreakerService(Settings settings) { - super(settings); + protected CircuitBreakerService() { } /** diff --git a/server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java b/server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java index 31ee4b82869..48045e21925 100644 --- a/server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java +++ b/server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java @@ -104,7 +104,7 @@ public class HierarchyCircuitBreakerService extends CircuitBreakerService { private final AtomicLong parentTripCount = new AtomicLong(0); public HierarchyCircuitBreakerService(Settings settings, ClusterSettings clusterSettings) { - super(settings); + super(); this.fielddataSettings = new BreakerSettings(CircuitBreaker.FIELDDATA, FIELDDATA_CIRCUIT_BREAKER_LIMIT_SETTING.get(settings).getBytes(), FIELDDATA_CIRCUIT_BREAKER_OVERHEAD_SETTING.get(settings), diff --git a/server/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java b/server/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java index c686412bc29..69de18e380b 100644 --- a/server/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java +++ b/server/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java @@ -21,7 +21,6 @@ package org.elasticsearch.indices.breaker; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.breaker.NoopCircuitBreaker; -import org.elasticsearch.common.settings.Settings; /** * Class that returns a breaker that never breaks @@ -31,7 +30,7 @@ public class NoneCircuitBreakerService extends CircuitBreakerService { private final CircuitBreaker breaker = new NoopCircuitBreaker(CircuitBreaker.FIELDDATA); public NoneCircuitBreakerService() { - super(Settings.EMPTY); + super(); } @Override diff --git a/server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java index 41050d7d474..c8afe92be8d 100644 --- a/server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java +++ b/server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java @@ -171,7 +171,6 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent imple final SnapshotShardsService snapshotShardsService, final PrimaryReplicaSyncer primaryReplicaSyncer, final Consumer globalCheckpointSyncer) { - super(settings); this.settings = settings; this.buildInIndexListener = Arrays.asList( diff --git a/server/src/main/java/org/elasticsearch/monitor/MonitorService.java b/server/src/main/java/org/elasticsearch/monitor/MonitorService.java index 9467bf29923..df914873324 100644 --- a/server/src/main/java/org/elasticsearch/monitor/MonitorService.java +++ b/server/src/main/java/org/elasticsearch/monitor/MonitorService.java @@ -42,7 +42,6 @@ public class MonitorService extends AbstractLifecycleComponent { public MonitorService(Settings settings, NodeEnvironment nodeEnvironment, ThreadPool threadPool, ClusterInfoService clusterInfoService) throws IOException { - super(settings); this.jvmGcMonitorService = new JvmGcMonitorService(settings, threadPool); this.osService = new OsService(settings); this.processService = new ProcessService(settings); diff --git a/server/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java index 94c66c79d2e..70de50710c9 100644 --- a/server/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java +++ b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java @@ -107,7 +107,6 @@ public class JvmGcMonitorService extends AbstractLifecycleComponent { } public JvmGcMonitorService(Settings settings, ThreadPool threadPool) { - super(settings); this.threadPool = threadPool; this.enabled = ENABLED_SETTING.get(settings); diff --git a/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java index 9f2297b4877..c8cdf0d4e03 100644 --- a/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java +++ b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java @@ -228,7 +228,6 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp * @param settings Settings for the node this repository object is created on */ protected BlobStoreRepository(RepositoryMetaData metadata, Settings settings, NamedXContentRegistry namedXContentRegistry) { - super(settings); this.settings = settings; this.metadata = metadata; this.namedXContentRegistry = namedXContentRegistry; diff --git a/server/src/main/java/org/elasticsearch/search/SearchService.java b/server/src/main/java/org/elasticsearch/search/SearchService.java index f6e91c03af6..4fee6842762 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchService.java +++ b/server/src/main/java/org/elasticsearch/search/SearchService.java @@ -193,7 +193,6 @@ public class SearchService extends AbstractLifecycleComponent implements IndexEv public SearchService(ClusterService clusterService, IndicesService indicesService, ThreadPool threadPool, ScriptService scriptService, BigArrays bigArrays, FetchPhase fetchPhase, ResponseCollectorService responseCollectorService) { - super(clusterService.getSettings()); Settings settings = clusterService.getSettings(); this.threadPool = threadPool; this.clusterService = clusterService; diff --git a/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java index c0e196f1f4e..6b7b5061143 100644 --- a/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java +++ b/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java @@ -119,7 +119,6 @@ public class SnapshotShardsService extends AbstractLifecycleComponent implements public SnapshotShardsService(Settings settings, ClusterService clusterService, SnapshotsService snapshotsService, ThreadPool threadPool, TransportService transportService, IndicesService indicesService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) { - super(settings); this.indicesService = indicesService; this.snapshotsService = snapshotsService; this.transportService = transportService; diff --git a/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java index 65802377be0..e76dde27455 100644 --- a/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java +++ b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java @@ -124,7 +124,6 @@ public class SnapshotsService extends AbstractLifecycleComponent implements Clus @Inject public SnapshotsService(Settings settings, ClusterService clusterService, IndexNameExpressionResolver indexNameExpressionResolver, RepositoriesService repositoriesService, ThreadPool threadPool) { - super(settings); this.clusterService = clusterService; this.indexNameExpressionResolver = indexNameExpressionResolver; this.repositoriesService = repositoriesService; diff --git a/server/src/main/java/org/elasticsearch/transport/TcpTransport.java b/server/src/main/java/org/elasticsearch/transport/TcpTransport.java index a10bad9e88b..dd6a21acc8f 100644 --- a/server/src/main/java/org/elasticsearch/transport/TcpTransport.java +++ b/server/src/main/java/org/elasticsearch/transport/TcpTransport.java @@ -156,7 +156,6 @@ public abstract class TcpTransport extends AbstractLifecycleComponent implements public TcpTransport(String transportName, Settings settings, Version version, ThreadPool threadPool, PageCacheRecycler pageCacheRecycler, CircuitBreakerService circuitBreakerService, NamedWriteableRegistry namedWriteableRegistry, NetworkService networkService) { - super(settings); this.settings = settings; this.profileSettings = getProfileSettings(settings); this.version = version; diff --git a/server/src/main/java/org/elasticsearch/transport/TransportService.java b/server/src/main/java/org/elasticsearch/transport/TransportService.java index b5e97ac3ae6..57aaba67151 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportService.java @@ -155,7 +155,6 @@ public class TransportService extends AbstractLifecycleComponent implements Tran public TransportService(Settings settings, Transport transport, ThreadPool threadPool, TransportInterceptor transportInterceptor, Function localNodeFactory, @Nullable ClusterSettings clusterSettings, Set taskHeaders, ConnectionManager connectionManager) { - super(settings); // The only time we do not want to validate node connections is when this is a transport client using the simple node sampler this.validateConnections = TransportClient.CLIENT_TYPE.equals(settings.get(Client.CLIENT_TYPE_SETTING_S.getKey())) == false || TransportClient.CLIENT_TRANSPORT_SNIFF.get(settings); diff --git a/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java b/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java index 3edab68e158..4216bd817b6 100644 --- a/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java +++ b/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java @@ -90,7 +90,6 @@ public class ResourceWatcherService extends AbstractLifecycleComponent { @Inject public ResourceWatcherService(Settings settings, ThreadPool threadPool) { - super(settings); this.enabled = ENABLED.get(settings); this.threadPool = threadPool; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java index e38f09e567a..b168bae87de 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java @@ -69,7 +69,7 @@ public class DelayedAllocationServiceTests extends ESAllocationTestCase { threadPool = new TestThreadPool(getTestName()); clusterService = mock(ClusterService.class); allocationService = createAllocationService(Settings.EMPTY, new DelayedShardsMockGatewayAllocator()); - delayedAllocationService = new TestDelayAllocationService(Settings.EMPTY, threadPool, clusterService, allocationService); + delayedAllocationService = new TestDelayAllocationService(threadPool, clusterService, allocationService); verify(clusterService).addListener(delayedAllocationService); } @@ -464,9 +464,9 @@ public class DelayedAllocationServiceTests extends ESAllocationTestCase { private static class TestDelayAllocationService extends DelayedAllocationService { private volatile long nanoTimeOverride = -1L; - TestDelayAllocationService(Settings settings, ThreadPool threadPool, ClusterService clusterService, - AllocationService allocationService) { - super(settings, threadPool, clusterService, allocationService); + private TestDelayAllocationService(ThreadPool threadPool, ClusterService clusterService, + AllocationService allocationService) { + super(threadPool, clusterService, allocationService); } @Override diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java index 09b957069a6..f9d3e0ab95c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.routing; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.cluster.ESAllocationTestCase; import org.junit.Before; @@ -47,7 +46,7 @@ public class RoutingServiceTests extends ESAllocationTestCase { private AtomicBoolean rerouted = new AtomicBoolean(); TestRoutingService() { - super(Settings.EMPTY, null, null); + super(null, null); } public boolean hasReroutedAndClear() { diff --git a/server/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java b/server/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java index 0dbc3efe075..32cc6785d57 100644 --- a/server/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java +++ b/server/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java @@ -72,9 +72,6 @@ public class NetworkModuleTests extends ESTestCase { } static class FakeHttpTransport extends AbstractLifecycleComponent implements HttpServerTransport { - FakeHttpTransport() { - super(null); - } @Override protected void doStart() {} @Override diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index d2a73caa32d..0d58239fd4a 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -3126,7 +3126,6 @@ public class IndexShardTests extends IndexShardTestCase { private final String indexName; RestoreOnlyRepository(String indexName) { - super(Settings.EMPTY); this.indexName = indexName; } diff --git a/server/src/test/java/org/elasticsearch/rest/RestControllerTests.java b/server/src/test/java/org/elasticsearch/rest/RestControllerTests.java index 29cbb8f48ec..c04dc7be026 100644 --- a/server/src/test/java/org/elasticsearch/rest/RestControllerTests.java +++ b/server/src/test/java/org/elasticsearch/rest/RestControllerTests.java @@ -474,7 +474,6 @@ public class RestControllerTests extends ESTestCase { HttpServerTransport { TestHttpServerTransport() { - super(Settings.EMPTY); } @Override diff --git a/server/src/test/java/org/elasticsearch/snapshots/SnapshotsServiceTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotsServiceTests.java index 5cd75df22a4..1531744a13c 100644 --- a/server/src/test/java/org/elasticsearch/snapshots/SnapshotsServiceTests.java +++ b/server/src/test/java/org/elasticsearch/snapshots/SnapshotsServiceTests.java @@ -463,7 +463,7 @@ public class SnapshotsServiceTests extends ESTestCase { transportService, indicesService, actionFilters, indexNameExpressionResolver); final ShardStateAction shardStateAction = new ShardStateAction( clusterService, transportService, allocationService, - new RoutingService(settings, clusterService, allocationService), + new RoutingService(clusterService, allocationService), deterministicTaskQueue.getThreadPool() ); indicesClusterStateService = new IndicesClusterStateService( diff --git a/test/framework/src/main/java/org/elasticsearch/test/MockHttpTransport.java b/test/framework/src/main/java/org/elasticsearch/test/MockHttpTransport.java index 5955bcead67..f9dec4ee1ec 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/MockHttpTransport.java +++ b/test/framework/src/main/java/org/elasticsearch/test/MockHttpTransport.java @@ -20,7 +20,6 @@ package org.elasticsearch.test; import org.elasticsearch.common.component.AbstractLifecycleComponent; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.BoundTransportAddress; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.http.HttpInfo; @@ -46,10 +45,6 @@ public class MockHttpTransport extends AbstractLifecycleComponent implements Htt private static final HttpInfo DUMMY_HTTP_INFO = new HttpInfo(DUMMY_BOUND_ADDRESS, 0); private static final HttpStats DUMMY_HTTP_STATS = new HttpStats(0, 0); - public MockHttpTransport() { - super(Settings.EMPTY); - } - @Override protected void doStart() {} diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java index 370d017a4bd..8bbacac3d80 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java @@ -157,7 +157,7 @@ public class Ccr extends Plugin implements ActionPlugin, PersistentTaskPlugin, E return emptyList(); } - CcrRestoreSourceService restoreSourceService = new CcrRestoreSourceService(settings); + CcrRestoreSourceService restoreSourceService = new CcrRestoreSourceService(); this.restoreSourceService.set(restoreSourceService); return Arrays.asList( ccrLicenseChecker, diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrRepositoryManager.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrRepositoryManager.java index 54403df3678..c1a28b72cf8 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrRepositoryManager.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrRepositoryManager.java @@ -29,7 +29,6 @@ class CcrRepositoryManager extends AbstractLifecycleComponent { private final RemoteSettingsUpdateListener updateListener; CcrRepositoryManager(Settings settings, ClusterService clusterService, Client client) { - super(settings); this.client = client; updateListener = new RemoteSettingsUpdateListener(settings); updateListener.listenForUpdates(clusterService.getClusterSettings()); diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java index 025892f80d8..5c3e0edda61 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java @@ -84,7 +84,6 @@ public class CcrRepository extends AbstractLifecycleComponent implements Reposit private final CcrLicenseChecker ccrLicenseChecker; public CcrRepository(RepositoryMetaData metadata, Client client, CcrLicenseChecker ccrLicenseChecker, Settings settings) { - super(settings); this.metadata = metadata; assert metadata.name().startsWith(NAME_PREFIX) : "CcrRepository metadata.name() must start with: " + NAME_PREFIX; this.remoteClusterAlias = Strings.split(metadata.name(), NAME_PREFIX)[1]; diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceService.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceService.java index 197d5ddbf38..785600dd5f8 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceService.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceService.java @@ -48,10 +48,6 @@ public class CcrRestoreSourceService extends AbstractLifecycleComponent implemen private final CopyOnWriteArrayList> openSessionListeners = new CopyOnWriteArrayList<>(); private final CopyOnWriteArrayList> closeSessionListeners = new CopyOnWriteArrayList<>(); - public CcrRestoreSourceService(Settings settings) { - super(settings); - } - @Override public synchronized void afterIndexShardClosed(ShardId shardId, @Nullable IndexShard indexShard, Settings indexSettings) { if (indexShard != null) { diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceServiceTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceServiceTests.java index efcd93e90fd..c0b7863edf2 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceServiceTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceServiceTests.java @@ -29,7 +29,7 @@ public class CcrRestoreSourceServiceTests extends IndexShardTestCase { @Before public void setUp() throws Exception { super.setUp(); - restoreSourceService = new CcrRestoreSourceService(Settings.EMPTY); + restoreSourceService = new CcrRestoreSourceService(); } public void testOpenSession() throws IOException { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseService.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseService.java index dbf11026f47..68e094511a3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseService.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseService.java @@ -121,7 +121,6 @@ public class LicenseService extends AbstractLifecycleComponent implements Cluste public LicenseService(Settings settings, ClusterService clusterService, Clock clock, Environment env, ResourceWatcherService resourceWatcherService, XPackLicenseState licenseState) { - super(settings); this.settings = settings; this.clusterService = clusterService; this.clock = clock; diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringService.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringService.java index 8759d493c8b..1aa7ef230a3 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringService.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringService.java @@ -91,7 +91,6 @@ public class MonitoringService extends AbstractLifecycleComponent { MonitoringService(Settings settings, ClusterService clusterService, ThreadPool threadPool, Set collectors, Exporters exporters) { - super(settings); this.clusterService = Objects.requireNonNull(clusterService); this.threadPool = Objects.requireNonNull(threadPool); this.collectors = Objects.requireNonNull(collectors); diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java index f9f41974402..e6af45ee2bc 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java @@ -40,7 +40,6 @@ public class CleanerService extends AbstractLifecycleComponent { CleanerService(Settings settings, ClusterSettings clusterSettings, XPackLicenseState licenseState, ThreadPool threadPool, ExecutionScheduler executionScheduler) { - super(settings); this.licenseState = licenseState; this.threadPool = threadPool; this.executionScheduler = executionScheduler; diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java index 54d4fde4fbb..484361ddc54 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java @@ -51,7 +51,6 @@ public class Exporters extends AbstractLifecycleComponent { public Exporters(Settings settings, Map factories, ClusterService clusterService, XPackLicenseState licenseState, ThreadContext threadContext) { - super(settings); this.settings = settings; this.factories = factories; this.exporters = new AtomicReference<>(emptyMap()); diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringServiceTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringServiceTests.java index 3d23933f8dc..f67b828606d 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringServiceTests.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringServiceTests.java @@ -173,7 +173,6 @@ public class MonitoringServiceTests extends ESTestCase { private final CountDownLatch latch; BlockingExporter(CountDownLatch latch) { - super(); this.latch = latch; }