@@ -30,49 +30,51 @@ extension WaitForOperation on Operation {
3030 return operation.response.unpackInto (response);
3131 }
3232
33- Stream <OperationState <Metadata , Response >>
34- stream <Metadata extends GeneratedMessage , Response extends GeneratedMessage >({
33+ Stream <OperationState <TMetadata , TResponse >> stream<
34+ TMetadata extends GeneratedMessage ,
35+ TResponse extends GeneratedMessage
36+ > ({
3537 required OperationsProtocol operations,
36- required Metadata metadata,
37- required Response response,
38+ required TMetadata metadata,
39+ required TResponse response,
3840 Logger ? logger,
3941 }) {
4042 if (done) {
4143 return Stream .value (
42- state <Metadata , Response >(metadata: metadata, response: response),
44+ state <TMetadata , TResponse >(metadata: metadata, response: response),
4345 );
4446 }
4547 return OperationWaiter (
4648 this ,
4749 protocol: operations,
4850 logger: logger,
4951 ).stream.map ((operation) {
50- return operation.state <Metadata , Response >(
52+ return operation.state <TMetadata , TResponse >(
5153 metadata: metadata,
5254 response: response,
5355 );
5456 });
5557 }
5658
57- OperationState <Metadata , Response > state<
58- Metadata extends GeneratedMessage ,
59- Response extends GeneratedMessage
60- > ({required Metadata metadata, required Response response}) {
59+ OperationState <TMetadata , TResponse > state<
60+ TMetadata extends GeneratedMessage ,
61+ TResponse extends GeneratedMessage
62+ > ({required TMetadata metadata, required TResponse response}) {
6163 if (done) {
6264 if (hasError ()) {
63- return OperationFailure <Metadata , Response >(
65+ return OperationFailure <TMetadata , TResponse >(
6466 id: name,
6567 metadata: hasMetadata () ? metadata.unpack (this .metadata) : metadata,
6668 error: error.grpcError,
6769 );
6870 }
69- return OperationSuccess <Metadata , Response >(
71+ return OperationSuccess <TMetadata , TResponse >(
7072 id: name,
7173 metadata: hasMetadata () ? metadata.unpack (this .metadata) : metadata,
7274 response: response.unpack (ensureResponse ()),
7375 );
7476 }
75- return OperationInProgress <Metadata , Response >(
77+ return OperationInProgress <TMetadata , TResponse >(
7678 id: name,
7779 metadata: hasMetadata () ? metadata.unpack (this .metadata) : metadata,
7880 );
@@ -92,24 +94,24 @@ extension<T extends GeneratedMessage> on T {
9294}
9395
9496sealed class OperationState <
95- Metadata extends GeneratedMessage ,
96- Response extends GeneratedMessage
97+ TMetadata extends GeneratedMessage ,
98+ TResponse extends GeneratedMessage
9799> {
98100 OperationState ({required this .id, required this .metadata});
99101
100102 final String id;
101- final Metadata metadata;
103+ final TMetadata metadata;
102104
103105 bool get done => false ;
104- Response ? get response => null ;
106+ TResponse ? get response => null ;
105107 GrpcError ? get error => null ;
106108}
107109
108110final class OperationInProgress <
109- Metadata extends GeneratedMessage ,
110- Response extends GeneratedMessage
111+ TMetadata extends GeneratedMessage ,
112+ TResponse extends GeneratedMessage
111113>
112- extends OperationState <Metadata , Response > {
114+ extends OperationState <TMetadata , TResponse > {
113115 OperationInProgress ({required super .id, required super .metadata});
114116
115117 @override
@@ -122,10 +124,10 @@ final class OperationInProgress<
122124}
123125
124126final class OperationSuccess <
125- Metadata extends GeneratedMessage ,
126- Response extends GeneratedMessage
127+ TMetadata extends GeneratedMessage ,
128+ TResponse extends GeneratedMessage
127129>
128- extends OperationState <Metadata , Response > {
130+ extends OperationState <TMetadata , TResponse > {
129131 OperationSuccess ({
130132 required super .id,
131133 required super .metadata,
@@ -136,7 +138,7 @@ final class OperationSuccess<
136138 bool get done => true ;
137139
138140 @override
139- final Response response;
141+ final TResponse response;
140142
141143 @override
142144 String toString () {
@@ -149,10 +151,10 @@ final class OperationSuccess<
149151}
150152
151153final class OperationCancelled <
152- Metadata extends GeneratedMessage ,
153- Response extends GeneratedMessage
154+ TMetadata extends GeneratedMessage ,
155+ TResponse extends GeneratedMessage
154156>
155- extends OperationState <Metadata , Response > {
157+ extends OperationState <TMetadata , TResponse > {
156158 OperationCancelled ({required super .id, required super .metadata});
157159
158160 @override
@@ -168,10 +170,10 @@ final class OperationCancelled<
168170}
169171
170172final class OperationFailure <
171- Metadata extends GeneratedMessage ,
172- Response extends GeneratedMessage
173+ TMetadata extends GeneratedMessage ,
174+ TResponse extends GeneratedMessage
173175>
174- extends OperationState <Metadata , Response > {
176+ extends OperationState <TMetadata , TResponse > {
175177 OperationFailure ({
176178 required super .id,
177179 required super .metadata,
0 commit comments