Replace Duration.getSeconds() with Duration.toSeconds() where it makes sense,
which is most of the places.
RELNOTES: None.
PiperOrigin-RevId: 696488888
Change-Id: I410f831c79aca0fce247d783f9de8fb73fdc0a56
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
index 249fac4..36c8d56 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
@@ -620,6 +620,6 @@
.getFragment(TestConfiguration.class)
.getTestTimeout()
.get(categoricalTimeout)
- .getSeconds();
+ .toSeconds();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
index 63806fb..2573e28 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
@@ -716,7 +716,7 @@
public void setupEnvVariables(Map<String, String> env, Duration timeout) {
env.put("TEST_TARGET", Label.print(getOwner().getLabel()));
env.put("TEST_SIZE", getTestProperties().getSize().toString());
- env.put("TEST_TIMEOUT", Long.toString(timeout.getSeconds()));
+ env.put("TEST_TIMEOUT", Long.toString(timeout.toSeconds()));
env.put("TEST_WORKSPACE", getRunfilesPrefix());
env.put(
"TEST_BINARY",
diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/GoogleAuthUtils.java b/src/main/java/com/google/devtools/build/lib/authandtls/GoogleAuthUtils.java
index f7ac56f..d8274d6 100644
--- a/src/main/java/com/google/devtools/build/lib/authandtls/GoogleAuthUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/authandtls/GoogleAuthUtils.java
@@ -90,8 +90,8 @@
.negotiationType(
isTlsEnabled(target) ? NegotiationType.TLS : NegotiationType.PLAINTEXT);
if (options.grpcKeepaliveTime != null) {
- builder.keepAliveTime(options.grpcKeepaliveTime.getSeconds(), TimeUnit.SECONDS);
- builder.keepAliveTimeout(options.grpcKeepaliveTimeout.getSeconds(), TimeUnit.SECONDS);
+ builder.keepAliveTime(options.grpcKeepaliveTime.toSeconds(), TimeUnit.SECONDS);
+ builder.keepAliveTimeout(options.grpcKeepaliveTimeout.toSeconds(), TimeUnit.SECONDS);
}
if (interceptors != null) {
builder.intercept(interceptors);
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java
index 75848f0..ffbc361 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java
@@ -515,7 +515,7 @@
try {
Uninterruptibles.getUninterruptibly(
Futures.allAsList(closeFuturesWithTimeoutsMap.values()),
- getMaxWaitForPreviousInvocation().getSeconds(),
+ getMaxWaitForPreviousInvocation().toSeconds(),
TimeUnit.SECONDS);
} catch (TimeoutException | ExecutionException exception) {
logger.atWarning().withCause(exception).log(
diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
index ff11db6..4d2c212 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
@@ -119,7 +119,7 @@
// for this.
executionInfo.put(ExecutionRequirements.NO_CACHE, "");
}
- executionInfo.put(ExecutionRequirements.TIMEOUT, "" + getTimeout(action).getSeconds());
+ executionInfo.put(ExecutionRequirements.TIMEOUT, "" + getTimeout(action).toSeconds());
SimpleSpawn.LocalResourcesSupplier localResourcesSupplier =
() ->
diff --git a/src/main/java/com/google/devtools/build/lib/remote/CombinedCacheClientFactory.java b/src/main/java/com/google/devtools/build/lib/remote/CombinedCacheClientFactory.java
index 9a9cb43..2c31d5d 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/CombinedCacheClientFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/CombinedCacheClientFactory.java
@@ -98,7 +98,7 @@
return HttpCacheClient.create(
new DomainSocketAddress(options.remoteProxy.replaceFirst("^unix:", "")),
uri,
- Math.toIntExact(options.remoteTimeout.getSeconds()),
+ Math.toIntExact(options.remoteTimeout.toSeconds()),
options.remoteMaxConnections,
options.remoteVerifyDownloads,
ImmutableList.copyOf(options.remoteHeaders),
@@ -112,7 +112,7 @@
} else {
return HttpCacheClient.create(
uri,
- Math.toIntExact(options.remoteTimeout.getSeconds()),
+ Math.toIntExact(options.remoteTimeout.toSeconds()),
options.remoteMaxConnections,
options.remoteVerifyDownloads,
ImmutableList.copyOf(options.remoteHeaders),
diff --git a/src/main/java/com/google/devtools/build/lib/remote/ExperimentalGrpcRemoteExecutor.java b/src/main/java/com/google/devtools/build/lib/remote/ExperimentalGrpcRemoteExecutor.java
index a772e03..6186043 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/ExperimentalGrpcRemoteExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/ExperimentalGrpcRemoteExecutor.java
@@ -79,7 +79,7 @@
return ExecutionGrpc.newBlockingStub(channel)
.withInterceptors(TracingMetadataUtils.attachMetadataInterceptor(metadata))
.withCallCredentials(callCredentialsProvider.getCallCredentials())
- .withDeadlineAfter(remoteOptions.remoteTimeout.getSeconds(), SECONDS);
+ .withDeadlineAfter(remoteOptions.remoteTimeout.toSeconds(), SECONDS);
}
private static class Execution {
diff --git a/src/main/java/com/google/devtools/build/lib/remote/GrpcCacheClient.java b/src/main/java/com/google/devtools/build/lib/remote/GrpcCacheClient.java
index a7492f0..b8f8c11 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/GrpcCacheClient.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/GrpcCacheClient.java
@@ -109,7 +109,7 @@
options.remoteInstanceName,
channel,
callCredentialsProvider,
- options.remoteTimeout.getSeconds(),
+ options.remoteTimeout.toSeconds(),
retrier,
options.maximumOpenFiles,
digestUtil.getDigestFunction());
@@ -143,7 +143,7 @@
TracingMetadataUtils.attachMetadataInterceptor(context.getRequestMetadata()),
new NetworkTimeInterceptor(context::getNetworkTime))
.withCallCredentials(callCredentialsProvider.getCallCredentials())
- .withDeadlineAfter(options.remoteTimeout.getSeconds(), TimeUnit.SECONDS);
+ .withDeadlineAfter(options.remoteTimeout.toSeconds(), TimeUnit.SECONDS);
}
private ByteStreamStub bsAsyncStub(RemoteActionExecutionContext context, Channel channel) {
@@ -152,7 +152,7 @@
TracingMetadataUtils.attachMetadataInterceptor(context.getRequestMetadata()),
new NetworkTimeInterceptor(context::getNetworkTime))
.withCallCredentials(callCredentialsProvider.getCallCredentials())
- .withDeadlineAfter(options.remoteTimeout.getSeconds(), TimeUnit.SECONDS);
+ .withDeadlineAfter(options.remoteTimeout.toSeconds(), TimeUnit.SECONDS);
}
private ActionCacheFutureStub acFutureStub(
@@ -162,7 +162,7 @@
TracingMetadataUtils.attachMetadataInterceptor(context.getRequestMetadata()),
new NetworkTimeInterceptor(context::getNetworkTime))
.withCallCredentials(callCredentialsProvider.getCallCredentials())
- .withDeadlineAfter(options.remoteTimeout.getSeconds(), TimeUnit.SECONDS);
+ .withDeadlineAfter(options.remoteTimeout.toSeconds(), TimeUnit.SECONDS);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
index 8557bca..6e4793e 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
@@ -542,7 +542,7 @@
invocationId,
remoteOptions.remoteInstanceName,
callCredentials,
- remoteOptions.remoteTimeout.getSeconds(),
+ remoteOptions.remoteTimeout.toSeconds(),
retrier);
ReferenceCountedChannel execChannel = null;
diff --git a/src/main/java/com/google/devtools/build/lib/remote/downloader/GrpcRemoteDownloader.java b/src/main/java/com/google/devtools/build/lib/remote/downloader/GrpcRemoteDownloader.java
index 9720347..cc93088 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/downloader/GrpcRemoteDownloader.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/downloader/GrpcRemoteDownloader.java
@@ -271,7 +271,7 @@
TracingMetadataUtils.attachMetadataInterceptor(context.getRequestMetadata()))
.withInterceptors(TracingMetadataUtils.newDownloaderHeadersInterceptor(options))
.withCallCredentials(credentials.orElse(null))
- .withDeadlineAfter(options.remoteTimeout.getSeconds(), TimeUnit.SECONDS);
+ .withDeadlineAfter(options.remoteTimeout.toSeconds(), TimeUnit.SECONDS);
}
private OutputStream newOutputStream(Path destination, Optional<Checksum> checksum)
diff --git a/src/main/java/com/google/devtools/build/lib/remote/util/Utils.java b/src/main/java/com/google/devtools/build/lib/remote/util/Utils.java
index c8d3c70..00e776d 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/util/Utils.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/util/Utils.java
@@ -448,7 +448,7 @@
action.setCommandDigest(command);
action.setInputRootDigest(inputRoot);
if (!timeout.isZero()) {
- action.setTimeout(Duration.newBuilder().setSeconds(timeout.getSeconds()));
+ action.setTimeout(Duration.newBuilder().setSeconds(timeout.toSeconds()));
}
if (!cacheable) {
action.setDoNotCache(true);
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ProcessWrapper.java b/src/main/java/com/google/devtools/build/lib/runtime/ProcessWrapper.java
index 3e9c87a..4766002 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/ProcessWrapper.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/ProcessWrapper.java
@@ -146,10 +146,10 @@
fullCommandLine.add(processWrapperPath);
if (timeout != null) {
- fullCommandLine.add("--timeout=" + timeout.getSeconds());
+ fullCommandLine.add("--timeout=" + timeout.toSeconds());
}
if (killDelay != null) {
- fullCommandLine.add("--kill_delay=" + killDelay.getSeconds());
+ fullCommandLine.add("--kill_delay=" + killDelay.toSeconds());
}
if (stdoutPath != null) {
fullCommandLine.add("--stdout=" + stdoutPath);
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilder.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilder.java
index f4ad196..02a2fb4 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilder.java
@@ -242,10 +242,10 @@
commandLineBuilder.add("-W", workingDirectory.getPathString());
}
if (timeout != null) {
- commandLineBuilder.add("-T", Long.toString(timeout.getSeconds()));
+ commandLineBuilder.add("-T", Long.toString(timeout.toSeconds()));
}
if (killDelay != null) {
- commandLineBuilder.add("-t", Long.toString(killDelay.getSeconds()));
+ commandLineBuilder.add("-t", Long.toString(killDelay.toSeconds()));
}
if (stdoutPath != null) {
commandLineBuilder.add("-l", stdoutPath.getPathString());
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxUtil.java b/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxUtil.java
index c582ecb..6660bb2 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxUtil.java
@@ -198,10 +198,10 @@
commandLineBuilder.add("-W", workingDirectory.getPathString());
}
if (timeout != null) {
- commandLineBuilder.add("-T", Long.toString(timeout.getSeconds()));
+ commandLineBuilder.add("-T", Long.toString(timeout.toSeconds()));
}
if (killDelay != null) {
- commandLineBuilder.add("-t", Long.toString(killDelay.getSeconds()));
+ commandLineBuilder.add("-t", Long.toString(killDelay.toSeconds()));
}
if (stdoutPath != null) {
commandLineBuilder.add("-l", stdoutPath.getPathString());
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/ProcessWrapperTest.java b/src/test/java/com/google/devtools/build/lib/runtime/ProcessWrapperTest.java
index d63edc7..d383ff4 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/ProcessWrapperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/ProcessWrapperTest.java
@@ -79,8 +79,8 @@
ImmutableList<String> expectedCommandLine =
ImmutableList.<String>builder()
.add("/path/process-wrapper")
- .add("--timeout=" + timeout.getSeconds())
- .add("--kill_delay=" + killDelay.getSeconds())
+ .add("--timeout=" + timeout.toSeconds())
+ .add("--kill_delay=" + killDelay.toSeconds())
.add("--stdout=" + stdoutPath)
.add("--stderr=" + stderrPath)
.add("--stats=" + statisticsPath)
diff --git a/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilderTest.java b/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilderTest.java
index 74a18fc..37fe946 100644
--- a/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilderTest.java
@@ -139,8 +139,8 @@
ImmutableList.<String>builder()
.add(linuxSandboxPath.getPathString())
.add("-W", workingDirectory.getPathString())
- .add("-T", Long.toString(timeout.getSeconds()))
- .add("-t", Long.toString(killDelay.getSeconds()))
+ .add("-T", Long.toString(timeout.toSeconds()))
+ .add("-t", Long.toString(killDelay.toSeconds()))
.add("-l", stdoutPath.getPathString())
.add("-L", stderrPath.getPathString())
.add("-w", writableDir1.getPathString())
diff --git a/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunnerTest.java
index 1dfbf40..c5ac918 100644
--- a/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunnerTest.java
@@ -142,8 +142,8 @@
Spawn spawn =
new SpawnBuilder(
cpuTimeSpenderPath.getPathString(),
- String.valueOf(minimumUserTimeToSpend.getSeconds()),
- String.valueOf(minimumSystemTimeToSpend.getSeconds()))
+ String.valueOf(minimumUserTimeToSpend.toSeconds()),
+ String.valueOf(minimumSystemTimeToSpend.toSeconds()))
.build();
SpawnExecutionContextForTesting policy = createSpawnExecutionContext(spawn);
diff --git a/src/test/java/com/google/devtools/build/lib/server/ServerWatcherRunnableTest.java b/src/test/java/com/google/devtools/build/lib/server/ServerWatcherRunnableTest.java
index 1d8a175..3fd2282 100644
--- a/src/test/java/com/google/devtools/build/lib/server/ServerWatcherRunnableTest.java
+++ b/src/test/java/com/google/devtools/build/lib/server/ServerWatcherRunnableTest.java
@@ -125,7 +125,7 @@
new ServerWatcherRunnable(
mockServer,
// Shut down after an hour if we see no memory issues.
- /*maxIdleSeconds=*/ Duration.ofHours(1).getSeconds(),
+ /* maxIdleSeconds= */ Duration.ofHours(1).toSeconds(),
shutdownOnLowSysMem,
mockCommandManager,
new ProcMeminfoLowMemoryChecker(() -> mockParser));
diff --git a/src/test/java/com/google/devtools/build/lib/shell/CommandUsingLinuxSandboxTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandUsingLinuxSandboxTest.java
index f4278c5..e55e690 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/CommandUsingLinuxSandboxTest.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/CommandUsingLinuxSandboxTest.java
@@ -91,8 +91,8 @@
ImmutableList<String> commandArguments =
ImmutableList.of(
getCpuTimeSpenderPath().getPathString(),
- Long.toString(userTimeToSpend.getSeconds()),
- Long.toString(systemTimeToSpend.getSeconds()));
+ Long.toString(userTimeToSpend.toSeconds()),
+ Long.toString(systemTimeToSpend.toSeconds()));
Path outputDir = TestUtils.createUniqueTmpDir(testFS);
Path statisticsFilePath = outputDir.getRelative("stats.out");
diff --git a/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java
index ae5b5ee..8962489 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java
@@ -85,8 +85,8 @@
ImmutableList<String> commandArguments =
ImmutableList.of(
getCpuTimeSpenderPath(),
- Long.toString(userTimeToSpend.getSeconds()),
- Long.toString(systemTimeToSpend.getSeconds()));
+ Long.toString(userTimeToSpend.toSeconds()),
+ Long.toString(systemTimeToSpend.toSeconds()));
Path outputDir = TestUtils.createUniqueTmpDir(testFS);
Path statisticsFilePath = outputDir.getRelative("stats.out");
