diff options
6 files changed, 8 insertions, 6 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; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java index 8074dd35267..945c7d60750 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java @@ -48,7 +48,7 @@ public class ZooKeeperClientTest extends TestWithCurator { "/bar/baz", "appName", 1345L, - false, + true, 3L, 2L)); Map<Version, FileRegistry> fileRegistries = createFileRegistries(); @@ -104,7 +104,7 @@ public class ZooKeeperClientTest extends TestWithCurator { // TODO: Evaluate if we want this or not @Test @Ignore - public void testFeedComponentsFileReferencesToZooKeeper() throws IOException { + public void testFeedComponentsFileReferencesToZooKeeper() { final String appDir = "src/test/apps/app_sdbundles"; ConfigCurator zk = ConfigCurator.create(new MockCurator()); BaseDeployLogger logger = new BaseDeployLogger(); @@ -127,6 +127,7 @@ public class ZooKeeperClientTest extends TestWithCurator { ApplicationMetaData metaData = ApplicationMetaData.fromJsonString(zk.getData(appPath, ConfigCurator.META_ZK_PATH)); assertThat(metaData.getApplicationName(), is("appName")); assertTrue(metaData.getCheckSum().length() > 0); + assertTrue(metaData.isInternalRedeploy()); assertThat(metaData.getDeployedByUser(), is("foo")); assertThat(metaData.getDeployPath(), is("/bar/baz")); assertThat(metaData.getDeployTimestamp(), is(1345l)); |