summaryrefslogtreecommitdiffstats
path: root/container-di
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-08-22 13:25:34 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-08-22 13:25:34 +0200
commit293bd00797bf0b46900b4f42bc71c6755739f78e (patch)
tree5981e4cb4e9b9b9e7d6f00106764773ad23c0e92 /container-di
parent55326aa9f686c6cb2a54d4a03c25f1b113bd10a3 (diff)
Nonfunctional changes only
Diffstat (limited to 'container-di')
-rw-r--r--container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java2
-rw-r--r--container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java2
-rw-r--r--container-di/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java3
-rw-r--r--container-di/src/main/java/com/yahoo/container/di/config/RestApiContext.java1
-rw-r--r--container-di/src/main/java/com/yahoo/container/di/config/Subscriber.java4
-rw-r--r--container-di/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java4
-rw-r--r--container-di/src/main/scala/com/yahoo/container/bundle/MockBundle.scala2
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala2
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala2
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/Container.scala2
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/Osgi.scala2
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala2
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala2
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.scala2
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/GuiceNode.scala2
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala3
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/Node.scala4
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala2
-rw-r--r--container-di/src/main/scala/com/yahoo/container/di/package.scala2
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]