diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-09-28 22:31:27 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-09-28 22:31:27 +0200 |
commit | 16f7e8910a17f437f1a581610fe8f468bad5a892 (patch) | |
tree | b60a5e54600b47fdba2e9fa7fa86cd569531f77c | |
parent | 2fab2aed44cb2e9fec24ae51673823aa6483d263 (diff) |
Supplier not producer, unfortunately
2 files changed, 3 insertions, 7 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java index 1c53ff18222..fad276379cc 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java @@ -1,10 +1,6 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.provision; -import java.text.DecimalFormat; -import java.text.FieldPosition; -import java.text.NumberFormat; -import java.util.Locale; import java.util.Objects; import java.util.Optional; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java index 0d46fc4a0eb..75fd16697b4 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java @@ -9,13 +9,13 @@ import com.yahoo.config.provision.TransientException; import com.yahoo.jdisc.Metric; import java.util.Objects; +import java.util.function.Supplier; import java.util.logging.Level; import com.yahoo.transaction.Mutex; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.node.Agent; import com.yahoo.yolean.Exceptions; -import org.glassfish.jersey.internal.util.Producer; import java.io.Closeable; import java.time.Duration; @@ -84,11 +84,11 @@ class MaintenanceDeployment implements Closeable { return doStep(() -> deployment.get().activate()); } - private Optional<Long> doStep(Producer<Long> step) { + private Optional<Long> doStep(Supplier<Long> step) { if (closed) throw new IllegalStateException(this + "' is closed"); if ( ! isValid()) return Optional.empty(); try { - return Optional.of(step.call()); + return Optional.of(step.get()); } catch (TransientException e) { metric.add("maintenanceDeployment.transientFailure", 1, metric.createContext(Map.of())); log.log(Level.INFO, "Failed to maintenance deploy " + application + " with a transient error: " + |