diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-12-08 16:43:15 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-12-08 16:43:15 +0100 |
commit | a7f5024172bdb716eada086614bbccc84b7fa84c (patch) | |
tree | e6a802b7af94e3c88d15316488646a074969a611 /container-di/src/main | |
parent | 637e6d823a470eeff9b2d1f91bbb9faa11b39775 (diff) |
Support force reget config for tests
Diffstat (limited to 'container-di/src/main')
-rw-r--r-- | container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java | 2 | ||||
-rw-r--r-- | container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java | 2 |
2 files changed, 3 insertions, 1 deletions
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 44e38648230..cf80009f3f6 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 @@ -112,7 +112,7 @@ public final class ConfigRetriever { } private Optional<ConfigSnapshot> configIfChanged(Subscriber subscriber, - Function<Map<ConfigKey<? extends ConfigInstance>, ConfigInstance>, ConfigSnapshot> constructor) { + Function<Map<ConfigKey<? extends ConfigInstance>, ConfigInstance>, ConfigSnapshot> constructor) { if (subscriber.configChanged()) { return Optional.of(constructor.apply(Keys.covariantCopy(subscriber.config()))); } else { diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java index 005691721c4..be80fc1616d 100644 --- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java +++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java @@ -14,6 +14,7 @@ import java.util.Map; * @author ollivir */ public class Keys { + static Key<?> createKey(Type instanceType, Annotation annotation) { if (annotation == null) { return Key.get(instanceType); @@ -34,4 +35,5 @@ public class Keys { configs.forEach((k, v) -> ret.put(k, v)); return ret; } + } |