Skip to content

Commit 0a58884

Browse files
Copilotsamvaity
Copilot
and
samvaity
committed
Rename addBeforeRequestHook to addBeforeRequestInterceptor for better Java naming
Co-authored-by: samvaity <[email protected]>
1 parent 4bc5200 commit 0a58884

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎sdk/clientcore/annotation-processor-test/src/test/java/io/clientcore/annotation/processor/test/TestInterfaceServiceClientGenerationTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,7 @@ public void requestContextChangesBody() {
15161516

15171517
HttpBinJSON response = service.put(getServerUri(isSecure()), 42,
15181518
RequestContext.builder()
1519-
.addBeforeRequestHook(httpRequest -> httpRequest.setBody(BinaryData.fromString("24")))
1519+
.addBeforeRequestInterceptor(httpRequest -> httpRequest.setBody(BinaryData.fromString("24")))
15201520
.build());
15211521

15221522
assertNotNull(response);
@@ -1533,7 +1533,7 @@ public void requestContextChangesBodyAndContentLength() {
15331533

15341534
HttpBinJSON response = service.put(getServerUri(isSecure()), 42,
15351535
RequestContext.builder()
1536-
.addBeforeRequestHook(httpRequest -> httpRequest.setBody(BinaryData.fromString("4242"))
1536+
.addBeforeRequestInterceptor(httpRequest -> httpRequest.setBody(BinaryData.fromString("4242"))
15371537
.getHeaders()
15381538
.add(HttpHeaderName.CONTENT_LENGTH, "4"))
15391539
.build());
@@ -1555,7 +1555,7 @@ public void requestContextAddAHeader() {
15551555

15561556
HttpBinJSON response = service.put(getServerUri(isSecure()), 42,
15571557
RequestContext.builder()
1558-
.addBeforeRequestHook(
1558+
.addBeforeRequestInterceptor(
15591559
httpRequest -> httpRequest.getHeaders().add(new HttpHeader(RANDOM_HEADER, "randomValue")))
15601560
.build());
15611561

@@ -1574,7 +1574,7 @@ public void requestContextSetsAHeader() {
15741574

15751575
HttpBinJSON response = service.put(getServerUri(isSecure()), 42,
15761576
RequestContext.builder()
1577-
.addBeforeRequestHook(httpRequest -> httpRequest.getHeaders()
1577+
.addBeforeRequestInterceptor(httpRequest -> httpRequest.getHeaders()
15781578
.add(new HttpHeader(RANDOM_HEADER, "randomValue"))
15791579
.add(RANDOM_HEADER, "randomValue2"))
15801580
.build());

‎sdk/clientcore/core/src/main/java/io/clientcore/core/http/models/RequestContext.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
* <!-- src_embed io.clientcore.core.http.rest.requestcontext.postrequest -->
101101
* <pre>
102102
* RequestContext context = RequestContext.builder&#40;&#41;
103-
* .addBeforeRequestHook&#40;request -&gt; request
103+
* .addBeforeRequestInterceptor&#40;request -&gt; request
104104
* &#47;&#47; may already be set if request is created from a client
105105
* .setUri&#40;&quot;https:&#47;&#47;petstore.example.com&#47;pet&quot;&#41;
106106
* .setMethod&#40;HttpMethod.POST&#41;
@@ -239,16 +239,16 @@ public static class Builder {
239239
}
240240

241241
/**
242-
* Adds a custom hook to modify the {@link HttpRequest} before it's sent by the {@link HttpClient}. The
242+
* Adds a custom interceptor to modify the {@link HttpRequest} before it's sent by the {@link HttpClient}. The
243243
* modifications made on a {@link RequestContext} object are applied in order on the request.
244244
*
245-
* @param requestHook The request hook to apply before the request is sent.
245+
* @param requestInterceptor The request interceptor to apply before the request is sent.
246246
* @return The updated {@link Builder} object.
247-
* @throws NullPointerException If {@code requestHook} is null.
247+
* @throws NullPointerException If {@code requestInterceptor} is null.
248248
*/
249-
public Builder addBeforeRequestHook(Consumer<HttpRequest> requestHook) {
250-
Objects.requireNonNull(requestHook, "'requestHook' cannot be null.");
251-
this.requestCallback = this.requestCallback.andThen(requestHook);
249+
public Builder addBeforeRequestInterceptor(Consumer<HttpRequest> requestInterceptor) {
250+
Objects.requireNonNull(requestInterceptor, "'requestInterceptor' cannot be null.");
251+
this.requestCallback = this.requestCallback.andThen(requestInterceptor);
252252
return this;
253253
}
254254

‎sdk/clientcore/core/src/samples/java/io/clientcore/core/http/models/RequestContextJavaDocCodeSnippets.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public RequestContext setJsonRequestBodyInRequestContext() {
5757

5858
// BEGIN: io.clientcore.core.http.rest.requestcontext.postrequest
5959
RequestContext context = RequestContext.builder()
60-
.addBeforeRequestHook(request -> request
60+
.addBeforeRequestInterceptor(request -> request
6161
// may already be set if request is created from a client
6262
.setUri("https://petstore.example.com/pet")
6363
.setMethod(HttpMethod.POST)

‎sdk/clientcore/core/src/test/java/io/clientcore/core/http/models/RequestContextTests.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void addHeader() {
4040
= new HttpRequest().setMethod(HttpMethod.POST).setUri(URI.create("http://request.uri"));
4141

4242
RequestContext context = RequestContext.builder()
43-
.addBeforeRequestHook(r -> r.getHeaders()
43+
.addBeforeRequestInterceptor(r -> r.getHeaders()
4444
.add(new HttpHeader(X_MS_FOO, "bar"))
4545
.add(new HttpHeader(HttpHeaderName.CONTENT_TYPE, "application/json")))
4646
.build();
@@ -52,16 +52,16 @@ public void addHeader() {
5252
}
5353

5454
@Test
55-
public void addBeforeRequestHook() {
55+
public void addBeforeRequestInterceptor() {
5656
final HttpRequest request
5757
= new HttpRequest().setMethod(HttpMethod.POST).setUri(URI.create("http://request.uri"));
5858

5959
RequestContext context = RequestContext.builder()
60-
.addBeforeRequestHook(r -> r.getHeaders().add(new HttpHeader(X_MS_FOO, "bar")))
61-
.addBeforeRequestHook(r -> r.setMethod(HttpMethod.GET))
62-
.addBeforeRequestHook(r -> r.setUri("https://request.uri"))
60+
.addBeforeRequestInterceptor(r -> r.getHeaders().add(new HttpHeader(X_MS_FOO, "bar")))
61+
.addBeforeRequestInterceptor(r -> r.setMethod(HttpMethod.GET))
62+
.addBeforeRequestInterceptor(r -> r.setUri("https://request.uri"))
6363
.addQueryParam("$skipToken", "1")
64-
.addBeforeRequestHook(r -> r.getHeaders().set(X_MS_FOO, "baz"))
64+
.addBeforeRequestInterceptor(r -> r.getHeaders().set(X_MS_FOO, "baz"))
6565
.build();
6666

6767
context.getRequestCallback().accept(request);
@@ -73,15 +73,15 @@ public void addBeforeRequestHook() {
7373
}
7474

7575
@Test
76-
public void multipleBeforeRequestHooks() {
76+
public void multipleBeforeRequestInterceptors() {
7777
final HttpRequest request
7878
= new HttpRequest().setMethod(HttpMethod.POST).setUri(URI.create("http://request.uri"));
7979

8080
RequestContext context = RequestContext.builder()
81-
.addBeforeRequestHook(r -> r.getHeaders().add(new HttpHeader(X_MS_FOO, "first")))
82-
.addBeforeRequestHook(r -> r.setMethod(HttpMethod.GET))
83-
.addBeforeRequestHook(r -> r.setUri("https://mixed.uri"))
84-
.addBeforeRequestHook(r -> r.getHeaders().set(X_MS_FOO, "last"))
81+
.addBeforeRequestInterceptor(r -> r.getHeaders().add(new HttpHeader(X_MS_FOO, "first")))
82+
.addBeforeRequestInterceptor(r -> r.setMethod(HttpMethod.GET))
83+
.addBeforeRequestInterceptor(r -> r.setUri("https://mixed.uri"))
84+
.addBeforeRequestInterceptor(r -> r.getHeaders().set(X_MS_FOO, "last"))
8585
.build();
8686

8787
context.getRequestCallback().accept(request);

‎sdk/clientcore/core/src/test/java/io/clientcore/core/implementation/http/rest/RequestContextTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void addHeader() {
3737
final HttpRequest request
3838
= new HttpRequest().setMethod(HttpMethod.POST).setUri(URI.create("http://request.uri"));
3939
RequestContext context = RequestContext.builder()
40-
.addBeforeRequestHook(request2 -> request2.getHeaders()
40+
.addBeforeRequestInterceptor(request2 -> request2.getHeaders()
4141
.add(new HttpHeader(X_MS_FOO, "bar"))
4242
.set(HttpHeaderName.CONTENT_TYPE, "application/json"))
4343
.build();
@@ -58,7 +58,7 @@ public void setBody() {
5858

5959
BinaryData requestBody = BinaryData.fromString(expected);
6060
RequestContext context
61-
= RequestContext.builder().addBeforeRequestHook(request2 -> request2.setBody(requestBody)).build();
61+
= RequestContext.builder().addBeforeRequestInterceptor(request2 -> request2.setBody(requestBody)).build();
6262
context.getRequestCallback().accept(request);
6363
BinaryData actual = request.getBody();
6464

@@ -67,11 +67,11 @@ public void setBody() {
6767
}
6868

6969
@Test
70-
public void addBeforeRequestHook() {
70+
public void addBeforeRequestInterceptor() {
7171
final HttpRequest request
7272
= new HttpRequest().setMethod(HttpMethod.POST).setUri(URI.create("http://request.uri"));
7373
RequestContext context = RequestContext.builder()
74-
.addBeforeRequestHook(request2 -> request2
74+
.addBeforeRequestInterceptor(request2 -> request2
7575
// may already be set if request is created from a client
7676
.setUri("https://request.uri")
7777
.setMethod(HttpMethod.GET)
@@ -88,11 +88,11 @@ public void addBeforeRequestHook() {
8888
}
8989

9090
@Test
91-
public void addBeforeRequestHookWorks() {
91+
public void addBeforeRequestInterceptorWorks() {
9292
final HttpRequest request
9393
= new HttpRequest().setMethod(HttpMethod.POST).setUri(URI.create("http://request.uri"));
9494
RequestContext context = RequestContext.builder()
95-
.addBeforeRequestHook(request2 -> request2.setUri("https://updated.uri")
95+
.addBeforeRequestInterceptor(request2 -> request2.setUri("https://updated.uri")
9696
.setMethod(HttpMethod.GET)
9797
.getHeaders()
9898
.set(X_MS_FOO, "updated"))

‎sdk/clientcore/core/src/test/java/io/clientcore/core/implementation/http/rest/SwaggerMethodParserTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ private static Stream<Arguments> setRequestContextSupplier() throws NoSuchMethod
519519
SwaggerMethodParser swaggerMethodParser = new SwaggerMethodParser(method);
520520

521521
RequestContext context = RequestContext.builder()
522-
.addBeforeRequestHook(request -> request
522+
.addBeforeRequestInterceptor(request -> request
523523
// may already be set if request is created from a client
524524
.setUri("https://foo.host.com")
525525
.setBody(BinaryData.fromString("{\"id\":\"123" + "\"}"))

0 commit comments

Comments
 (0)