summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-06-01 19:10:24 +0200
committerJon Bratseth <bratseth@oath.com>2018-06-01 19:10:24 +0200
commit1bbed4caefc0669acfd5b1c59bf9c836758c923a (patch)
tree126525fd6a88ea62fdc9a9bb89098f5697ae683c /config
parent046af25be3e947afad8a40644d484b31ca90a540 (diff)
Test internalRedepoy persistence
Diffstat (limited to 'config')
-rw-r--r--config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java1
-rw-r--r--config/src/main/java/com/yahoo/config/subscription/RawSource.java4
-rw-r--r--config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java1
-rw-r--r--config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java2
-rw-r--r--config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java1
5 files changed, 5 insertions, 4 deletions
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java b/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java
index bb29e329121..c0eb3e98157 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java
@@ -11,7 +11,6 @@ import com.yahoo.config.subscription.impl.ConfigSubscription;
*
* @param <T> the type of the config
* @author vegardh
- * @since 5.1
*/
public class ConfigHandle<T extends ConfigInstance> {
diff --git a/config/src/main/java/com/yahoo/config/subscription/RawSource.java b/config/src/main/java/com/yahoo/config/subscription/RawSource.java
index f9d79561c1c..d68b503eb74 100644
--- a/config/src/main/java/com/yahoo/config/subscription/RawSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/RawSource.java
@@ -3,11 +3,11 @@ package com.yahoo.config.subscription;
/**
* Source specifying raw config, where payload is given programmatically
- * @author vegardh
- * @since 5.1
*
+ * @author vegardh
*/
public class RawSource implements ConfigSource {
+
public final String payload;
/**
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
index 068b24cdf1a..69c57120577 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
@@ -15,6 +15,7 @@ import com.yahoo.vespa.config.protocol.JRTClientConfigRequest;
/**
* A JRT subscription which does not use the config class, but {@link com.yahoo.vespa.config.RawConfig} instead.
* Used by config proxy.
+ *
* @author vegardh
*
*/
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java
index b9787f76e0c..731a5f50816 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java
@@ -39,7 +39,7 @@ public class ConfigGetterTest {
assertThat(config, is(serviceConfig));
}
-@Test
+ @Test
public void testGetFromRawSource() {
ConfigGetter<AppConfig> getter = new ConfigGetter<>(new RawSource("message \"one\""), AppConfig.class);
AppConfig config = getter.getConfig("test");
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java
index 586ad7857f4..3aa422eb116 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java
@@ -3,6 +3,7 @@ package com.yahoo.config.subscription;
import com.yahoo.config.ConfigInstance;
import com.yahoo.config.ConfigurationRuntimeException;
+import com.yahoo.config.subscription.impl.GenericConfigHandle;
import com.yahoo.foo.SimpletypesConfig;
import com.yahoo.foo.AppConfig;
import com.yahoo.config.subscription.impl.ConfigSubscription;