diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-05-06 10:46:58 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-05-06 11:29:38 +0200 |
commit | 776dc24d57f0d9f49412eeb33e4c912c7fe561c9 (patch) | |
tree | f1bc0b14a0d66533c9ce11bb4aaba9297c5b4b46 /controller-api | |
parent | 6dcb3cac408e8a4219043709a924f762ab2cec79 (diff) |
Code review fixes
Diffstat (limited to 'controller-api')
2 files changed, 10 insertions, 21 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/artifact/Artifact.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/artifact/Artifact.java index e0a4e0c0ae8..7ca372f6cd0 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/artifact/Artifact.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/artifact/Artifact.java @@ -5,7 +5,6 @@ import com.yahoo.component.Version; import java.time.Instant; import java.util.Objects; -import java.util.Optional; /** * A registry artifact (e.g. container image or RPM) @@ -15,25 +14,16 @@ import java.util.Optional; public class Artifact { private final String id; - private final Optional<String> registry; - private final Optional<String> repository; - private final Optional<String> tag; + private final String registry; + private final String repository; + private final String tag; private final Instant createdAt; private final Version version; public Artifact(String id, String registry, String repository, String tag, Instant createdAt, Version version) { this.id = Objects.requireNonNull(id); - this.registry = Optional.of(registry); - this.repository = Optional.of(repository); - this.tag = Optional.of(tag); - this.createdAt = Objects.requireNonNull(createdAt); - this.version = Objects.requireNonNull(version); - } - - public Artifact(String id, Instant createdAt, Optional<String> tag, Version version) { - this.id = Objects.requireNonNull(id); - this.registry = Optional.empty(); - this.repository = Optional.empty(); + this.registry = Objects.requireNonNull(registry); + this.repository = Objects.requireNonNull(repository); this.tag = Objects.requireNonNull(tag); this.createdAt = Objects.requireNonNull(createdAt); this.version = Objects.requireNonNull(version); @@ -45,17 +35,17 @@ public class Artifact { } /** The registry holding this artifact */ - public Optional<String> registry() { + public String registry() { return registry; } /** Repository of this artifact */ - public Optional<String> repository() { + public String repository() { return repository; } /** Tag of this artifact */ - public Optional<String> tag() { + public String tag() { return tag; } @@ -89,7 +79,6 @@ public class Artifact { @Override public String toString() { - String name = repository.isPresent() ? registry.get() + "/" + repository.get() : id; - return "artifact " + name + " [version=" + version.toFullString() + ",createdAt=" + createdAt + tag.map(t -> ",tag=" + t).orElse("") + "]"; + return "artifact " + registry + "/" + repository + " [version=" + version.toFullString() + ",createdAt=" + createdAt + ",tag=" + tag + "]"; } } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/artifact/ArtifactRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/artifact/ArtifactRegistry.java index 8d3c19083c9..6ab8409ad11 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/artifact/ArtifactRegistry.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/artifact/ArtifactRegistry.java @@ -12,7 +12,7 @@ import java.util.List; public interface ArtifactRegistry { /** Delete all given artifacts */ - void deleteAll(List<Artifact> images); + void deleteAll(List<Artifact> artifacts); /** Returns a list of all artifacts in this system */ List<Artifact> list(); |