Skip to content

api: Add java.time.Duration overloads to CallOptions, AbstractStub #11562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 37 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ab97045
SynchronizationContextTest changes for scheduleFixedDelay with Duration
SreeramdasLavanya Sep 20, 2024
fef4c92
Revert "SynchronizationContextTest changes for scheduleFixedDelay wit…
SreeramdasLavanya Sep 20, 2024
6a713ed
SynchronizationContextTest changes for scheduleFixedDelay with Duration
SreeramdasLavanya Sep 20, 2024
db6c21f
SynchronizationContextTest checkstyle issues updated for issue10245
SreeramdasLavanya Sep 23, 2024
778cfb4
Merge branch 'grpc:master' into master
SreeramdasLavanya Sep 23, 2024
328bcbf
Merge branch 'grpc:master' into master
SreeramdasLavanya Sep 24, 2024
6a66054
Merge branch 'grpc:master' into master
SreeramdasLavanya Sep 26, 2024
84a37e9
Issue 10245 fix for long, TimeUnit to java.time.Duration to API's
SreeramdasLavanya Sep 26, 2024
c1090b7
Issue 10245 - Fixed Checkstyle issues
SreeramdasLavanya Sep 26, 2024
6c56aae
Issue 10245 - Fixed Checkstyle issues
SreeramdasLavanya Sep 26, 2024
4113845
Merge branch 'grpc:master' into master
SreeramdasLavanya Oct 1, 2024
4531bc2
Issue 10245 - Reverted java.time.Duration changes for Deadline and De…
SreeramdasLavanya Oct 2, 2024
09c3509
Merge branch 'grpc:master' into master
SreeramdasLavanya Oct 8, 2024
bd5a80a
Issue 10245 - Implementation for Duration.toNanos() changes
SreeramdasLavanya Oct 8, 2024
e64f659
grpc-api/stub: Implementation for InternalTimeUtil under grpc-api module
SreeramdasLavanya Oct 9, 2024
0b6c594
grpc-api/stub: Added JUnit for the InternalTimeUtils changes
SreeramdasLavanya Oct 9, 2024
4d0aa82
Merge branch 'master' into FixIssue10245
SreeramdasLavanya Oct 9, 2024
62a88ec
Merge branch 'grpc:master' into master
SreeramdasLavanya Oct 9, 2024
b905dfa
Merge branch 'master' into FixIssue10245
SreeramdasLavanya Oct 9, 2024
eb66fe5
grpc-api/stub: Modified JUnit for the InternalTimeUtils changes
SreeramdasLavanya Oct 9, 2024
e76d673
grpc-api: Whitespace formatting for unrelated code
SreeramdasLavanya Oct 15, 2024
f01209b
grpc-api: Whitespace formatting for unrelated code and Reverted stati…
SreeramdasLavanya Oct 16, 2024
de2e185
grpc-api: Reverted static import for InternalTimeUtils.convert method
SreeramdasLavanya Oct 16, 2024
7207da8
grpc-api/stub: Renamed InternalTimeUtils to TimeUtils and its effecte…
SreeramdasLavanya Oct 16, 2024
bf6c521
grpc-api: Formatted whitespaces
SreeramdasLavanya Oct 17, 2024
af01908
grpc-api/stub: Renamed convert() method to convertToNanos()
SreeramdasLavanya Oct 18, 2024
3dbb61e
grpc-api/stub: Changes for InternalTimeUtils and TimeUtils files as p…
SreeramdasLavanya Oct 22, 2024
7e46762
grpc-api/stub: Checkstyle issue
SreeramdasLavanya Oct 22, 2024
e530050
grpc-api/stub: Check style issue for InternalTimeUtils
SreeramdasLavanya Oct 22, 2024
7d9bfdf
grpc-api/stub: Included @ExperimentalApi for public API.
SreeramdasLavanya Oct 23, 2024
301ff57
grpc-api/stub: Included @ExperimentalApi for public API's those recei…
SreeramdasLavanya Oct 24, 2024
de91ea3
Merge branch 'grpc:master' into FixIssue10245
SreeramdasLavanya Oct 25, 2024
27df5f9
grpc-api/stub: Included schedule() with Duration
SreeramdasLavanya Oct 25, 2024
89afd10
grpc-api: Included private constructor
SreeramdasLavanya Oct 29, 2024
75c8955
grpc-api: Fix checkstyle issue
SreeramdasLavanya Oct 29, 2024
1dd8bbc
Merge branch 'grpc:master' into FixIssue10245
SreeramdasLavanya Oct 30, 2024
761a812
grpc-api/stub: Created new issue for ExperimentalApi
SreeramdasLavanya Oct 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Issue 10245 - Fixed Checkstyle issues
  • Loading branch information
