diff options
author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-08-22 23:15:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-22 23:15:01 +0200 |
commit | 37b53e6a3314b5798a0e2f0a4a9bdc4e7e915aae (patch) | |
tree | ffc487888b90b02c0c22789331065ea633453104 /container-di/src | |
parent | b2275825fc3348f598679a395674469aa7cec616 (diff) | |
parent | 293bd00797bf0b46900b4f42bc71c6755739f78e (diff) |
Merge pull request #3182 from vespa-engine/bratseth/cleanup
Nonfunctional changes only
Diffstat (limited to 'container-di/src')
19 files changed, 22 insertions, 23 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); + } diff --git a/container-di/src/main/scala/com/yahoo/container/bundle/MockBundle.scala b/container-di/src/main/scala/com/yahoo/container/bundle/MockBundle.scala index 9975a9fe0c2..5a28d9abe2a 100644 --- a/container-di/src/main/scala/com/yahoo/container/bundle/MockBundle.scala +++ b/container-di/src/main/scala/com/yahoo/container/bundle/MockBundle.scala @@ -13,9 +13,7 @@ import MockBundle._ import org.osgi.resource.{Capability, Wire, Requirement} /** - * * @author gjoranv - * @since 5.15 */ class MockBundle extends Bundle with BundleWiring { diff --git a/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala b/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala index cf047503d71..23ae21ae84e 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala @@ -15,7 +15,7 @@ import scala.language.existentials /** - * @author tonytv + * @author Tony Vaagenes */ class CloudSubscriberFactory(configSource: ConfigSource) extends SubscriberFactory diff --git a/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala b/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala index ac5f9bb589f..994162695d3 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala @@ -14,7 +14,7 @@ import scala.collection.JavaConverters._ import scala.language.postfixOps /** - * @author tonytv + * @author Tony Vaagenes * @author gjoranv */ final class ConfigRetriever(bootstrapKeys: Set[ConfigKeyT], diff --git a/container-di/src/main/scala/com/yahoo/container/di/Container.scala b/container-di/src/main/scala/com/yahoo/container/di/Container.scala index af73730afa2..c82625bae3b 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/Container.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/Container.scala @@ -26,7 +26,7 @@ import scala.math.max /** * * @author gjoranv - * @author tonytv + * @author Tony Vaagenes */ class Container( subscriberFactory: SubscriberFactory, diff --git a/container-di/src/main/scala/com/yahoo/container/di/Osgi.scala b/container-di/src/main/scala/com/yahoo/container/di/Osgi.scala index e159e67aabf..3407eceae3e 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/Osgi.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/Osgi.scala @@ -10,7 +10,7 @@ import com.yahoo.component.ComponentSpecification /** * * @author gjoranv - * @author tonytv + * @author Tony Vaagenes */ trait Osgi { diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala index f27dfc54b75..92f489798c9 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala @@ -28,7 +28,7 @@ import scala.Some import scala.language.existentials /** - * @author tonytv + * @author Tony Vaagenes * @author gjoranv */ @NotThreadSafe diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala index c41c3d13045..0dca08b020a 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala @@ -19,7 +19,7 @@ import scala.concurrent.{Await, Future, TimeoutException} import scala.language.postfixOps /** - * @author tonytv + * @author Tony Vaagenes * @author gjoranv */ class ComponentNode(componentId: ComponentId, diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.scala index a0e07e7433e..9c7e2ba322f 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.scala @@ -9,7 +9,7 @@ import com.google.inject.util.Types import Node.syntheticComponentId /** - * @author tonytv + * @author Tony Vaagenes * @author gjoranv */ class ComponentRegistryNode(val componentClass : Class[AnyRef]) diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/GuiceNode.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/GuiceNode.scala index c4cdb200e04..26fb0e0d3d8 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/GuiceNode.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/GuiceNode.scala @@ -7,7 +7,7 @@ import Node.syntheticComponentId import GuiceNode._ /** - * @author tonytv + * @author Tony Vaagenes * @author gjoranv */ final class GuiceNode(myInstance: AnyRef, diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala index aeae227f4cb..68353c47124 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala @@ -18,8 +18,7 @@ import scala.collection.JavaConverters._ * Represents an instance of RestApiContext * * @author gjoranv - * @author tonytv - * @since 5.15 + * @author Tony Vaagenes */ class JerseyNode(componentId: ComponentId, override val configId: String, diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/Node.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/Node.scala index 6c58d857c86..9e6124cff2c 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/Node.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/Node.scala @@ -7,10 +7,8 @@ import com.yahoo.container.di.componentgraph.Provider import com.google.inject.Key import Node._ - - /** - * @author tonytv + * @author Tony Vaagenes * @author gjoranv */ abstract class Node(val componentId: ComponentId) { diff --git a/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala b/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala index 489760dcbc8..3769eed6d2d 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala @@ -19,7 +19,7 @@ import scala.collection.JavaConverters._ /** * Tested by com.yahoo.application.container.jersey.JerseyTest - * @author tonytv + * @author Tony Vaagenes */ object OsgiUtil { private val log = Logger.getLogger(getClass.getName) diff --git a/container-di/src/main/scala/com/yahoo/container/di/package.scala b/container-di/src/main/scala/com/yahoo/container/di/package.scala index e580d928ebb..cccb0242e8b 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/package.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/package.scala @@ -12,7 +12,7 @@ import scala.language.implicitConversions /** * * @author gjoranv - * @author tonytv + * @author Tony Vaagenes */ package object di { type ConfigKeyT = ConfigKey[_ <: ConfigInstance] |