diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2022-01-27 18:45:04 +0100 |
---|---|---|
committer | Ola Aunrønning <olaa@verizonmedia.com> | 2022-01-27 19:09:46 +0100 |
commit | 68c1ce17f179e428d41de19e8a9b160d6f2288bc (patch) | |
tree | 0cded612b3f16717d447aad5a366f5d10974189d /controller-api | |
parent | 72e7534a3fdc7d4a535302ed77af37c7a0708086 (diff) |
Keep one old version. Don't keep hash of entire package.
Diffstat (limited to 'controller-api')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java | 19 |
1 files changed, 6 insertions, 13 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 984035645ed..8fd5c8cfdd7 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 @@ -24,7 +24,7 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> { public static final ApplicationVersion unknown = new ApplicationVersion(Optional.empty(), OptionalLong.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), true, - Optional.empty(), Optional.empty()); + Optional.empty()); // This never changes and is only used to create a valid semantic version number, as required by application bundles private static final String majorVersion = "1.0"; @@ -37,13 +37,12 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> { private final Optional<String> sourceUrl; private final Optional<String> commit; private final boolean deployedDirectly; - private final Optional<String> applicationPackageHash; private final Optional<String> bundleHash; /** Public for serialisation only. */ public ApplicationVersion(Optional<SourceRevision> source, OptionalLong buildNumber, Optional<String> authorEmail, Optional<Version> compileVersion, Optional<Instant> buildTime, Optional<String> sourceUrl, - Optional<String> commit, boolean deployedDirectly, Optional<String> applicationPackageHash, Optional<String> bundleHash) { + Optional<String> commit, boolean deployedDirectly, Optional<String> bundleHash) { if (buildNumber.isEmpty() && ( source.isPresent() || authorEmail.isPresent() || compileVersion.isPresent() || buildTime.isPresent() || sourceUrl.isPresent() || commit.isPresent())) throw new IllegalArgumentException("Build number must be present if any other attribute is"); @@ -68,7 +67,6 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> { this.sourceUrl = Objects.requireNonNull(sourceUrl, "sourceUrl cannot be null"); this.commit = Objects.requireNonNull(commit, "commit cannot be null"); this.deployedDirectly = deployedDirectly; - this.applicationPackageHash = applicationPackageHash; this.bundleHash = bundleHash; } @@ -76,7 +74,7 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> { public static ApplicationVersion from(SourceRevision source, long buildNumber) { return new ApplicationVersion(Optional.of(source), OptionalLong.of(buildNumber), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), false, - Optional.empty(), Optional.empty()); + Optional.empty()); } /** Creates a version from a completed build, an author email, and build meta data. */ @@ -84,15 +82,15 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> { Version compileVersion, Instant buildTime) { return new ApplicationVersion(Optional.of(source), OptionalLong.of(buildNumber), Optional.of(authorEmail), Optional.of(compileVersion), Optional.of(buildTime), Optional.empty(), Optional.empty(), false, - Optional.empty(), Optional.empty()); + Optional.empty()); } /** Creates a version from a completed build, an author email, and build meta data. */ public static ApplicationVersion from(Optional<SourceRevision> source, long buildNumber, Optional<String> authorEmail, Optional<Version> compileVersion, Optional<Instant> buildTime, Optional<String> sourceUrl, Optional<String> commit, boolean deployedDirectly, - Optional<String> applicationPackageHash, Optional<String> bundleHash ) { - return new ApplicationVersion(source, OptionalLong.of(buildNumber), authorEmail, compileVersion, buildTime, sourceUrl, commit, deployedDirectly, applicationPackageHash, bundleHash); + Optional<String> bundleHash) { + return new ApplicationVersion(source, OptionalLong.of(buildNumber), authorEmail, compileVersion, buildTime, sourceUrl, commit, deployedDirectly, bundleHash); } /** Returns a unique identifier for this version or "unknown" if version is not known */ @@ -123,11 +121,6 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> { /** Returns the time this package was built, if known. */ public Optional<Instant> buildTime() { return buildTime; } - /** Returns the hash of entire application package */ - public Optional<String> applicationPackageHash() { - return applicationPackageHash; - } - /** Returns the hash of app package except deployment/build-meta data */ public Optional<String> bundleHash() { return bundleHash; |