diff options
author | jonmv <venstad@gmail.com> | 2022-11-04 22:44:44 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-11-04 22:44:44 +0100 |
commit | bcc7f0f6b59aca329f1d79800f8a3d794d3ddabb (patch) | |
tree | 193bc7910e012198821c21c95b635aeeed6279a5 /controller-api/src/main/java/com | |
parent | 62f86b1196d6f7a616b3b69d701258ed35d00bf0 (diff) |
Revert "Merge pull request #24762 from vespa-engine/jonmv/memoize"
This reverts commit 62f86b1196d6f7a616b3b69d701258ed35d00bf0, reversing
changes made to 7eb6f8bcec2a2f13f368ebd115c9c8d2f559d95c.
Diffstat (limited to 'controller-api/src/main/java/com')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java index 63c744c385d..dee0e1440f4 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java @@ -12,11 +12,11 @@ import com.yahoo.vespa.hosted.controller.api.integration.billing.Quota; import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateMetadata; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ContainerEndpoint; import com.yahoo.vespa.hosted.controller.api.integration.secrets.TenantSecretStore; -import com.yahoo.yolean.concurrent.Memoized; import java.io.InputStream; import java.security.cert.X509Certificate; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.Supplier; @@ -62,13 +62,13 @@ public class DeploymentData { this.applicationPackage = requireNonNull(applicationPackage); this.platform = requireNonNull(platform); this.containerEndpoints = Set.copyOf(requireNonNull(containerEndpoints)); - this.endpointCertificateMetadata = new Memoized<>(requireNonNull(endpointCertificateMetadata)); + this.endpointCertificateMetadata = requireNonNull(endpointCertificateMetadata); this.dockerImageRepo = requireNonNull(dockerImageRepo); this.athenzDomain = athenzDomain; - this.quota = new Memoized<>(requireNonNull(quota)); + this.quota = quota; this.tenantSecretStores = List.copyOf(requireNonNull(tenantSecretStores)); this.operatorCertificates = List.copyOf(requireNonNull(operatorCertificates)); - this.cloudAccount = new Memoized<>(requireNonNull(cloudAccount)); + this.cloudAccount = Objects.requireNonNull(cloudAccount); this.dryRun = dryRun; } |