diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-08-20 22:08:55 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-08-20 22:08:55 +0200 |
commit | d1b25cf8f5e8dfe9b97f87689d98d48e4f5e96e0 (patch) | |
tree | 71596d9c4f355642456df68aa5fb6bbb00eae598 /configserver | |
parent | 77c83cd870661cc6f00d8e767aebce8d8545b79c (diff) |
Simplify
Diffstat (limited to 'configserver')
3 files changed, 14 insertions, 14 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index c7a98623e8d..bf2fdbf03ef 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -373,7 +373,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye } if (useTenantMetaData.value()) - transaction.add(writeTenantMetaData(createMetaData(tenant), prepared.getApplicationId()).operations()); + transaction.add(writeTenantMetaData(tenant).operations()); return transaction; } @@ -382,15 +382,15 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye return new TenantMetaData(tenant.getSessionRepository().clock().instant()).asJsonString(); } - TenantMetaData getTenantMetaData(ApplicationId applicationId) { - Tenant tenant = getTenant(applicationId); + TenantMetaData getTenantMetaData(Tenant tenant) { Optional<byte[]> data = tenantRepository.getCurator().getData(TenantRepository.getTenantPath(tenant.getName())); return data.map(bytes -> TenantMetaData.fromJsonString(Utf8.toString(bytes))).orElse(new TenantMetaData(tenant.getCreatedTime())); } - private Transaction writeTenantMetaData(String jsonString, ApplicationId applicationId) { + private Transaction writeTenantMetaData(Tenant tenant) { + String jsonString = createMetaData(tenant); return new CuratorTransaction(tenantRepository.getCurator()) - .add(CuratorOperations.setData(TenantRepository.getTenantPath(applicationId.tenant()).getAbsolute(), + .add(CuratorOperations.setData(TenantRepository.getTenantPath(tenant.getName()).getAbsolute(), Utf8.toBytes(jsonString))); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantMetaData.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantMetaData.java index 6a91c757c3b..47a3dcc8ee0 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantMetaData.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantMetaData.java @@ -31,13 +31,6 @@ public class TenantMetaData { return lastDeployTimestamp; } - Slime getSlime() { - Slime slime = new Slime(); - Cursor meta = slime.setObject(); - meta.setLong("lastDeployTimestamp", lastDeployTimestamp.toEpochMilli()); - return slime; - } - public String asJsonString() { Slime slime = getSlime(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -62,4 +55,11 @@ public class TenantMetaData { } } + private Slime getSlime() { + Slime slime = new Slime(); + Cursor meta = slime.setObject(); + meta.setLong("lastDeployTimestamp", lastDeployTimestamp.toEpochMilli()); + return slime; + } + } 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 bf9048841de..239f103332c 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 @@ -168,7 +168,7 @@ public class ApplicationRepositoryTest { .requireActiveSessionOf(applicationId())); session.getAllocatedHosts(); - assertEquals(Instant.EPOCH, applicationRepository.getTenantMetaData(applicationId()).lastDeployTimestamp()); + assertEquals(Instant.EPOCH, applicationRepository.getTenantMetaData(tenant).lastDeployTimestamp()); } @Test @@ -189,7 +189,7 @@ public class ApplicationRepositoryTest { session.getAllocatedHosts(); assertEquals(deployTime.toEpochMilli(), - applicationRepository.getTenantMetaData(applicationId()).lastDeployTimestamp().toEpochMilli()); + applicationRepository.getTenantMetaData(tenant).lastDeployTimestamp().toEpochMilli()); } @Test |