aboutsummaryrefslogtreecommitdiffstats
path: root/container-di
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-06-09 23:14:07 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-06-09 23:14:07 +0200
commitef539860356ebcfe316ac8adc75aa183ab764ab4 (patch)
tree5ed3403cb6350177ab59243cfb13948a6bd493d2 /container-di
parent20513f2cb1f9c65406c32dd717e738d394fc1d1b (diff)
Deliver search chains config to ExecutionFactory
Diffstat (limited to 'container-di')
-rw-r--r--container-di/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java1
-rw-r--r--container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java3
-rw-r--r--container-di/src/main/java/com/yahoo/container/di/Container.java6
3 files changed, 5 insertions, 5 deletions
diff --git a/container-di/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java b/container-di/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java
index 0851f69a366..bd3d146cfec 100644
--- a/container-di/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java
+++ b/container-di/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java
@@ -63,6 +63,7 @@ public class CloudSubscriberFactory implements SubscriberFactory {
}
private static class CloudSubscriber implements Subscriber {
+
private final ConfigSubscriber subscriber;
private final Map<ConfigKey<ConfigInstance>, ConfigHandle<ConfigInstance>> handles = new HashMap<>();
diff --git a/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java b/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java
index 337997f8ac2..fde4ecfd33a 100644
--- a/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java
+++ b/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java
@@ -24,6 +24,7 @@ import static com.yahoo.log.LogLevel.DEBUG;
* @author ollivir
*/
public final class ConfigRetriever {
+
private static final Logger log = Logger.getLogger(ConfigRetriever.class.getName());
private final Set<ConfigKey<? extends ConfigInstance>> bootstrapKeys;
@@ -33,7 +34,7 @@ public final class ConfigRetriever {
private final Function<Set<ConfigKey<? extends ConfigInstance>>, Subscriber> subscribe;
public ConfigRetriever(Set<ConfigKey<? extends ConfigInstance>> bootstrapKeys,
- Function<Set<ConfigKey<? extends ConfigInstance>>, Subscriber> subscribe) {
+ Function<Set<ConfigKey<? extends ConfigInstance>>, Subscriber> subscribe) {
this.bootstrapKeys = bootstrapKeys;
this.componentSubscriberKeys = new HashSet<>();
this.subscribe = subscribe;
diff --git a/container-di/src/main/java/com/yahoo/container/di/Container.java b/container-di/src/main/java/com/yahoo/container/di/Container.java
index 24e5dcef838..0c534b0673c 100644
--- a/container-di/src/main/java/com/yahoo/container/di/Container.java
+++ b/container-di/src/main/java/com/yahoo/container/di/Container.java
@@ -190,12 +190,10 @@ public class Container {
}
private ComponentGraph createComponentsGraph(Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> configsIncludingBootstrapConfigs,
- long generation, Injector fallbackInjector) {
-
+ long generation, Injector fallbackInjector) {
previousConfigGeneration = generation;
ComponentGraph graph = new ComponentGraph(generation);
-
ComponentsConfig componentsConfig = getConfig(componentsConfigKey, configsIncludingBootstrapConfigs);
if (componentsConfig == null) {
throw new ConfigurationRuntimeException("The set of all configs does not include a valid 'components' config. Config set: "
@@ -250,7 +248,7 @@ public class Container {
}
public static <T extends ConfigInstance> T getConfig(ConfigKey<T> key,
- Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> configs) {
+ Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> configs) {
ConfigInstance inst = configs.get(key);
if (inst == null || key.getConfigClass() == null) {