diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-08-22 13:25:34 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-08-22 13:25:34 +0200 |
commit | 293bd00797bf0b46900b4f42bc71c6755739f78e (patch) | |
tree | 5981e4cb4e9b9b9e7d6f00106764773ad23c0e92 /container-di/src/main/java/com | |
parent | 55326aa9f686c6cb2a54d4a03c25f1b113bd10a3 (diff) |
Nonfunctional changes only
Diffstat (limited to 'container-di/src/main/java/com')
6 files changed, 10 insertions, 6 deletions
diff --git a/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java b/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java index e4f2415a733..add411051c2 100644 --- a/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java +++ b/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java @@ -9,7 +9,7 @@ import net.jcip.annotations.Immutable; /** * Specifies how a component should be instantiated from a bundle. * - * @author tonytv + * @author Tony Vaagenes */ @Immutable public final class BundleInstantiationSpecification { diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java index c9cbf3f4b29..a2d193654ea 100644 --- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java +++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java @@ -14,7 +14,7 @@ package com.yahoo.container.di.componentgraph; * does not provide a component instance.</li> * </ul> * - * @author tonytv + * @author Tony Vaagenes * @author gjoranv */ public interface Provider<T> { diff --git a/container-di/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java b/container-di/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java index 528b487d51c..c88f851909c 100644 --- a/container-di/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java +++ b/container-di/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java @@ -3,10 +3,11 @@ package com.yahoo.container.di.config; /** * @author gjoranv - * @since 5.17 */ public class ResolveDependencyException extends RuntimeException { + public ResolveDependencyException(String message) { super(message); } + } diff --git a/container-di/src/main/java/com/yahoo/container/di/config/RestApiContext.java b/container-di/src/main/java/com/yahoo/container/di/config/RestApiContext.java index a13aa62f487..7b5f85778c6 100644 --- a/container-di/src/main/java/com/yahoo/container/di/config/RestApiContext.java +++ b/container-di/src/main/java/com/yahoo/container/di/config/RestApiContext.java @@ -20,7 +20,6 @@ import java.util.Set; * Only for internal JDisc use. * * @author gjoranv - * @since 5.11 */ public class RestApiContext { diff --git a/container-di/src/main/java/com/yahoo/container/di/config/Subscriber.java b/container-di/src/main/java/com/yahoo/container/di/config/Subscriber.java index c7592ea011e..9fd30f888b9 100644 --- a/container-di/src/main/java/com/yahoo/container/di/config/Subscriber.java +++ b/container-di/src/main/java/com/yahoo/container/di/config/Subscriber.java @@ -7,10 +7,11 @@ import com.yahoo.vespa.config.ConfigKey; import java.util.Map; /** - * @author tonytv + * @author Tony Vaagenes * @author gjoranv */ public interface Subscriber { + long waitNextGeneration(); long generation(); @@ -18,4 +19,5 @@ public interface Subscriber { Map<ConfigKey<ConfigInstance>, ConfigInstance> config(); void close(); + } diff --git a/container-di/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java b/container-di/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java index 83845519372..c1c36a1b3de 100644 --- a/container-di/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java +++ b/container-di/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java @@ -8,11 +8,13 @@ import com.yahoo.vespa.config.ConfigKey; import java.util.Set; /** - * @author tonytv + * @author Tony Vaagenes * @author gjoranv */ @ProvidedBy(CloudSubscriberFactory.Provider.class) public interface SubscriberFactory { + Subscriber getSubscriber(Set<? extends ConfigKey<?>> configKeys); void reloadActiveSubscribers(long generation); + } |