Commit eb8520c
authored
Make
This PR is a subset of changes for #6781
Motivation:
The `SnapshotStream` reactive infrastructure in the `xds` module is
currently package-private, which prevents xDS extension factories (e.g.
`HttpFilterFactory`) from using reactive streams to model filters that
depend on external resources. Making this API public is a prerequisite
for upcoming features like `CredentialInjectorFilterFactory` that need
to subscribe to SDS secrets reactively.
Modifications:
- Moved the `SnapshotStream` reactive stream infrastructure from
package-private `com.linecorp.armeria.xds` to a new public
`com.linecorp.armeria.xds.stream` package.
- `SnapshotStream`, `RefCountedStream`, `Subscription` (formerly
`SnapshotStream.Subscription`), and all operators (`MapStream`,
`SwitchMapEagerStream`, `CombineLatest2Stream`, `CombineLatest3Stream`,
`CombineNLatestStream`, `StaticSnapshotStream`, `TriFunction`).
- Made `SnapshotWatcher` public so it can be used as the subscriber type
in the public stream API.
- Updated all internal stream consumers (`ClusterStream`,
`EndpointStream`, `ListenerStream`, `RouteStream`, `SecretStream`,
`DataSourceStream`, `TransportSocketStream`, etc.) to import from the
new `xds.stream` package.
- Simplified `ResourceNodeMeterBinderFactory.ResourceNodeMeterBinder` to
no longer implement `ResourceWatcher`, using plain methods instead.
- Moved stream tests to the `com.linecorp.armeria.xds.stream` package.
Result:
- The `SnapshotStream` API is now public and available for xDS extension
factories to build reactive filter pipelines.
- No behavioral changes — this is a pure refactoring with no changes to
existing functionality.SnapshotStream public (#6784)1 parent b6c91ea commit eb8520c
34 files changed
Lines changed: 393 additions & 141 deletions
File tree
- xds/src
- main/java/com/linecorp/armeria/xds
- stream
- test/java/com/linecorp/armeria/xds/stream
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
27 | 30 | | |
28 | 31 | | |
29 | 32 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
30 | 33 | | |
31 | 34 | | |
32 | 35 | | |
| |||
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
33 | 36 | | |
34 | 37 | | |
35 | 38 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
| 21 | + | |
20 | 22 | | |
21 | 23 | | |
22 | 24 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
22 | 25 | | |
23 | 26 | | |
24 | 27 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
19 | 22 | | |
20 | 23 | | |
21 | 24 | | |
| |||
59 | 62 | | |
60 | 63 | | |
61 | 64 | | |
62 | | - | |
| 65 | + | |
63 | 66 | | |
64 | 67 | | |
65 | 68 | | |
66 | 69 | | |
67 | 70 | | |
68 | | - | |
| 71 | + | |
69 | 72 | | |
70 | 73 | | |
71 | 74 | | |
| |||
0 commit comments