Skip to content

Commit 4bc5200

Browse files
Copilotalzimmermsft
andcommitted
Remove addRequestCallback method entirely as requested by @alzimmermsft
Co-authored-by: alzimmermsft <[email protected]>
1 parent 2f6e85e commit 4bc5200

File tree

4 files changed

+14
-31
lines changed

4 files changed

+14
-31
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-
.addRequestCallback(httpRequest -> httpRequest.setBody(BinaryData.fromString("24")))
1519+
.addBeforeRequestHook(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-
.addRequestCallback(httpRequest -> httpRequest.setBody(BinaryData.fromString("4242"))
1536+
.addBeforeRequestHook(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-
.addRequestCallback(
1558+
.addBeforeRequestHook(
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-
.addRequestCallback(httpRequest -> httpRequest.getHeaders()
1577+
.addBeforeRequestHook(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: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -238,22 +238,6 @@ public static class Builder {
238238
this.context = context;
239239
}
240240

241-
/**
242-
* Adds a custom request callback to modify the {@link HttpRequest} before it's sent by the {@link HttpClient}. The
243-
* modifications made on a {@link RequestContext} object are applied in order on the request.
244-
*
245-
* @param requestCallback The request callback.
246-
* @return The updated {@link Builder} object.
247-
* @throws NullPointerException If {@code requestCallback} is null.
248-
* @deprecated Use {@link #addBeforeRequestHook(Consumer)} as it better conveys that the hook executes before the request is sent.
249-
*/
250-
@Deprecated
251-
public Builder addRequestCallback(Consumer<HttpRequest> requestCallback) {
252-
Objects.requireNonNull(requestCallback, "'requestCallback' cannot be null.");
253-
this.requestCallback = this.requestCallback.andThen(requestCallback);
254-
return this;
255-
}
256-
257241
/**
258242
* Adds a custom hook to modify the {@link HttpRequest} before it's sent by the {@link HttpClient}. The
259243
* modifications made on a {@link RequestContext} object are applied in order on the request.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,21 @@ public void addBeforeRequestHook() {
7373
}
7474

7575
@Test
76-
@SuppressWarnings("deprecation")
77-
public void addRequestCallbackBackwardCompatibility() {
76+
public void multipleBeforeRequestHooks() {
7877
final HttpRequest request
7978
= new HttpRequest().setMethod(HttpMethod.POST).setUri(URI.create("http://request.uri"));
8079

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

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

8989
HttpHeaders headers = request.getHeaders();
90-
assertEquals("legacy", headers.getValue(X_MS_FOO));
90+
assertEquals("last", headers.getValue(X_MS_FOO));
9191
assertEquals(HttpMethod.GET, request.getHttpMethod());
9292
assertEquals("https://mixed.uri", request.getUri().toString());
9393
}

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,21 +88,20 @@ public void addBeforeRequestHook() {
8888
}
8989

9090
@Test
91-
@SuppressWarnings("deprecation")
92-
public void addRequestCallbackStillWorks() {
91+
public void addBeforeRequestHookWorks() {
9392
final HttpRequest request
9493
= new HttpRequest().setMethod(HttpMethod.POST).setUri(URI.create("http://request.uri"));
9594
RequestContext context = RequestContext.builder()
96-
.addRequestCallback(request2 -> request2.setUri("https://deprecated.uri")
95+
.addBeforeRequestHook(request2 -> request2.setUri("https://updated.uri")
9796
.setMethod(HttpMethod.GET)
9897
.getHeaders()
99-
.set(X_MS_FOO, "deprecated"))
98+
.set(X_MS_FOO, "updated"))
10099
.build();
101100
context.getRequestCallback().accept(request);
102101

103102
HttpHeaders headers = request.getHeaders();
104-
assertEquals("deprecated", headers.getValue(X_MS_FOO));
103+
assertEquals("updated", headers.getValue(X_MS_FOO));
105104
assertEquals(HttpMethod.GET, request.getHttpMethod());
106-
assertEquals("https://deprecated.uri", request.getUri().toString());
105+
assertEquals("https://updated.uri", request.getUri().toString());
107106
}
108107
}

0 commit comments

Comments
 (0)