Skip to content

Commit 07b9fc8

Browse files
alzimmermsftalzimmermsft
authored
Fix missing sample compilation in ClientCore libraries (Azure#44478)
1 parent ba2ada9 commit 07b9fc8

File tree

21 files changed

+207
-100
lines changed

21 files changed

+207
-100
lines changed

‎sdk/clientcore/core/spotbugs-exclude.xml‎

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<Or>
6060
<Class name="io.clientcore.core.implementation.serializer.BinaryDataSerializationTests" />
6161
<Class name="io.clientcore.core.serialization.json.JsonReaderTests" />
62+
<Class name="io.clientcore.core.utils.union.BasicUnion" />
6263
</Or>
6364
</Match>
6465
<Match>
@@ -81,9 +82,19 @@
8182
<Match>
8283
<Bug pattern="DLS_DEAD_LOCAL_STORE" />
8384
<Or>
85+
<Class name="io.clientcore.core.credentials.NamedKeyCredentialJavadocCodeSnippets" />
86+
<Class name="io.clientcore.core.http.HttpPipelineBuilderJavaDocCodeSnippets" />
87+
<Class name="io.clientcore.core.http.pipeline.AddHeadersPolicyJavadocCodeSnippets" />
88+
<Class name="io.clientcore.core.http.pipeline.SetRequestIdPolicyJavadocCodeSnippets" />
89+
<Class name="io.clientcore.core.http.pipeline.SetUserAgentPolicyJavadocCodeSnippets" />
8490
<Class name="io.clientcore.core.implementation.http.serializer.HttpResponseDecodeData" />
91+
<Class name="io.clientcore.core.instrumentation.TelemetryForLibraryDevelopersJavaDocCodeSnippets" />
92+
<Class name="io.clientcore.core.models.ContextJavaDocCodeSnippets" />
8593
<Class name="io.clientcore.core.serialization.xml.implementation.aalto.in.ReaderScanner" />
8694
<Class name="io.clientcore.core.utils.AuthorizationChallengeHandlerTests" />
95+
<Class name="io.clientcore.core.utils.ClientOptionsJavadocCodeSnippets" />
96+
<Class name="io.clientcore.core.utils.ConfigurationJavaDocCodeSnippet" />
97+
<Class name="io.clientcore.core.utils.union.codesnippets.UnionJavaDocCodeSnippets" />
8798
</Or>
8899
</Match>
89100
<Match>
@@ -114,6 +125,7 @@
114125
<Class name="io.clientcore.core.implementation.serializer.JsonSerializableEndToEndTests" />
115126
<Class name="io.clientcore.core.instrumentation.logging.ClientLoggerTests" />
116127
<Class name="io.clientcore.core.instrumentation.logging.InstrumentationTestUtils" />
128+
<Class name="io.clientcore.core.models.binarydata.BinaryDataJavaDocCodeSnippet" />
117129
<Class name="io.clientcore.core.models.binarydata.BinaryDataTest" />
118130
<Class name="io.clientcore.core.serialization.json.JsonReader" />
119131
<Class name="io.clientcore.core.serialization.json.JsonWriter" />
@@ -148,7 +160,10 @@
148160
</Match>
149161
<Match>
150162
<Bug pattern="HARD_CODE_PASSWORD" />
151-
<Class name="io.clientcore.core.shared.LocalTestServer" />
163+
<Or>
164+
<Class name="io.clientcore.core.shared.LocalTestServer" />
165+
<Class name="io.clientcore.core.utils.ConfigurationJavaDocCodeSnippet" />
166+
</Or>
152167
</Match>
153168
<Match>
154169
<Bug pattern="HE_HASHCODE_USE_OBJECT_EQUALS" />
@@ -166,6 +181,10 @@
166181
<Class name="io.clientcore.core.serialization.xml.implementation.aalto.UncheckedStreamException" />
167182
</Or>
168183
</Match>
184+
<Match>
185+
<Bug pattern="ISC_INSTANTIATE_STATIC_CLASS" />
186+
<Class name="io.clientcore.core.models.ContextJavaDocCodeSnippets$TraceContext" />
187+
</Match>
169188
<Match>
170189
<Bug pattern="LI_LAZY_INIT_STATIC" />
171190
<Class name="io.clientcore.core.http.client.HttpClientProvider" />
@@ -217,6 +236,7 @@
217236
<Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE" />
218237
<Or>
219238
<Class name="io.clientcore.core.http.pipeline.HttpInstrumentationPolicy" />
239+
<Class name="io.clientcore.core.instrumentation.TelemetryForLibraryDevelopersJavaDocCodeSnippets" />
220240
<Class name="io.clientcore.core.models.binarydata.BinaryDataTest" />
221241
<Class name="io.clientcore.core.utils.CoreUtils" />
222242
</Or>
@@ -280,6 +300,7 @@
280300
<Or>
281301
<Class name="io.clientcore.core.implementation.utils.JsonSerializer" />
282302
<Class name="io.clientcore.core.implementation.utils.XmlSerializer" />
303+
<Class name="io.clientcore.core.models.binarydata.BinaryDataJavaDocCodeSnippet$MyJsonSerializer" />
283304
<Class name="io.clientcore.core.serialization.json.JsonReader" />
284305
<Class name="io.clientcore.core.utils.Base64Uri" />
285306
<Class name="io.clientcore.core.utils.CoreUtils" />
@@ -290,12 +311,16 @@
290311
<Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE" />
291312
<Or>
292313
<Class name="io.clientcore.core.http.pipeline.HttpInstrumentationPolicy" />
314+
<Class name="io.clientcore.core.instrumentation.TelemetryForLibraryDevelopersJavaDocCodeSnippets" />
293315
<Class name="io.clientcore.core.utils.CoreUtils" />
294316
</Or>
295317
</Match>
296318
<Match>
297319
<Bug pattern="RR_NOT_CHECKED" />
298-
<Class name="io.clientcore.core.implementation.http.rest.LengthValidatingInputStreamTests" />
320+
<Or>
321+
<Class name="io.clientcore.core.implementation.http.rest.LengthValidatingInputStreamTests" />
322+
<Class name="io.clientcore.core.models.binarydata.BinaryDataJavaDocCodeSnippet" />
323+
</Or>
299324
</Match>
300325
<Match>
301326
<Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE" />
@@ -345,13 +370,19 @@
345370
<Class name="io.clientcore.core.serialization.xml.implementation.aalto.out.CharXmlWriter" />
346371
</Or>
347372
</Match>
373+
<Match>
374+
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC" />
375+
<Class name="io.clientcore.core.utils.ClientLoggerJavaDocCodeSnippets$LoggableObject" />
376+
</Match>
348377
<Match>
349378
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON" />
350379
<Or>
351380
<Class name="io.clientcore.core.http.pipeline.HttpPipelineTests" />
352381
<Class name="io.clientcore.core.http.pipeline.RedirectPolicyTest" />
353382
<Class name="io.clientcore.core.http.pipeline.RetryPolicyTests" />
354383
<Class name="io.clientcore.core.implementation.serializer.HttpResponseBodyDecoderTests" />
384+
<Class name="io.clientcore.core.instrumentation.TelemetryForLibraryDevelopersJavaDocCodeSnippets" />
385+
<Class name="io.clientcore.core.models.binarydata.BinaryDataJavaDocCodeSnippet" />
355386
<Class name="io.clientcore.core.shared.HttpClientTests" />
356387
<Class name="io.clientcore.core.shared.LocalTestServer" />
357388
</Or>
@@ -367,9 +398,16 @@
367398
<Class name="io.clientcore.core.serialization.xml.implementation.aalto.out.CharXmlWriter" />
368399
</Or>
369400
</Match>
401+
<Match>
402+
<Bug pattern="UC_USELESS_VOID_METHOD" />
403+
<Class name="io.clientcore.core.http.pipeline.SetUserAgentPolicyJavadocCodeSnippets" />
404+
</Match>
370405
<Match>
371406
<Bug pattern="UPM_UNCALLED_PRIVATE_METHOD" />
372-
<Class name="io.clientcore.core.http.models.ETag" />
407+
<Or>
408+
<Class name="io.clientcore.core.http.models.ETag" />
409+
<Class name="io.clientcore.core.models.binarydata.BinaryDataJavaDocCodeSnippet" />
410+
</Or>
373411
</Match>
374412
<Match>
375413
<Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" />

‎sdk/clientcore/core/src/main/java/io/clientcore/core/http/client/JdkHttpClientBuilder.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class JdkHttpClientBuilder {
3333
+ "include a dependency on io.clientcore:http-okhttp3.";
3434

3535
/**
36-
* Creates DefaultHttpClientBuilder.
36+
* Creates JdkHttpClientBuilder.
3737
*/
3838
public JdkHttpClientBuilder() {
3939
throw LOGGER.logThrowableAsError(new UnsupportedOperationException(ERROR_MESSAGE));
@@ -61,13 +61,13 @@ public JdkHttpClientBuilder executor(Executor executor) {
6161
*
6262
* <p><strong>Code Samples</strong></p>
6363
*
64-
* <!-- src_embed io.clientcore.core.http.client.DefaultHttpClientBuilder.connectionTimeout#Duration -->
64+
* <!-- src_embed io.clientcore.core.http.client.JdkHttpClientBuilder.connectionTimeout#Duration -->
6565
* <pre>
66-
* HttpClient client = new DefaultHttpClientBuilder&#40;&#41;
66+
* HttpClient client = new JdkHttpClientBuilder&#40;&#41;
6767
* .connectionTimeout&#40;Duration.ofSeconds&#40;250&#41;&#41; &#47;&#47; connection timeout of 250 seconds
6868
* .build&#40;&#41;;
6969
* </pre>
70-
* <!-- end io.clientcore.core.http.client.DefaultHttpClientBuilder.connectionTimeout#Duration -->
70+
* <!-- end io.clientcore.core.http.client.JdkHttpClientBuilder.connectionTimeout#Duration -->
7171
*
7272
* The default connection timeout is 10 seconds.
7373
*
@@ -140,17 +140,17 @@ public JdkHttpClientBuilder readTimeout(Duration readTimeout) {
140140
*
141141
* <p><strong>Code Samples</strong></p>
142142
*
143-
* <!-- src_embed io.clientcore.core.http.client.DefaultHttpClientBuilder.proxy#ProxyOptions -->
143+
* <!-- src_embed io.clientcore.core.http.client.JdkHttpClientBuilder.proxy#ProxyOptions -->
144144
* <pre>
145145
* final String proxyHost = &quot;&lt;proxy-host&gt;&quot;; &#47;&#47; e.g. localhost
146146
* final int proxyPort = 9999; &#47;&#47; Proxy port
147147
* ProxyOptions proxyOptions = new ProxyOptions&#40;ProxyOptions.Type.HTTP,
148148
* new InetSocketAddress&#40;proxyHost, proxyPort&#41;&#41;;
149-
* HttpClient client = new DefaultHttpClientBuilder&#40;&#41;
149+
* HttpClient client = new JdkHttpClientBuilder&#40;&#41;
150150
* .proxy&#40;proxyOptions&#41;
151151
* .build&#40;&#41;;
152152
* </pre>
153-
* <!-- end io.clientcore.core.http.client.DefaultHttpClientBuilder.proxy#ProxyOptions -->
153+
* <!-- end io.clientcore.core.http.client.JdkHttpClientBuilder.proxy#ProxyOptions -->
154154
*
155155
* @param proxyOptions The proxy configuration to use.
156156
* @return the updated {@link JdkHttpClientBuilder} object

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
* .addRequestCallback&#40;request -&gt; request
105105
* &#47;&#47; may already be set if request is created from a client
106106
* .setUri&#40;&quot;https:&#47;&#47;petstore.example.com&#47;pet&quot;&#41;
107-
* .setHttpMethod&#40;HttpMethod.POST&#41;
107+
* .setMethod&#40;HttpMethod.POST&#41;
108108
* .setBody&#40;requestBodyData&#41;
109109
* .getHeaders&#40;&#41;.set&#40;HttpHeaderName.CONTENT_TYPE, &quot;application&#47;json&quot;&#41;&#41;;
110110
* </pre>

‎sdk/clientcore/core/src/main/java/io/clientcore/core/http/pipeline/HttpInstrumentationPolicy.java‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@
8686
* <pre>
8787
*
8888
* HttpPipeline pipeline = new HttpPipelineBuilder&#40;&#41;
89-
* .policies&#40;
90-
* new HttpRetryPolicy&#40;&#41;,
91-
* new HttpInstrumentationPolicy&#40;instrumentationOptions&#41;&#41;
89+
* .addPolicy&#40;new HttpRetryPolicy&#40;&#41;&#41;
90+
* .addPolicy&#40;new HttpInstrumentationPolicy&#40;instrumentationOptions&#41;&#41;
9291
* .build&#40;&#41;;
9392
*
9493
* </pre>
@@ -104,9 +103,8 @@
104103
* instrumentationOptions.addAllowedQueryParamName&#40;&quot;documentId&quot;&#41;;
105104
*
106105
* HttpPipeline pipeline = new HttpPipelineBuilder&#40;&#41;
107-
* .policies&#40;
108-
* new HttpRetryPolicy&#40;&#41;,
109-
* new HttpInstrumentationPolicy&#40;instrumentationOptions&#41;&#41;
106+
* .addPolicy&#40;new HttpRetryPolicy&#40;&#41;&#41;
107+
* .addPolicy&#40;new HttpInstrumentationPolicy&#40;instrumentationOptions&#41;&#41;
110108
* .build&#40;&#41;;
111109
*
112110
* </pre>
@@ -116,22 +114,29 @@
116114
* <!-- src_embed io.clientcore.core.instrumentation.enrichhttpspans -->
117115
* <pre>
118116
*
119-
* HttpPipelinePolicy enrichingPolicy = &#40;request, next&#41; -&gt; &#123;
120-
* Span span = request.getRequestOptions&#40;&#41; == null
121-
* ? Span.noop&#40;&#41;
122-
* : request.getRequestOptions&#40;&#41;.getInstrumentationContext&#40;&#41;.getSpan&#40;&#41;;
123-
* if &#40;span.isRecording&#40;&#41;&#41; &#123;
124-
* span.setAttribute&#40;&quot;custom.request.id&quot;, request.getHeaders&#40;&#41;.getValue&#40;CUSTOM_REQUEST_ID&#41;&#41;;
117+
* HttpPipelinePolicy enrichingPolicy = new HttpPipelinePolicy&#40;&#41; &#123;
118+
* &#64;Override
119+
* public Response&lt;?&gt; process&#40;HttpRequest request, HttpPipelineNextPolicy next&#41; &#123;
120+
* Span span = request.getRequestOptions&#40;&#41; == null
121+
* ? Span.noop&#40;&#41;
122+
* : request.getRequestOptions&#40;&#41;.getInstrumentationContext&#40;&#41;.getSpan&#40;&#41;;
123+
* if &#40;span.isRecording&#40;&#41;&#41; &#123;
124+
* span.setAttribute&#40;&quot;custom.request.id&quot;, request.getHeaders&#40;&#41;.getValue&#40;CUSTOM_REQUEST_ID&#41;&#41;;
125+
* &#125;
126+
*
127+
* return next.process&#40;&#41;;
125128
* &#125;
126129
*
127-
* return next.process&#40;&#41;;
130+
* &#64;Override
131+
* public HttpPipelinePosition getPipelinePosition&#40;&#41; &#123;
132+
* return HttpPipelinePosition.AFTER_INSTRUMENTATION;
133+
* &#125;
128134
* &#125;;
129135
*
130136
* HttpPipeline pipeline = new HttpPipelineBuilder&#40;&#41;
131-
* .policies&#40;
132-
* new HttpRetryPolicy&#40;&#41;,
133-
* new HttpInstrumentationPolicy&#40;instrumentationOptions&#41;,
134-
* enrichingPolicy&#41;
137+
* .addPolicy&#40;new HttpRetryPolicy&#40;&#41;&#41;
138+
* .addPolicy&#40;new HttpInstrumentationPolicy&#40;instrumentationOptions&#41;&#41;
139+
* .addPolicy&#40;enrichingPolicy&#41;
135140
* .build&#40;&#41;;
136141
*
137142
*

‎sdk/clientcore/core/src/main/java/io/clientcore/core/http/pipeline/HttpPipelineBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* <pre>
3636
* HttpPipeline pipeline = new HttpPipelineBuilder&#40;&#41;
3737
* .httpClient&#40;HttpClient.getNewInstance&#40;&#41;&#41;
38-
* .policies&#40;new HttpRetryPolicy&#40;&#41;&#41;
38+
* .addPolicy&#40;new HttpRetryPolicy&#40;&#41;&#41;
3939
* .build&#40;&#41;;
4040
* </pre>
4141
* <!-- end io.clientcore.core.http.HttpPipelineBuilder.defaultHttpClientWithRetryPolicy -->

‎sdk/clientcore/core/src/main/java/io/clientcore/core/instrumentation/Instrumentation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public interface Instrumentation {
3131
*
3232
* LibraryInstrumentationOptions libraryOptions = new LibraryInstrumentationOptions&#40;&quot;sample&quot;&#41;
3333
* .setLibraryVersion&#40;&quot;1.0.0&quot;&#41;
34-
* .setSchemaUrl&#40;&quot;https:&#47;&#47;opentelemetry.io&#47;schemas&#47;1.29.0&quot;&#41;;
34+
* .setSchemaUri&#40;&quot;https:&#47;&#47;opentelemetry.io&#47;schemas&#47;1.29.0&quot;&#41;;
3535
*
3636
* InstrumentationOptions instrumentationOptions = new InstrumentationOptions&#40;&#41;;
3737
* Instrumentation instrumentation = Instrumentation.create&#40;instrumentationOptions, libraryOptions&#41;;
@@ -58,7 +58,7 @@ public interface Instrumentation {
5858
*
5959
* LibraryInstrumentationOptions libraryOptions = new LibraryInstrumentationOptions&#40;&quot;sample&quot;&#41;
6060
* .setLibraryVersion&#40;&quot;1.0.0&quot;&#41;
61-
* .setSchemaUrl&#40;&quot;https:&#47;&#47;opentelemetry.io&#47;schemas&#47;1.29.0&quot;&#41;;
61+
* .setSchemaUri&#40;&quot;https:&#47;&#47;opentelemetry.io&#47;schemas&#47;1.29.0&quot;&#41;;
6262
*
6363
* InstrumentationOptions instrumentationOptions = new InstrumentationOptions&#40;&#41;;
6464
* Instrumentation instrumentation = Instrumentation.create&#40;instrumentationOptions, libraryOptions&#41;;
@@ -82,7 +82,7 @@ public interface Instrumentation {
8282
*
8383
* LibraryInstrumentationOptions libraryOptions = new LibraryInstrumentationOptions&#40;&quot;sample&quot;&#41;
8484
* .setLibraryVersion&#40;&quot;1.0.0&quot;&#41;
85-
* .setSchemaUrl&#40;&quot;https:&#47;&#47;opentelemetry.io&#47;schemas&#47;1.29.0&quot;&#41;;
85+
* .setSchemaUri&#40;&quot;https:&#47;&#47;opentelemetry.io&#47;schemas&#47;1.29.0&quot;&#41;;
8686
*
8787
* InstrumentationOptions instrumentationOptions = new InstrumentationOptions&#40;&#41;;
8888
* Instrumentation instrumentation = Instrumentation.create&#40;instrumentationOptions, libraryOptions&#41;;

‎sdk/clientcore/core/src/main/java/io/clientcore/core/instrumentation/logging/ClientLogger.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,7 @@ public LoggingEvent atVerbose() {
235235
*
236236
* <!-- src_embed io.clientcore.core.util.logging.clientlogger.atLevel -->
237237
* <pre>
238-
* ClientLogger.LogLevel level = response.getStatusCode&#40;&#41; == 200
239-
* ? ClientLogger.LogLevel.INFORMATIONAL : ClientLogger.LogLevel.WARNING;
238+
* LogLevel level = response.getStatusCode&#40;&#41; == 200 ? LogLevel.INFORMATIONAL : LogLevel.WARNING;
240239
* logger.atLevel&#40;level&#41;
241240
* .addKeyValue&#40;&quot;key&quot;, &quot;value&quot;&#41;
242241
* .log&#40;&quot;message&quot;&#41;;

‎sdk/clientcore/core/src/samples/java/io/clientcore/core/http/HttpPipelineBuilderJavaDocCodeSnippets.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void defaultHttpClientWithRetryPolicyBuild() {
2222
// BEGIN: io.clientcore.core.http.HttpPipelineBuilder.defaultHttpClientWithRetryPolicy
2323
HttpPipeline pipeline = new HttpPipelineBuilder()
2424
.httpClient(HttpClient.getNewInstance())
25-
.policies(new HttpRetryPolicy())
25+
.addPolicy(new HttpRetryPolicy())
2626
.build();
2727
// END: io.clientcore.core.http.HttpPipelineBuilder.defaultHttpClientWithRetryPolicy
2828
}

‎sdk/clientcore/core/src/samples/java/io/clientcore/core/http/annotation/AnnotationJavadocCodesnippets.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@
33

44
package io.clientcore.core.http.annotation;
55

6-
import io.clientcore.core.annotation.ServiceInterface;
6+
import io.clientcore.core.annotations.ServiceInterface;
7+
import io.clientcore.core.http.annotations.BodyParam;
8+
import io.clientcore.core.http.annotations.FormParam;
9+
import io.clientcore.core.http.annotations.HeaderParam;
10+
import io.clientcore.core.http.annotations.HostParam;
11+
import io.clientcore.core.http.annotations.HttpRequestInformation;
12+
import io.clientcore.core.http.annotations.PathParam;
13+
import io.clientcore.core.http.annotations.QueryParam;
14+
import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail;
715
import io.clientcore.core.http.models.HttpMethod;
816
import io.clientcore.core.http.models.Response;
917

sdk/clientcore/core/src/samples/java/io/clientcore/core/http/client/DefaultHttpClientBuilderJavaDocCodeSnippets.java renamed to sdk/clientcore/core/src/samples/java/io/clientcore/core/http/client/JdkHttpClientBuilderJavaDocCodeSnippets.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,35 @@
99
import java.time.Duration;
1010

1111
/**
12-
* Code snippets for {@link DefaultHttpClientBuilder}
12+
* Code snippets for {@link JdkHttpClientBuilder}
1313
*/
1414
@SuppressWarnings("unused")
15-
public class DefaultHttpClientBuilderJavaDocCodeSnippets {
15+
public class JdkHttpClientBuilderJavaDocCodeSnippets {
1616
/**
1717
* Code snippet for simple http client instantiation.
1818
*/
1919
public void simpleInstantiation() {
2020
// BEGIN: io.clientcore.core.http.client.instantiation-simple
21-
HttpClient client = new DefaultHttpClientBuilder()
21+
HttpClient client = new JdkHttpClientBuilder()
2222
.build();
2323
// END: io.clientcore.core.http.client.instantiation-simple
2424
}
2525

2626
public void proxySample() {
27-
// BEGIN: io.clientcore.core.http.client.DefaultHttpClientBuilder.proxy#ProxyOptions
27+
// BEGIN: io.clientcore.core.http.client.JdkHttpClientBuilder.proxy#ProxyOptions
2828
final String proxyHost = "<proxy-host>"; // e.g. localhost
2929
final int proxyPort = 9999; // Proxy port
3030
ProxyOptions proxyOptions = new ProxyOptions(ProxyOptions.Type.HTTP,
3131
new InetSocketAddress(proxyHost, proxyPort));
32-
HttpClient client = new DefaultHttpClientBuilder()
32+
HttpClient client = new JdkHttpClientBuilder()
3333
.proxy(proxyOptions)
3434
.build();
35-
// END: io.clientcore.core.http.client.DefaultHttpClientBuilder.proxy#ProxyOptions
35+
// END: io.clientcore.core.http.client.JdkHttpClientBuilder.proxy#ProxyOptions
3636
}
3737

3838
public void proxyBasicAuthenticationSample() {
3939

40-
// BEGIN: io.clientcore.core.http.client.DefaultHttpClientBuilder#setProxyAuthenticator
40+
// BEGIN: io.clientcore.core.http.client.JdkHttpClientBuilder#setProxyAuthenticator
4141
final String proxyHost = "<proxy-host>"; // e.g. localhost
4242
final int proxyPort = 9999; // Proxy port
4343
final String proxyUser = "<proxy-user>";
@@ -46,20 +46,20 @@ public void proxyBasicAuthenticationSample() {
4646
ProxyOptions proxyOptions = new ProxyOptions(ProxyOptions.Type.HTTP,
4747
new InetSocketAddress(proxyHost, proxyPort));
4848
proxyOptions = proxyOptions.setCredentials(proxyUser, proxyPassword);
49-
HttpClient client = new DefaultHttpClientBuilder()
49+
HttpClient client = new JdkHttpClientBuilder()
5050
.proxy(proxyOptions)
5151
.build();
52-
// END: io.clientcore.core.http.client.DefaultHttpClientBuilder#setProxyAuthenticator
52+
// END: io.clientcore.core.http.client.JdkHttpClientBuilder#setProxyAuthenticator
5353

5454
}
5555

5656
public void connectionTimeoutSample() {
5757

58-
// BEGIN: io.clientcore.core.http.client.DefaultHttpClientBuilder.connectionTimeout#Duration
59-
HttpClient client = new DefaultHttpClientBuilder()
58+
// BEGIN: io.clientcore.core.http.client.JdkHttpClientBuilder.connectionTimeout#Duration
59+
HttpClient client = new JdkHttpClientBuilder()
6060
.connectionTimeout(Duration.ofSeconds(250)) // connection timeout of 250 seconds
6161
.build();
62-
// END: io.clientcore.core.http.client.DefaultHttpClientBuilder.connectionTimeout#Duration
62+
// END: io.clientcore.core.http.client.JdkHttpClientBuilder.connectionTimeout#Duration
6363

6464
}
6565
}

0 commit comments

Comments
 (0)