From 86bac1de301ac4ba17e2b12e6341556eb562b095 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 9 Sep 2019 14:35:28 +0200 Subject: Minor fixes --- .../com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java | 1 + .../java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'configserver') 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()); } -- cgit v1.2.3