From 5a97276296b1eef076b90b6858706a3720591e96 Mon Sep 17 00:00:00 2001 From: jonmv Date: Sat, 9 Apr 2022 19:44:01 +0200 Subject: Rename ApplicationVersion id to stringId --- .../controller/api/integration/deployment/ApplicationVersion.java | 5 +++-- .../java/com/yahoo/vespa/hosted/controller/application/Change.java | 2 +- .../yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 2 +- .../vespa/hosted/controller/deployment/InternalStepRunner.java | 4 ++-- .../java/com/yahoo/vespa/hosted/controller/deployment/Versions.java | 4 ++-- .../controller/restapi/application/ApplicationApiHandler.java | 4 ++-- .../vespa/hosted/controller/integration/ApplicationStoreMock.java | 2 +- .../com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java | 6 +++--- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java index ae9c5285be6..bb610ef80cd 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java @@ -94,7 +94,8 @@ public class ApplicationVersion implements Comparable { } /** Returns a unique identifier for this version or "unknown" if version is not known */ - public String id() { + // TODO jonmv: kill + public String stringId() { if (isUnknown()) return "unknown"; return source.map(SourceRevision::commit).map(ApplicationVersion::abbreviateCommit) @@ -168,7 +169,7 @@ public class ApplicationVersion implements Comparable { @Override public String toString() { - return "Application package version: " + id() + return "Application package version: " + stringId() + source.map(s -> ", " + s.toString()).orElse("") + authorEmail.map(e -> ", by " + e).orElse("") + compileVersion.map(v -> ", built against " + v).orElse("") diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java index 244fb952b3f..b5a4a2a71d7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java @@ -127,7 +127,7 @@ public final class Change { changes.add("pin to " + platform.map(Version::toString).orElse("current platform")); else platform.ifPresent(version -> changes.add("upgrade to " + version.toString())); - application.ifPresent(version -> changes.add("application change to " + version.id())); + application.ifPresent(version -> changes.add("application change to " + version.stringId())); changes.setEmptyValue("no change"); return changes.toString(); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java index 8f64d5210fd..ae180ec1192 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java @@ -495,7 +495,7 @@ public class DeploymentTrigger { public String toString() { return jobType + " for " + instanceId + " on (" + versions.targetPlatform() + versions.sourcePlatform().map(version -> " <-- " + version).orElse("") + - ", " + versions.targetApplication().id() + versions.sourceApplication().map(version -> " <-- " + version.id()).orElse("") + + ", " + versions.targetApplication().stringId() + versions.sourceApplication().map(version -> " <-- " + version.stringId()).orElse("") + "), ready since " + availableSince; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index ae61c98cffb..0df4c0015bd 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -185,14 +185,14 @@ public class InternalStepRunner implements StepRunner { logger.log("Deploying platform version " + versions.sourcePlatform().orElse(versions.targetPlatform()) + " and application version " + - versions.sourceApplication().orElse(versions.targetApplication()).id() + " ..."); + versions.sourceApplication().orElse(versions.targetApplication()).stringId() + " ..."); return deployReal(id, true, logger); } private Optional deployReal(RunId id, DualLogger logger) { Versions versions = controller.jobController().run(id).get().versions(); logger.log("Deploying platform version " + versions.targetPlatform() + - " and application version " + versions.targetApplication().id() + " ..."); + " and application version " + versions.targetApplication().stringId() + " ..."); return deployReal(id, false, logger); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java index d0b8e773cae..379cee22386 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java @@ -104,8 +104,8 @@ public class Versions { .map(source -> source + " -> ").orElse(""), targetPlatform, sourceApplication.filter(source -> !source.equals(targetApplication)) - .map(source -> source.id() + " -> ").orElse(""), - targetApplication.id()); + .map(source -> source.stringId() + " -> ").orElse(""), + targetApplication.stringId()); } /** Create versions using given change and application */ diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index dcc916cc5a3..eb2334086f5 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -1622,7 +1622,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { response.setString("nodes", withPathAndQuery("/zone/v2/" + deploymentId.zoneId().environment() + "/" + deploymentId.zoneId().region() + "/nodes/v2/node/", "recursive=true&application=" + deploymentId.applicationId().tenant() + "." + deploymentId.applicationId().application() + "." + deploymentId.applicationId().instance(), request.getUri()).toString()); response.setString("yamasUrl", monitoringSystemUri(deploymentId).toString()); response.setString("version", deployment.version().toFullString()); - response.setString("revision", deployment.applicationVersion().id()); + response.setString("revision", deployment.applicationVersion().stringId()); Instant lastDeploymentStart = lastDeploymentStart(deploymentId.applicationId(), deployment); response.setLong("deployTimeEpochMs", lastDeploymentStart.toEpochMilli()); controller.zoneRegistry().getDeploymentTimeToLive(deploymentId.zoneId()) @@ -1769,7 +1769,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { Cursor root = slime.setObject(); if ( ! instance.change().isEmpty()) { instance.change().platform().ifPresent(version -> root.setString("platform", version.toString())); - instance.change().application().ifPresent(applicationVersion -> root.setString("application", applicationVersion.id())); + instance.change().application().ifPresent(applicationVersion -> root.setString("application", applicationVersion.stringId())); root.setBool("pinned", instance.change().isPinned()); } return new SlimeJsonResponse(slime); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java index a1e7dd4efe3..bedae15824f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java @@ -53,7 +53,7 @@ public class ApplicationStoreMock implements ApplicationStore { byte[] bytes = store.get(appId(tenantAndApplicationId.tenant(), tenantAndApplicationId.application())).get(applicationVersion); if (bytes == null) throw new IllegalArgumentException("No application package found for " + tenantAndApplicationId + - " with version " + applicationVersion.id()); + " with version " + applicationVersion.stringId()); return bytes; } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java index 78341682f75..7b9a7fdf43b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java @@ -792,12 +792,12 @@ public class UpgraderTest { // New application change app.submit(applicationPackage("default")); - String applicationVersion = app.lastSubmission().get().id(); + String applicationVersion = app.lastSubmission().get().stringId(); // Application change recorded together with ongoing upgrade assertTrue("Change contains both upgrade and application change", app.instance().change().platform().get().equals(version) && - app.instance().change().application().get().id().equals(applicationVersion)); + app.instance().change().application().get().stringId().equals(applicationVersion)); // Deployment completes app.runJob(systemTest).runJob(stagingTest) @@ -807,7 +807,7 @@ public class UpgraderTest { for (Deployment deployment : app.instance().deployments().values()) { assertEquals(version, deployment.version()); - assertEquals(applicationVersion, deployment.applicationVersion().id()); + assertEquals(applicationVersion, deployment.applicationVersion().stringId()); } } -- cgit v1.2.3