SreeramdasLavanya committed Sep 26, 2024
commit c1090b72c13bfa72116eb2a5f28d2e7bb457edcf
6 changes: 4 additions & 2 deletions api/src/context/java/io/grpc/Deadline.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ public static Deadline after(long duration, TimeUnit units) {
}

public static Deadline after(Duration duration) {
return after(TimeUnit.NANOSECONDS.convert(duration.getSeconds(), TimeUnit.SECONDS), TimeUnit.NANOSECONDS, SYSTEM_TICKER);
return after(TimeUnit.NANOSECONDS.convert(duration.getSeconds(), TimeUnit.SECONDS),
TimeUnit.NANOSECONDS, SYSTEM_TICKER);
}

/**
Expand Down Expand Up @@ -101,7 +102,8 @@ public static Deadline after(long duration, TimeUnit units, Ticker ticker) {
}

public static Deadline after(Duration duration, Ticker ticker) {
return after(TimeUnit.NANOSECONDS.convert(duration.getSeconds(), TimeUnit.SECONDS), TimeUnit.NANOSECONDS, ticker);
return after(TimeUnit.NANOSECONDS.convert(duration.getSeconds(), TimeUnit.SECONDS),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a concern about the loss of precision, I have raised a question on Eric's comment to use TimeUnit.NANOSECONDS.convert(duration) instead of Duration.toNano().

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As Eric replied, you should be using https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/util/concurrent/TimeUnit.html#convert(java.time.Duration) and not have to convert using the seconds value.

TimeUnit.NANOSECONDS, ticker);
}

private final Ticker ticker;
Expand Down
5 changes: 3 additions & 2 deletions api/src/main/java/io/grpc/SynchronizationContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,9 @@ public String toString() {
public final ScheduledHandle scheduleWithFixedDelay (
final Runnable task, Duration initialDelay, Duration delay,
ScheduledExecutorService timerService) {
return scheduleWithFixedDelay(task, TimeUnit.NANOSECONDS.convert(initialDelay.getSeconds(), TimeUnit.SECONDS),
TimeUnit.NANOSECONDS.convert(delay.getSeconds(), TimeUnit.SECONDS), TimeUnit.NANOSECONDS, timerService);
return scheduleWithFixedDelay(task, TimeUnit.NANOSECONDS.convert(initialDelay.getSeconds(),
TimeUnit.SECONDS), TimeUnit.NANOSECONDS.convert(delay.getSeconds(), TimeUnit.SECONDS),
TimeUnit.NANOSECONDS, timerService);
}

private static class ManagedRunnable implements Runnable {
Expand Down
3 changes: 2 additions & 1 deletion api/src/test/java/io/grpc/DeadlineTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ public void deadlineMatchesLongValue() {

@Test
public void deadLineMatchesDurationValue(){
assertEquals(10, Deadline.after(Duration.ofMinutes(10), ticker).timeRemaining(TimeUnit.MINUTES));
assertEquals(10, Deadline.after(Duration.ofMinutes(10), ticker)
.timeRemaining(TimeUnit.MINUTES));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion api/src/test/java/io/grpc/SynchronizationContextTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public void schedule() {
}

@Test
public void scheduleWithFixedDelayDuration(){
public void scheduleWithFixedDelayDuration() {
MockScheduledExecutorService executorService = new MockScheduledExecutorService();
ScheduledHandle handle =
syncContext.scheduleWithFixedDelay(task1, Duration.ofSeconds(10),
Expand Down
Loading