Skip to content

Introduce custom NameResolver.Args #11669

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 28 commits into from
Dec 20, 2024
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
707e1da
Introduce NameResolver.Args extensions.
jdcormie Nov 5, 2024
54e089b
Introduce NameResolver.Args extensions.
jdcormie Nov 5, 2024
f2a7b81
Merge remote-tracking branch 'origin/multi-user-nrp' into multi-user-nrp
jdcormie Nov 5, 2024
ce2930f
Introduce NameResolver.Args extensions.
jdcormie Nov 5, 2024
2f30771
fixes
jdcormie Nov 5, 2024
1a21575
understand
jdcormie Nov 5, 2024
07cb7c2
appropriate
jdcormie Nov 5, 2024
169e993
meaning
jdcormie Nov 5, 2024
a5c714a
javadoc
jdcormie Nov 5, 2024
1874264
polish
jdcormie Nov 6, 2024
2fbfc89
value/key
jdcormie Nov 6, 2024
a4b6f07
rename
jdcormie Nov 6, 2024
7f48a33
Address code review comments.
jdcormie Nov 20, 2024
76d1742
javadoc
jdcormie Nov 20, 2024
a216397
Copy forward AttributesTest.java
jdcormie Nov 20, 2024
29d01c7
Beef up unit tests
jdcormie Nov 20, 2024
9fbbc6e
Merge branch 'master' into multi-user-nrp
jdcormie Nov 26, 2024
1a79734
Merge branch 'grpc:master' into multi-user-nrp
jdcormie Dec 10, 2024
9ff19f7
Rename get/setExtension to be like CallOptions#get/setOption
jdcormie Dec 10, 2024
3124a91
Delete Extensions nested class completely.
jdcormie Dec 17, 2024
7653270
A few more extended -> custom renames
jdcormie Dec 17, 2024
5d4a24d
one more extension rename
jdcormie Dec 17, 2024
38946a4
Disallow null arg keys/values just like CallOptions does.
jdcormie Dec 17, 2024
2575fb1
returns
jdcormie Dec 17, 2024
e7fbb5c
extension
jdcormie Dec 18, 2024
2a97cb7
Merge branch `grpc:master` into multi-user-nrp
jdcormie Dec 18, 2024
0857a68
checkNotNull
jdcormie Dec 20, 2024
079a548
Merge branch 'multi-user-nrp' of https://github.com/jdcormie/grpc-jav…
jdcormie Dec 20, 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
extension
  • Loading branch information
jdcormie committed Dec 18, 2024
commit e7fbb5c37e73c6d3f15e6eb3c8f4fde1d9b9a688
8 changes: 4 additions & 4 deletions api/src/test/java/io/grpc/NameResolverTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public class NameResolverTest {
private final Executor executor = Executors.newSingleThreadExecutor();
private final String overrideAuthority = "grpc.io";
private final MetricRecorder metricRecorder = new MetricRecorder() {};
private final int extensionArgValue = 42;
private final int customArgValue = 42;
@Mock NameResolver.Listener mockListener;

@Test
Expand All @@ -84,7 +84,7 @@ public void args() {
assertThat(args.getOffloadExecutor()).isSameInstanceAs(executor);
assertThat(args.getOverrideAuthority()).isSameInstanceAs(overrideAuthority);
assertThat(args.getMetricRecorder()).isSameInstanceAs(metricRecorder);
assertThat(args.getArg(FOO_ARG_KEY)).isEqualTo(extensionArgValue);
assertThat(args.getArg(FOO_ARG_KEY)).isEqualTo(customArgValue);
assertThat(args.getArg(BAR_ARG_KEY)).isNull();

NameResolver.Args args2 = args.toBuilder().build();
Expand All @@ -97,7 +97,7 @@ public void args() {
assertThat(args2.getOffloadExecutor()).isSameInstanceAs(executor);
assertThat(args2.getOverrideAuthority()).isSameInstanceAs(overrideAuthority);
assertThat(args.getMetricRecorder()).isSameInstanceAs(metricRecorder);
assertThat(args.getArg(FOO_ARG_KEY)).isEqualTo(extensionArgValue);
assertThat(args.getArg(FOO_ARG_KEY)).isEqualTo(customArgValue);
assertThat(args.getArg(BAR_ARG_KEY)).isNull();

assertThat(args2).isNotSameInstanceAs(args);
Expand All @@ -115,7 +115,7 @@ private NameResolver.Args createArgs() {
.setOffloadExecutor(executor)
.setOverrideAuthority(overrideAuthority)
.setMetricRecorder(metricRecorder)
.setArg(FOO_ARG_KEY, extensionArgValue)
.setArg(FOO_ARG_KEY, customArgValue)
.build();
}

Expand Down
Loading