diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-09-09 14:35:28 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-09-09 14:35:28 +0200 |
commit | 86bac1de301ac4ba17e2b12e6341556eb562b095 (patch) | |
tree | df988da32d202eaf55d47ee393ae52579e67098c | |
parent | 01b61de4db4be59d86298d540aaa948c68185585 (diff) |
Minor fixes
5 files changed, 17 insertions, 1 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index 8d83d16a272..04cb9fd6acc 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -73,13 +73,16 @@ "methods": [ "public void <init>(java.io.File, java.lang.String, java.lang.String, java.lang.Long, boolean, java.lang.String, java.lang.Long, long)", "public void <init>(java.lang.String, java.lang.String, java.lang.Long, boolean, java.lang.String, java.lang.String, java.lang.Long, long)", + "public void <init>(java.lang.String, java.lang.String, java.lang.Long, boolean, com.yahoo.config.provision.ApplicationId, java.lang.String, java.lang.Long, long)", "public java.lang.String getApplicationName()", "public java.lang.String getDeployedByUser()", "public java.lang.String getDeployPath()", + "public com.yahoo.config.provision.ApplicationId getApplicationId()", "public java.lang.Long getDeployTimestamp()", "public java.lang.Long getGeneration()", "public boolean isInternalRedeploy()", "public java.lang.String getCheckSum()", + "public java.lang.String getChecksum()", "public long getPreviousActiveGeneration()", "public java.lang.String toString()", "public static com.yahoo.config.application.api.ApplicationMetaData fromJsonString(java.lang.String)", diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java index 3af0df53cba..858952727ae 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java @@ -116,6 +116,7 @@ public class ZKApplicationPackage implements ApplicationPackage { } @Override + @SuppressWarnings("deprecation") public String getApplicationName() { return metaData.getApplicationId().application().value(); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java index 25ddddbdf11..5731caff5a7 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java @@ -133,7 +133,7 @@ public class ApplicationRepositoryTest { assertNotEquals(sessionId, originalSessionId); assertEquals(originalApplicationMetaData.getApplicationId(), applicationMetaData.getApplicationId()); - assertEquals(originalApplicationMetaData.getPreviousActiveGeneration(), applicationMetaData.getGeneration().longValue()); + assertEquals(originalApplicationMetaData.getGeneration().longValue(), applicationMetaData.getPreviousActiveGeneration()); assertNotEquals(originalApplicationMetaData.getGeneration(), applicationMetaData.getGeneration()); assertEquals(originalApplicationMetaData.getDeployedByUser(), applicationMetaData.getDeployedByUser()); } diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml index 0d433a3dbd8..52986be7465 100644 --- a/documentgen-test/pom.xml +++ b/documentgen-test/pom.xml @@ -44,6 +44,12 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config-provisioning</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml index 1aad4857f49..d290f005b5e 100644 --- a/vespa-documentgen-plugin/pom.xml +++ b/vespa-documentgen-plugin/pom.xml @@ -32,6 +32,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>config-provisioning</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>config-model</artifactId> <version>${project.version}</version> </dependency> |