diff options
author | Arne Juul <arnej@verizonmedia.com> | 2021-06-29 19:59:45 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2021-06-29 19:59:45 +0000 |
commit | 36a61dd3db6099655b2853d7980cd95193cad7a4 (patch) | |
tree | 8133ea171f0e583b530746eeaf75064721c6b070 | |
parent | 6908231a47c2156392ebab39f1c3c8f59d4fe202 (diff) |
Text.fmt -> Text.format
41 files changed, 56 insertions, 56 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index 8b4ba3143b6..4761494e9df 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -157,7 +157,7 @@ public class ApplicationController { }); count++; } - log.log(Level.INFO, Text.fmt("Wrote %d applications in %s", count, + log.log(Level.INFO, Text.format("Wrote %d applications in %s", count, Duration.between(start, clock.instant()))); }); } @@ -810,7 +810,7 @@ public class ApplicationController { boolean revisionIsOlder = revision.compareTo(deployment.applicationVersion()) < 0 && !(revision.isUnknown() && controller.system().isCd()); if (platformIsOlder || revisionIsOlder) - throw new IllegalArgumentException(Text.fmt("Rejecting deployment of application %s to %s, as the requested versions (platform: %s, application: %s)" + + throw new IllegalArgumentException(Text.format("Rejecting deployment of application %s to %s, as the requested versions (platform: %s, application: %s)" + " are older than the currently deployed (platform: %s, application: %s).", job.application(), zone, platform, revision, deployment.version(), deployment.applicationVersion())); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/NotExistsException.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/NotExistsException.java index 45fcb8c2ca0..02fa49d04d0 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/NotExistsException.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/NotExistsException.java @@ -23,7 +23,7 @@ public class NotExistsException extends IllegalArgumentException { * */ public NotExistsException(String capitalizedType, String id) { - super(Text.fmt("%s '%s' does not exist", capitalizedType, id)); + super(Text.format("%s '%s' does not exist", capitalizedType, id)); } public NotExistsException(Identifier id) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java index fe8ca5a8e6e..047738784b7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java @@ -58,7 +58,7 @@ public class TenantController { lockIfPresent(name, LockedTenant.class, this::store); count++; } - log.log(Level.INFO, Text.fmt("Wrote %d tenants in %s", count, + log.log(Level.INFO, Text.format("Wrote %d tenants in %s", count, Duration.between(start, controller.clock().instant()))); }); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java index 6791bf33d02..b441d40c1c3 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java @@ -157,7 +157,7 @@ public class Endpoint { @Override public String toString() { - return Text.fmt("endpoint %s [scope=%s, legacy=%s, routingMethod=%s]", url, scope, legacy, routingMethod); + return Text.format("endpoint %s [scope=%s, legacy=%s, routingMethod=%s]", url, scope, legacy, routingMethod); } private static String endpointOrClusterAsString(EndpointId id, ClusterSpec.Id cluster) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java index b533a94aebb..88358326324 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java @@ -106,7 +106,7 @@ public enum SystemApplication { @Override public String toString() { - return Text.fmt("system application %s of type %s", id, nodeType); + return Text.format("system application %s of type %s", id, nodeType); } private static class Constants { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java index 5abe21f7b11..0f5c2123325 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDb.java @@ -50,7 +50,7 @@ public class CuratorArchiveBucketDb { public Optional<URI> archiveUriFor(ZoneId zoneId, TenantName tenant) { if (enabled) { - return Optional.of(URI.create(Text.fmt("s3://%s/%s/", findOrAssignBucket(zoneId, tenant), tenant.value()))); + return Optional.of(URI.create(Text.format("s3://%s/%s/", findOrAssignBucket(zoneId, tenant), tenant.value()))); } else { return Optional.empty(); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java index f9dbd27499f..8cc02b5bf69 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java @@ -267,7 +267,7 @@ public class AthenzFacade implements AccessControl { log("getMembership(domain=%s, role=%s, principal=%s)", domain, "admin", identity); if ( ! zmsClient.getMembership(new AthenzRole(domain, "admin"), identity)) throw new ForbiddenException( - Text.fmt("The user '%s' is not admin in Athenz domain '%s'", identity.getFullName(), domain.getName())); + Text.format("The user '%s' is not admin in Athenz domain '%s'", identity.getFullName(), domain.getName())); } public List<AthenzDomain> getDomainList(String prefix) { @@ -295,7 +295,7 @@ public class AthenzFacade implements AccessControl { } private String resourceStringPrefix(AthenzDomain tenantDomain) { - return Text.fmt("%s:service.%s.tenant.%s", + return Text.format("%s:service.%s.tenant.%s", service.getDomain().getName(), service.getName(), tenantDomain.getName()); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java index 5f23b4e1352..1447e1809a4 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java @@ -58,7 +58,7 @@ public class EndpointCertificates { metadata.ifPresent(m -> curator.writeEndpointCertificateMetadata(instance.id(), m.withLastRequested(clock.instant().getEpochSecond()))); Duration duration = Duration.between(start, clock.instant()); if (duration.toSeconds() > 30) - log.log(Level.INFO, Text.fmt("Getting endpoint certificate metadata for %s took %d seconds!", instance.id().serializedForm(), duration.toSeconds())); + log.log(Level.INFO, Text.format("Getting endpoint certificate metadata for %s took %d seconds!", instance.id().serializedForm(), duration.toSeconds())); return metadata; } 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 ce53225493e..a3a03eb942d 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 @@ -205,7 +205,7 @@ public class DeploymentTrigger { /** retrigger job. If the job is already running, it will be canceled, and retrigger enqueued. */ public Optional<JobId> reTriggerOrAddToQueue(DeploymentId deployment) { JobType jobType = JobType.from(controller.system(), deployment.zoneId()) - .orElseThrow(() -> new IllegalArgumentException(Text.fmt("No job to trigger for (system/zone): %s/%s", controller.system().value(), deployment.zoneId().value()))); + .orElseThrow(() -> new IllegalArgumentException(Text.format("No job to trigger for (system/zone): %s/%s", controller.system().value(), deployment.zoneId().value()))); Optional<Run> existingRun = controller.jobController().active(deployment.applicationId()).stream() .filter(run -> run.id().type().equals(jobType)) .findFirst(); 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 546b4ced7ef..a1566a1b5a1 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 @@ -870,7 +870,7 @@ public class InternalStepRunner implements StepRunner { // Of the remaining memory, split 50/50 between Surefire running the tests and the rest int testMemoryMb = (int) (1024 * (resources.memoryGb() - jdiscMemoryGb) / 2); - String resourceString = Text.fmt( + String resourceString = Text.format( "<resources vcpu=\"%.2f\" memory=\"%.2fGb\" disk=\"%.2fGb\" disk-speed=\"%s\" storage-type=\"%s\"/>", resources.vcpu(), resources.memoryGb(), resources.diskGb(), resources.diskSpeed().name(), resources.storageType().name()); 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 658eb1bbf12..ccd624b2a27 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 @@ -88,7 +88,7 @@ public class Versions { @Override public String toString() { - return Text.fmt("platform %s%s, application %s%s", + return Text.format("platform %s%s, application %s%s", sourcePlatform.filter(source -> !source.equals(targetPlatform)) .map(source -> source + " -> ").orElse(""), targetPlatform, diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java index 4797e24bcfc..d74578d9adc 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java @@ -121,7 +121,7 @@ public class ChangeManagementAssessor { private static Cluster clusterKey(NodeRepositoryNode node) { if (node.getOwner() == null) return Cluster.EMPTY; - String appId = Text.fmt("%s:%s:%s", node.getOwner().tenant, node.getOwner().application, node.getOwner().instance); + String appId = Text.format("%s:%s:%s", node.getOwner().tenant, node.getOwner().application, node.getOwner().instance); return new Cluster(Node.ClusterType.valueOf(node.getMembership().clustertype), node.getMembership().clusterid, appId, node.getType()); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporter.java index b5749755b1e..3c5495a6bfe 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporter.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporter.java @@ -43,7 +43,7 @@ public class CloudEventReporter extends ControllerMaintainer { for (var region : zonesByCloudNativeRegion.keySet()) { List<CloudEvent> events = eventFetcher.getEvents(region); for (var event : events) { - log.info(Text.fmt("Retrieved event %s, affecting the following instances: %s", + log.info(Text.format("Retrieved event %s, affecting the following instances: %s", event.instanceEventId, event.affectedInstances)); deprovisionAffectedHosts(region, event); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java index e81062887cf..9b8dfce849a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java @@ -86,7 +86,7 @@ public class DeploymentMetricsMaintainer extends ControllerMaintainer { } if (lastException.get() != null) { log.log(Level.WARNING, - Text.fmt("Could not gather metrics for %d/%d deployments. Retrying in %s. Last error: %s", + Text.format("Could not gather metrics for %d/%d deployments. Retrying in %s. Last error: %s", failures.get(), attempts.get(), interval(), diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java index 65c4555989d..221a7524ab1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java @@ -58,12 +58,12 @@ public abstract class InfrastructureUpgrader<VERSION> extends ControllerMaintain } catch (UnreachableNodeRepositoryException e) { failures++; converged = false; - log.warning(Text.fmt("%s: Failed to communicate with node repository in %s, continuing with next parallel zone: %s", + log.warning(Text.format("%s: Failed to communicate with node repository in %s, continuing with next parallel zone: %s", this, zone, Exceptions.toMessageString(e))); } catch (Exception e) { failures++; converged = false; - log.warning(Text.fmt("%s: Failed to upgrade zone: %s, continuing with next parallel zone: %s", + log.warning(Text.format("%s: Failed to upgrade zone: %s, continuing with next parallel zone: %s", this, zone, Exceptions.toMessageString(e))); } } @@ -118,7 +118,7 @@ public abstract class InfrastructureUpgrader<VERSION> extends ControllerMaintain .map(versionField) .min(Comparator.naturalOrder()); } catch (Exception e) { - throw new UnreachableNodeRepositoryException(Text.fmt("Failed to get version for %s in %s: %s", + throw new UnreachableNodeRepositoryException(Text.format("Failed to get version for %s in %s: %s", application.id(), zone, Exceptions.toMessageString(e))); } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java index 56a0b3f2489..8aeede95878 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java @@ -44,7 +44,7 @@ public class OsUpgrader extends InfrastructureUpgrader<OsVersionTarget> { @Override protected void upgrade(OsVersionTarget target, SystemApplication application, ZoneApi zone) { Duration zoneUpgradeBudget = zoneBudgetOf(target.upgradeBudget(), zone); - log.info(Text.fmt("Upgrading OS of %s to version %s in %s in cloud %s%s", application.id(), + log.info(Text.format("Upgrading OS of %s to version %s in %s in cloud %s%s", application.id(), target.osVersion().version().toFullString(), zone.getVirtualId(), zone.getCloudName(), " with time budget " + zoneUpgradeBudget)); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java index 0ad273ff621..8f57b3f2239 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java @@ -32,7 +32,7 @@ public class SystemUpgrader extends InfrastructureUpgrader<Version> { @Override protected void upgrade(Version target, SystemApplication application, ZoneApi zone) { - log.info(Text.fmt("Deploying %s version %s in %s", application.id(), target, zone.getId())); + log.info(Text.format("Deploying %s version %s in %s", application.id(), target, zone.getId())); controller().applications().deploy(application, zone.getId(), target); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VCMRMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VCMRMaintainer.java index 59bc083933f..38e10aa6750 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VCMRMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VCMRMaintainer.java @@ -167,7 +167,7 @@ public class VCMRMaintainer extends ControllerMaintainer { if (shouldRetire(changeRequest, hostAction)) { if (!node.wantToRetire()) { - logger.info(Text.fmt("Retiring %s due to %s", node.hostname().value(), changeRequest.getChangeRequestSource().getId())); + logger.info(Text.format("Retiring %s due to %s", node.hostname().value(), changeRequest.getChangeRequestSource().getId())); // TODO: Remove try/catch once retirement is stabilized try { setWantToRetire(changeRequest.getZoneId(), node, true); @@ -309,7 +309,7 @@ public class VCMRMaintainer extends ControllerMaintainer { } private void updateReport(ZoneId zoneId, Node node, VCMRReport report) { - logger.info(Text.fmt("Updating report for %s: %s", node.hostname(), report)); + logger.info(Text.format("Updating report for %s: %s", node.hostname(), report)); var newNode = new NodeRepositoryNode(); newNode.setReports(report.toNodeReports()); nodeRepository.patchNode(zoneId, node.hostname().value(), newNode); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationSource.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationSource.java index 74fd79069af..aeb017e14a3 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationSource.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationSource.java @@ -53,7 +53,7 @@ public class NotificationSource { if (jobType.isPresent() && instance.isEmpty()) throw new IllegalArgumentException("Instance name must be present with job type"); if (jobType.isPresent() != runNumber.isPresent()) - throw new IllegalArgumentException(Text.fmt("Run number (%s) must be 1-to-1 with job type (%s)", + throw new IllegalArgumentException(Text.format("Run number (%s) must be 1-to-1 with job type (%s)", runNumber.isPresent() ? "present" : "missing", jobType.map(i -> "present").orElse("missing"))); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java index 60bb8bcc9d4..fa1419c6d7d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java @@ -153,7 +153,7 @@ public class NotificationsDb { private static Optional<Notification> createReindexNotification(NotificationSource source, Instant at, ClusterMetrics metric) { if (metric.reindexingProgress().isEmpty()) return Optional.empty(); List<String> messages = metric.reindexingProgress().entrySet().stream() - .map(entry -> Text.fmt("document type '%s' (%.1f%% done)", entry.getKey(), 100 * entry.getValue())) + .map(entry -> Text.format("document type '%s' (%.1f%% done)", entry.getKey(), 100 * entry.getValue())) .sorted() .collect(Collectors.toUnmodifiableList()); return Optional.of(new Notification(at, Type.reindex, Level.info, source, messages)); @@ -170,7 +170,7 @@ public class NotificationsDb { double utilRelativeToLimit = util.get() / feedBlockLimit.get(); if (utilRelativeToLimit < 0.9) return Optional.empty(); - String message = Text.fmt("%s (usage: %.1f%%, feed block limit: %.1f%%)", + String message = Text.format("%s (usage: %.1f%%, feed block limit: %.1f%%)", resource, 100 * util.get(), 100 * feedBlockLimit.get()); if (utilRelativeToLimit < 1) return Optional.of(new Pair<>(Level.warning, message)); return Optional.of(new Pair<>(Level.error, message)); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java index 1a812737339..6cc7446499f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java @@ -121,7 +121,7 @@ public class ConfigServerRestExecutorImpl extends AbstractComponent implements C errorBuilder.append("Talking to server ").append(url.getHost()); errorBuilder.append(", got ").append(status).append(" ") .append(content).append("\n"); - LOG.log(Level.FINE, () -> Text.fmt("Got response from %s with status code %d and content:\n %s", + LOG.log(Level.FINE, () -> Text.format("Got response from %s with status code %d and content:\n %s", url.getHost(), status, content)); return Optional.empty(); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequest.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequest.java index aaab32d4ac6..c3cdd69041f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequest.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequest.java @@ -33,7 +33,7 @@ public class ProxyRequest { String path) { Objects.requireNonNull(url); if (!url.getPath().endsWith(path)) { - throw new IllegalArgumentException(Text.fmt("Request path '%s' does not end with proxy path '%s'", url.getPath(), path)); + throw new IllegalArgumentException(Text.format("Request path '%s' does not end with proxy path '%s'", url.getPath(), path)); } if (targets.isEmpty()) { throw new IllegalArgumentException("targets must be non-empty"); 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 2bed7e85ba9..d022588c757 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 @@ -1513,7 +1513,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { setGlobalRotationStatus(deploymentId, inService, request); setGlobalEndpointStatus(deploymentId, inService, request); - return new MessageResponse(Text.fmt("Successfully set %s in %s %s service", + return new MessageResponse(Text.format("Successfully set %s in %s %s service", instance.id().toShortString(), zone, inService ? "in" : "out of")); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java index 316c60af54a..d246b20f2fe 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java @@ -167,7 +167,7 @@ class JobControllerApiHandlerHelper { catch (RuntimeException ignored) { } // Return response when this fails, which it does when, e.g., logserver is booting. RunLog runLog = (after == null ? jobController.details(runId) : jobController.details(runId, Long.parseLong(after))) - .orElseThrow(() -> new NotExistsException(Text.fmt( + .orElseThrow(() -> new NotExistsException(Text.format( "No run details exist for application: %s, job type: %s, number: %d", runId.application().toShortString(), runId.type().jobName(), runId.number()))); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiHandler.java index 03101fa0bc6..9ac94d0208c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiHandler.java @@ -75,14 +75,14 @@ public class AthenzApiHandler extends LoggingRequestHandler { if (path.matches("/athenz/v1/domains")) return domainList(request); if (path.matches("/athenz/v1/properties")) return properties(); - return ErrorResponse.notFoundError(Text.fmt("No '%s' handler at '%s'", request.getMethod(), + return ErrorResponse.notFoundError(Text.format("No '%s' handler at '%s'", request.getMethod(), request.getUri().getPath())); } private HttpResponse post(HttpRequest request) { Path path = new Path(request.getUri()); if (path.matches("/athenz/v1/user")) return signup(request); - return ErrorResponse.notFoundError(Text.fmt("No '%s' handler at '%s'", request.getMethod(), + return ErrorResponse.notFoundError(Text.format("No '%s' handler at '%s'", request.getMethod(), request.getUri().getPath())); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java index 6857e2c310f..8f083f4e988 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java @@ -126,8 +126,8 @@ public class ControllerApiHandler extends AuditLoggingRequestHandler { // Trigger deployment to include operator cert Optional<JobId> jobId = controller.applications().deploymentTrigger().reTriggerOrAddToQueue(deployment); return new MessageResponse( - jobId.map(id -> Text.fmt("Operator %s granted access and job %s triggered", principal.getName(), id.type().jobName())) - .orElseGet(() -> Text.fmt("Operator %s granted access and job trigger queued", principal.getName()))); + jobId.map(id -> Text.format("Operator %s granted access and job %s triggered", principal.getName(), id.type().jobName())) + .orElseGet(() -> Text.format("Operator %s granted access and job trigger queued", principal.getName()))); } private <T> T requireField(Inspector inspector, String field, Function<String, T> mapper) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java index 4d85267f208..bd71a663328 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java @@ -69,7 +69,7 @@ public class BadgeApiHandler extends LoggingRequestHandler { if (path.matches("/badge/v1/{tenant}/{application}/{instance}")) return overviewBadge(path.get("tenant"), path.get("application"), path.get("instance")); if (path.matches("/badge/v1/{tenant}/{application}/{instance}/{jobName}")) return historyBadge(path.get("tenant"), path.get("application"), path.get("instance"), path.get("jobName"), request.getProperty("historyLength")); - return ErrorResponse.notFoundError(Text.fmt("No '%s' handler at '%s'", request.getMethod(), + return ErrorResponse.notFoundError(Text.format("No '%s' handler at '%s'", request.getMethod(), request.getUri().getPath())); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java index 82c9d634646..21a429b59ad 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java @@ -66,7 +66,7 @@ class SystemFlagsDeployer { try { results.add(future.get()); } catch (InterruptedException | ExecutionException e) { - log.log(Level.SEVERE, Text.fmt("Failed to deploy flags for target '%s': %s", target, e.getMessage()), e); + log.log(Level.SEVERE, Text.format("Failed to deploy flags for target '%s': %s", target, e.getMessage()), e); throw new RuntimeException(e); } }); @@ -86,7 +86,7 @@ class SystemFlagsDeployer { currentFlagData = lookupTable(client.listFlagData(target)); definedFlags = client.listDefinedFlags(target); } catch (Exception e) { - log.log(Level.WARNING, Text.fmt("Failed to list flag data for target '%s': %s", target, e.getMessage()), e); + log.log(Level.WARNING, Text.format("Failed to list flag data for target '%s': %s", target, e.getMessage()), e); return new SystemFlagsDeployResult(List.of(OperationError.listFailed(e.getMessage(), target))); } @@ -120,7 +120,7 @@ class SystemFlagsDeployer { dryRunFlagDataValidation(data); } } catch (Exception e) { - log.log(Level.WARNING, Text.fmt("Failed to put flag '%s' for target '%s': %s", data.id(), target, e.getMessage()), e); + log.log(Level.WARNING, Text.format("Failed to put flag '%s' for target '%s': %s", data.id(), target, e.getMessage()), e); errors.add(OperationError.createFailed(e.getMessage(), target, data)); return; } @@ -146,7 +146,7 @@ class SystemFlagsDeployer { dryRunFlagDataValidation(wantedData); } } catch (Exception e) { - log.log(Level.WARNING, Text.fmt("Failed to update flag '%s' for target '%s': %s", wantedData.id(), target, e.getMessage()), e); + log.log(Level.WARNING, Text.format("Failed to update flag '%s' for target '%s': %s", wantedData.id(), target, e.getMessage()), e); errors.add(OperationError.updateFailed(e.getMessage(), target, wantedData)); return; } @@ -168,7 +168,7 @@ class SystemFlagsDeployer { try { client.deleteFlagData(target, id); } catch (Exception e) { - log.log(Level.WARNING, Text.fmt("Failed to delete flag '%s' for target '%s': %s", id, target, e.getMessage()), e); + log.log(Level.WARNING, Text.format("Failed to delete flag '%s' for target '%s': %s", id, target, e.getMessage()), e); errors.add(OperationError.deleteFailed(e.getMessage(), target, id)); return; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java index 8416376ba21..7b0a2c9d6d6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java @@ -107,7 +107,7 @@ public class UserApiHandler extends LoggingRequestHandler { if (path.matches("/user/v1/tenant/{tenant}")) return listTenantRoleMembers(path.get("tenant")); if (path.matches("/user/v1/tenant/{tenant}/application/{application}")) return listApplicationRoleMembers(path.get("tenant"), path.get("application")); - return ErrorResponse.notFoundError(Text.fmt("No '%s' handler at '%s'", request.getMethod(), + return ErrorResponse.notFoundError(Text.format("No '%s' handler at '%s'", request.getMethod(), request.getUri().getPath())); } @@ -115,7 +115,7 @@ public class UserApiHandler extends LoggingRequestHandler { if (path.matches("/user/v1/tenant/{tenant}")) return addTenantRoleMember(path.get("tenant"), request); if (path.matches("/user/v1/tenant/{tenant}/application/{application}")) return addApplicationRoleMember(path.get("tenant"), path.get("application"), request); - return ErrorResponse.notFoundError(Text.fmt("No '%s' handler at '%s'", request.getMethod(), + return ErrorResponse.notFoundError(Text.format("No '%s' handler at '%s'", request.getMethod(), request.getUri().getPath())); } @@ -123,7 +123,7 @@ public class UserApiHandler extends LoggingRequestHandler { if (path.matches("/user/v1/tenant/{tenant}")) return removeTenantRoleMember(path.get("tenant"), request); if (path.matches("/user/v1/tenant/{tenant}/application/{application}")) return removeApplicationRoleMember(path.get("tenant"), path.get("application"), request); - return ErrorResponse.notFoundError(Text.fmt("No '%s' handler at '%s'", request.getMethod(), + return ErrorResponse.notFoundError(Text.format("No '%s' handler at '%s'", request.getMethod(), request.getUri().getPath())); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/rotation/Rotation.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/rotation/Rotation.java index d1fbfa5dfd9..4f608736c45 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/rotation/Rotation.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/rotation/Rotation.java @@ -44,7 +44,7 @@ public class Rotation { @Override public String toString() { - return Text.fmt("rotation %s -> %s", id().asString(), name()); + return Text.format("rotation %s -> %s", id().asString(), name()); } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepository.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepository.java index 0af01f16dd7..80bee1c5199 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepository.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepository.java @@ -166,7 +166,7 @@ public class RotationRepository { Map<RotationId, Rotation> availableRotations = availableRotations(lock); // Return first available rotation RotationId rotation = requireNonEmpty(availableRotations.keySet()).iterator().next(); - log.info(Text.fmt("Offering %s to application %s", rotation, id)); + log.info(Text.format("Offering %s to application %s", rotation, id)); return allRotations.get(rotation); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java index ff4d35b5409..ec9cf4064c9 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java @@ -133,7 +133,7 @@ public class RoutingPolicy { @Override public String toString() { - return Text.fmt("%s [endpoints: %s%s], %s owned by %s, in %s", canonicalName, endpoints, + return Text.format("%s [endpoints: %s%s], %s owned by %s, in %s", canonicalName, endpoints, dnsZone.map(z -> ", DNS zone: " + z).orElse(""), id.cluster(), id.owner().toShortString(), id.zone().value()); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/AthenzAccessControlRequests.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/AthenzAccessControlRequests.java index 1b427c92171..04129041e4c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/AthenzAccessControlRequests.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/AthenzAccessControlRequests.java @@ -78,7 +78,7 @@ public class AthenzAccessControlRequests implements AccessControlRequests { Principal principal = request.getUserPrincipal(); Objects.requireNonNull(principal, "Expected a user principal"); if ( ! (principal instanceof AthenzPrincipal)) - throw new RuntimeException(Text.fmt("Expected principal of type %s, got %s", + throw new RuntimeException(Text.format("Expected principal of type %s, got %s", AthenzPrincipal.class.getSimpleName(), principal.getClass().getName())); return (AthenzPrincipal) principal; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/CloudTenant.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/CloudTenant.java index 1f3c8bc355f..1060b118beb 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/CloudTenant.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/CloudTenant.java @@ -41,7 +41,7 @@ public class CloudTenant extends Tenant { this.tenantSecretStores = tenantSecretStores; this.archiveAccessRole = archiveAccessRole; if (!archiveAccessRole.map(role -> VALID_ARCHIVE_ACCESS_ROLE_PATTERN.matcher(role).matches()).orElse(true)) - throw new IllegalArgumentException(Text.fmt("Invalid archive access role '%s': Must match expected pattern: '%s'", + throw new IllegalArgumentException(Text.format("Invalid archive access role '%s': Must match expected pattern: '%s'", archiveAccessRole.get(), VALID_ARCHIVE_ACCESS_ROLE_PATTERN.pattern())); if (archiveAccessRole.map(role -> role.length() > 100).orElse(false)) throw new IllegalArgumentException("Invalid archive access role too long, must be 100 or less characters"); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java index 14b65a42513..bae0867736a 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java @@ -396,7 +396,7 @@ public final class ControllerTester { private static RotationsConfig defaultRotationsConfig() { RotationsConfig.Builder builder = new RotationsConfig.Builder(); for (int i = 1; i <= availableRotations; i++) { - String id = Text.fmt("%02d", i); + String id = Text.format("%02d", i); builder = builder.rotations("rotation-id-" + id, "rotation-fqdn-" + id); } return new RotationsConfig(builder); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java index 8989c0518c9..808409cf793 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java @@ -167,7 +167,7 @@ public class ApplicationPackageBuilder { } public ApplicationPackageBuilder athenzIdentity(AthenzDomain domain, AthenzService service) { - this.athenzIdentityAttributes = Text.fmt("athenz-domain='%s' athenz-service='%s'", domain.value(), + this.athenzIdentityAttributes = Text.format("athenz-domain='%s' athenz-service='%s'", domain.value(), service.value()); return this; } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java index bb81d7f5614..dca79c43afe 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java @@ -478,8 +478,8 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer @Override public ApplicationView getApplicationView(String tenantName, String applicationName, String instanceName, String environment, String region) { - String cfgHostname = Text.fmt("https://cfg.%s.%s.test.vip:4443", environment, region); - String cfgServiceUrlPrefix = Text.fmt("%s/serviceview/v1/tenant/%s/application/%s/environment/%s/region/%s/instance/%s/service", + String cfgHostname = Text.format("https://cfg.%s.%s.test.vip:4443", environment, region); + String cfgServiceUrlPrefix = Text.format("%s/serviceview/v1/tenant/%s/application/%s/environment/%s/region/%s/instance/%s/service", cfgHostname, tenantName, applicationName, environment, region, instanceName); ApplicationView applicationView = new ApplicationView(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java index 10b90bf9bbd..fe03b69a3fe 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java @@ -223,7 +223,7 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry @Override public URI getConfigServerVipUri(ZoneId zoneId) { - return URI.create(Text.fmt("https://cfg.%s.test.vip:4443/", zoneId.value())); + return URI.create(Text.format("https://cfg.%s.test.vip:4443/", zoneId.value())); } @Override diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json index 4a7007ebf83..199291ac276 100644 --- a/vespajlib/abi-spec.json +++ b/vespajlib/abi-spec.json @@ -3099,7 +3099,7 @@ "public static boolean isDisplayable(int)", "public static java.lang.String stripInvalidCharacters(java.lang.String)", "public static java.lang.String truncate(java.lang.String, int)", - "public static varargs java.lang.String fmt(java.lang.String, java.lang.Object[])" + "public static varargs java.lang.String format(java.lang.String, java.lang.Object[])" ], "fields": [] }, diff --git a/vespajlib/src/main/java/com/yahoo/text/Text.java b/vespajlib/src/main/java/com/yahoo/text/Text.java index 4b1ee57b47d..d147c4d7dc8 100644 --- a/vespajlib/src/main/java/com/yahoo/text/Text.java +++ b/vespajlib/src/main/java/com/yahoo/text/Text.java @@ -187,7 +187,7 @@ public final class Text { return s.substring(0, length - 4) + " ..."; } - public static String fmt(String format, Object... args) { + public static String format(String format, Object... args) { return String.format(Locale.US, format, args); } } diff --git a/vespajlib/src/test/java/com/yahoo/text/TextTestCase.java b/vespajlib/src/test/java/com/yahoo/text/TextTestCase.java index 83ac6342e70..9579388beb8 100644 --- a/vespajlib/src/test/java/com/yahoo/text/TextTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/text/TextTestCase.java @@ -74,6 +74,6 @@ public class TextTestCase { @Test public void testFormat() { - assertEquals("foo 3.14", Text.fmt("%s %.2f", "foo", 3.1415926536)); + assertEquals("foo 3.14", Text.format("%s %.2f", "foo", 3.1415926536)); } } |