summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-09-09 14:35:28 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-09-09 14:35:28 +0200
commit86bac1de301ac4ba17e2b12e6341556eb562b095 (patch)
treedf988da32d202eaf55d47ee393ae52579e67098c /configserver
parent01b61de4db4be59d86298d540aaa948c68185585 (diff)
Minor fixes
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java1
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java2
2 files changed, 2 insertions, 1 deletions
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());
}