@@ -24,17 +24,17 @@ public FetchExpression(
2424 Expression content = null ,
2525 Expression clientName = null )
2626 {
27- ArgumentNullException . ThrowIfNull ( url , nameof ( url ) ) ;
28- ArgumentNullException . ThrowIfNull ( method , nameof ( method ) ) ;
27+ ArgumentNullException . ThrowIfNull ( url , nameof ( url ) ) ;
28+ ArgumentNullException . ThrowIfNull ( method , nameof ( method ) ) ;
2929
30- if ( url . Type != typeof ( string ) )
31- throw new ArgumentException ( "Url must be of type string." , nameof ( url ) ) ;
30+ if ( url . Type != typeof ( string ) )
31+ throw new ArgumentException ( "Url must be of type string." , nameof ( url ) ) ;
3232
33- if ( method . Type != typeof ( HttpMethod ) )
34- throw new ArgumentException ( "Method must be of type HttpMethod." , nameof ( method ) ) ;
33+ if ( method . Type != typeof ( HttpMethod ) )
34+ throw new ArgumentException ( "Method must be of type HttpMethod." , nameof ( method ) ) ;
3535
36- if ( headers != null && headers . Type != typeof ( Dictionary < string , string > ) )
37- throw new ArgumentException ( "Headers must be of type Dictionary<string, string>." , nameof ( headers ) ) ;
36+ if ( headers != null && headers . Type != typeof ( Dictionary < string , string > ) )
37+ throw new ArgumentException ( "Headers must be of type Dictionary<string, string>." , nameof ( headers ) ) ;
3838
3939 Url = url ;
4040 Method = method ;
@@ -43,36 +43,36 @@ public FetchExpression(
4343 ClientName = clientName ;
4444 }
4545
46- public override Type Type => typeof ( Task < HttpResponseMessage > ) ;
46+ public override Type Type => typeof ( Task < HttpResponseMessage > ) ;
4747 public override ExpressionType NodeType => ExpressionType . Extension ;
4848 public override bool CanReduce => true ;
4949
5050 private static readonly ConstructorInfo RequestConstructorInfo = typeof ( HttpRequestMessage ) . GetConstructor ( [ typeof ( HttpMethod ) , typeof ( string ) ] ) ;
5151
5252 public override Expression Reduce ( )
5353 {
54- if ( _serviceProvider == null )
55- throw new InvalidOperationException ( "IServiceProvider has not been set." ) ;
54+ if ( _serviceProvider == null )
55+ throw new InvalidOperationException ( "IServiceProvider has not been set." ) ;
5656
5757 // Create service provider constant
58- var providerConst = Constant ( _serviceProvider ) ;
58+ var providerConst = Constant ( _serviceProvider ) ;
5959
6060 Expression resolveHttpClient ;
6161
62- if ( ClientName != null )
62+ if ( ClientName != null )
6363 {
6464 // Resolve IHttpClientFactory and call CreateClient(name)
6565 var getFactory = Call (
66- typeof ( ServiceProviderServiceExtensions ) ,
67- nameof ( ServiceProviderServiceExtensions . GetRequiredService ) ,
68- [ typeof ( IHttpClientFactory ) ] ,
66+ typeof ( ServiceProviderServiceExtensions ) ,
67+ nameof ( ServiceProviderServiceExtensions . GetRequiredService ) ,
68+ [ typeof ( IHttpClientFactory ) ] ,
6969 providerConst
7070 ) ;
7171
72- var factoryVar = Variable ( typeof ( IHttpClientFactory ) , "factory" ) ;
72+ var factoryVar = Variable ( typeof ( IHttpClientFactory ) , "factory" ) ;
7373
74- var assignFactory = Assign ( factoryVar , getFactory ) ;
75- var createClient = Call ( factoryVar , nameof ( IHttpClientFactory . CreateClient ) , null , ClientName ) ;
74+ var assignFactory = Assign ( factoryVar , getFactory ) ;
75+ var createClient = Call ( factoryVar , nameof ( IHttpClientFactory . CreateClient ) , null , ClientName ) ;
7676
7777 resolveHttpClient = Block (
7878 [ factoryVar ] ,
@@ -84,25 +84,25 @@ public override Expression Reduce()
8484 {
8585 // Resolve HttpClient directly
8686 resolveHttpClient = Call (
87- typeof ( ServiceProviderServiceExtensions ) ,
88- nameof ( ServiceProviderServiceExtensions . GetRequiredService ) ,
89- [ typeof ( HttpClient ) ] ,
87+ typeof ( ServiceProviderServiceExtensions ) ,
88+ nameof ( ServiceProviderServiceExtensions . GetRequiredService ) ,
89+ [ typeof ( HttpClient ) ] ,
9090 providerConst
9191 ) ;
9292 }
9393
94- var clientVar = Variable ( typeof ( HttpClient ) , "client" ) ;
95- var assignClient = Assign ( clientVar , resolveHttpClient ) ;
94+ var clientVar = Variable ( typeof ( HttpClient ) , "client" ) ;
95+ var assignClient = Assign ( clientVar , resolveHttpClient ) ;
9696
9797 // Create HttpRequestMessage
98- var requestVar = Variable ( typeof ( HttpRequestMessage ) , "request" ) ;
99-
98+ var requestVar = Variable ( typeof ( HttpRequestMessage ) , "request" ) ;
99+
100100 var requestCtor = New (
101101 RequestConstructorInfo ,
102102 Method ,
103103 Url
104104 ) ;
105- var assignRequest = Assign ( requestVar , requestCtor ) ;
105+ var assignRequest = Assign ( requestVar , requestCtor ) ;
106106
107107 var variables = new List < ParameterExpression > { clientVar , requestVar } ;
108108 var block = new List < Expression > {
@@ -111,55 +111,55 @@ public override Expression Reduce()
111111 } ;
112112
113113 // Optional headers
114- if ( Headers != null )
114+ if ( Headers != null )
115115 {
116116 var headersVar = Variable ( typeof ( Dictionary < string , string > ) , "headers" ) ;
117117 variables . Add ( headersVar ) ;
118- block . Add ( Assign ( headersVar , Headers ) ) ;
118+ block . Add ( Assign ( headersVar , Headers ) ) ;
119119
120- var kvp = Parameter ( typeof ( KeyValuePair < string , string > ) , "kvp" ) ;
120+ var kvp = Parameter ( typeof ( KeyValuePair < string , string > ) , "kvp" ) ;
121121
122122 var addHeader = Call (
123- Property ( requestVar , nameof ( HttpRequestMessage . Headers ) ) ,
124- nameof ( HttpRequestHeaders . Add ) ,
123+ Property ( requestVar , nameof ( HttpRequestMessage . Headers ) ) ,
124+ nameof ( HttpRequestHeaders . Add ) ,
125125 null ,
126- Property ( kvp , nameof ( KeyValuePair < string , string > . Key ) ) ,
127- Property ( kvp , nameof ( KeyValuePair < string , string > . Value ) )
126+ Property ( kvp , nameof ( KeyValuePair < string , string > . Key ) ) ,
127+ Property ( kvp , nameof ( KeyValuePair < string , string > . Value ) )
128128 ) ;
129129
130- block . Add ( ForEach ( headersVar , kvp , addHeader ) ) ;
130+ block . Add ( ForEach ( headersVar , kvp , addHeader ) ) ;
131131 }
132132
133133 // Optional content
134- if ( Content != null )
134+ if ( Content != null )
135135 {
136- block . Add ( Assign (
137- Property ( requestVar , nameof ( HttpRequestMessage . Content ) ) ,
136+ block . Add ( Assign (
137+ Property ( requestVar , nameof ( HttpRequestMessage . Content ) ) ,
138138 Content
139- ) ) ;
139+ ) ) ;
140140 }
141141
142142 // SendAsync call
143- var sendCall = Call ( clientVar , nameof ( HttpClient . SendAsync ) , null , requestVar ) ;
143+ var sendCall = Call ( clientVar , nameof ( HttpClient . SendAsync ) , null , requestVar ) ;
144144
145145 return Block (
146146 variables ,
147- block . Append ( sendCall )
147+ block . Append ( sendCall )
148148 ) ;
149149 }
150150
151- public void SetServiceProvider ( IServiceProvider serviceProvider )
151+ public void SetServiceProvider ( IServiceProvider serviceProvider )
152152 {
153153 _serviceProvider = serviceProvider ;
154154 }
155155
156- protected override Expression VisitChildren ( ExpressionVisitor visitor )
156+ protected override Expression VisitChildren ( ExpressionVisitor visitor )
157157 {
158158 return new FetchExpression (
159- visitor . Visit ( Url ) ,
160- visitor . Visit ( Method ) ,
161- Headers != null ? visitor . Visit ( Headers ) : null ,
162- Content != null ? visitor . Visit ( Content ) : null ,
159+ visitor . Visit ( Url ) ,
160+ visitor . Visit ( Method ) ,
161+ Headers != null ? visitor . Visit ( Headers ) : null ,
162+ Content != null ? visitor . Visit ( Content ) : null ,
163163 ClientName
164164 ) ;
165165 }
@@ -173,6 +173,6 @@ public static FetchExpression Fetch( Expression clientName,
173173 Expression content = null ,
174174 Expression headers = null )
175175 {
176- return new FetchExpression ( url , method , headers , content , clientName ) ;
176+ return new FetchExpression ( url , method , headers , content , clientName ) ;
177177 }
178178}
0 commit comments