Skip to content

Commit 04182d2

Browse files
weidongxu-microsoftweidongxu-microsoft
authored
http-client-java, pageable for unbranded (#5551)
depends on Azure/azure-sdk-for-java#43484 and release of clientcore beta.2 back to draft: there is lots of changes to clientcore right now test 827f4ec code is scattered as there is multiple commits to adapt core changes
1 parent eefc06e commit 04182d2

File tree

65 files changed

+295
-196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+295
-196
lines changed

‎packages/http-client-java/emitter/src/code-model-builder.ts

-5
Original file line numberDiff line numberDiff line change
@@ -966,11 +966,6 @@ export class CodeModelBuilder {
966966
responses: SdkHttpResponse[],
967967
sdkMethod: SdkMethod<SdkHttpOperation>,
968968
) {
969-
if (!this.isBranded()) {
970-
// TODO: currently unbranded does not support paged operation
971-
return;
972-
}
973-
974969
if (sdkMethod.kind === "paging" || sdkMethod.kind === "lropaging") {
975970
for (const response of responses) {
976971
const bodyType = response.type;

‎packages/http-client-java/emitter/src/emitter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { CodeModelBuilder } from "./code-model-builder.js";
1313
import { CodeModel } from "./common/code-model.js";
1414
import { logError, spawnAsync, SpawnError } from "./utils.js";
1515
import {
16-
CODE_RUNTIME_DEPENDENCY,
16+
CODE_JAVA_SDK_DEPENDENCY,
1717
JDK_NOT_FOUND_MESSAGE,
1818
validateDependencies,
1919
} from "./validate.js";
@@ -197,7 +197,7 @@ export async function $onEmit(context: EmitContext<EmitterOptions>) {
197197
program.trace("http-client-java", `Code generation log: ${result.stdout}`);
198198
} catch (error: any) {
199199
if (error && "code" in error && error["code"] === "ENOENT") {
200-
logError(program, JDK_NOT_FOUND_MESSAGE, CODE_RUNTIME_DEPENDENCY);
200+
logError(program, JDK_NOT_FOUND_MESSAGE, CODE_JAVA_SDK_DEPENDENCY);
201201
} else {
202202
logError(
203203
program,

‎packages/http-client-java/emitter/src/validate.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { logError, spawnAsync, trace } from "./utils.js";
33

44
export const JDK_NOT_FOUND_MESSAGE =
55
"Java Development Kit (JDK) is not found in PATH. Please install JDK 17 or above. Microsoft Build of OpenJDK can be downloaded from https://learn.microsoft.com/java/openjdk/download";
6-
export const CODE_RUNTIME_DEPENDENCY = "invalid-runtime-dependency";
6+
export const CODE_JAVA_SDK_DEPENDENCY = "invalid-java-sdk-dependency";
77

88
export async function validateDependencies(
99
program: Program | undefined,
@@ -25,7 +25,7 @@ export async function validateDependencies(
2525
// // eslint-disable-next-line no-console
2626
// console.log("[ERROR] " + message);
2727
if (program && logDiagnostic) {
28-
logError(program, message, CODE_RUNTIME_DEPENDENCY);
28+
logError(program, message, CODE_JAVA_SDK_DEPENDENCY);
2929
}
3030
}
3131
}
@@ -37,7 +37,7 @@ export async function validateDependencies(
3737
// // eslint-disable-next-line no-console
3838
// console.log("[ERROR] " + message);
3939
if (program && logDiagnostic) {
40-
logError(program, message, CODE_RUNTIME_DEPENDENCY);
40+
logError(program, message, CODE_JAVA_SDK_DEPENDENCY);
4141
}
4242
}
4343

@@ -61,7 +61,7 @@ export async function validateDependencies(
6161
// // eslint-disable-next-line no-console
6262
// console.log("[ERROR] " + message);
6363
if (program && logDiagnostic) {
64-
logError(program, message, CODE_RUNTIME_DEPENDENCY);
64+
logError(program, message, CODE_JAVA_SDK_DEPENDENCY);
6565
}
6666
}
6767
}

‎packages/http-client-java/generator/http-client-generator-clientcore-test/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"dependencies": {
1515
"@typespec/http-specs": "0.1.0-alpha.7",
16-
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.1.7.tgz",
16+
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.1.8.tgz",
1717
"@typespec/http-client-java-tests": "file:"
1818
},
1919
"overrides": {

‎packages/http-client-java/generator/http-client-generator-clientcore-test/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>io.clientcore</groupId>
2525
<artifactId>core</artifactId>
26-
<version>1.0.0-beta.1</version>
26+
<version>1.0.0-beta.2</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.junit.jupiter</groupId>

‎packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/apikey/ApiKeyClientBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
import io.clientcore.core.http.models.HttpRedirectOptions;
1212
import io.clientcore.core.http.models.HttpRetryOptions;
1313
import io.clientcore.core.http.models.ProxyOptions;
14-
import io.clientcore.core.http.pipeline.HttpLoggingPolicy;
14+
import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
1515
import io.clientcore.core.http.pipeline.HttpPipeline;
1616
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
1717
import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
1818
import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
1919
import io.clientcore.core.http.pipeline.HttpRetryPolicy;
2020
import io.clientcore.core.http.pipeline.KeyCredentialPolicy;
21+
import io.clientcore.core.instrumentation.logging.ClientLogger;
2122
import io.clientcore.core.models.traits.ConfigurationTrait;
2223
import io.clientcore.core.models.traits.EndpointTrait;
2324
import io.clientcore.core.models.traits.HttpTrait;
2425
import io.clientcore.core.models.traits.KeyCredentialTrait;
2526
import io.clientcore.core.models.traits.ProxyTrait;
26-
import io.clientcore.core.util.ClientLogger;
2727
import io.clientcore.core.util.configuration.Configuration;
2828
import java.util.ArrayList;
2929
import java.util.List;
@@ -244,7 +244,7 @@ private HttpPipeline createHttpPipeline() {
244244
if (keyCredential != null) {
245245
policies.add(new KeyCredentialPolicy("x-ms-api-key", keyCredential, null));
246246
}
247-
policies.add(new HttpLoggingPolicy(localHttpLogOptions));
247+
policies.add(new HttpInstrumentationPolicy(null, localHttpLogOptions));
248248
httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
249249
return httpPipelineBuilder.build();
250250
}

‎packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/http/custom/CustomClientBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
import io.clientcore.core.http.models.HttpRedirectOptions;
1212
import io.clientcore.core.http.models.HttpRetryOptions;
1313
import io.clientcore.core.http.models.ProxyOptions;
14-
import io.clientcore.core.http.pipeline.HttpLoggingPolicy;
14+
import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
1515
import io.clientcore.core.http.pipeline.HttpPipeline;
1616
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
1717
import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
1818
import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
1919
import io.clientcore.core.http.pipeline.HttpRetryPolicy;
2020
import io.clientcore.core.http.pipeline.KeyCredentialPolicy;
21+
import io.clientcore.core.instrumentation.logging.ClientLogger;
2122
import io.clientcore.core.models.traits.ConfigurationTrait;
2223
import io.clientcore.core.models.traits.EndpointTrait;
2324
import io.clientcore.core.models.traits.HttpTrait;
2425
import io.clientcore.core.models.traits.KeyCredentialTrait;
2526
import io.clientcore.core.models.traits.ProxyTrait;
26-
import io.clientcore.core.util.ClientLogger;
2727
import io.clientcore.core.util.configuration.Configuration;
2828
import java.util.ArrayList;
2929
import java.util.List;
@@ -244,7 +244,7 @@ private HttpPipeline createHttpPipeline() {
244244
if (keyCredential != null) {
245245
policies.add(new KeyCredentialPolicy("authorization", keyCredential, "SharedAccessKey"));
246246
}
247-
policies.add(new HttpLoggingPolicy(localHttpLogOptions));
247+
policies.add(new HttpInstrumentationPolicy(null, localHttpLogOptions));
248248
httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
249249
return httpPipelineBuilder.build();
250250
}

‎packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/oauth2/OAuth2ClientBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
import io.clientcore.core.http.models.HttpRedirectOptions;
1212
import io.clientcore.core.http.models.HttpRetryOptions;
1313
import io.clientcore.core.http.models.ProxyOptions;
14-
import io.clientcore.core.http.pipeline.HttpLoggingPolicy;
14+
import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
1515
import io.clientcore.core.http.pipeline.HttpPipeline;
1616
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
1717
import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
1818
import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
1919
import io.clientcore.core.http.pipeline.HttpRetryPolicy;
2020
import io.clientcore.core.http.pipeline.KeyCredentialPolicy;
21+
import io.clientcore.core.instrumentation.logging.ClientLogger;
2122
import io.clientcore.core.models.traits.ConfigurationTrait;
2223
import io.clientcore.core.models.traits.EndpointTrait;
2324
import io.clientcore.core.models.traits.HttpTrait;
2425
import io.clientcore.core.models.traits.KeyCredentialTrait;
2526
import io.clientcore.core.models.traits.ProxyTrait;
26-
import io.clientcore.core.util.ClientLogger;
2727
import io.clientcore.core.util.configuration.Configuration;
2828
import java.util.ArrayList;
2929
import java.util.List;
@@ -244,7 +244,7 @@ private HttpPipeline createHttpPipeline() {
244244
if (keyCredential != null) {
245245
policies.add(new KeyCredentialPolicy("authorization", keyCredential, "Bearer"));
246246
}
247-
policies.add(new HttpLoggingPolicy(localHttpLogOptions));
247+
policies.add(new HttpInstrumentationPolicy(null, localHttpLogOptions));
248248
httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
249249
return httpPipelineBuilder.build();
250250
}

‎packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/union/UnionClientBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
import io.clientcore.core.http.models.HttpRedirectOptions;
1212
import io.clientcore.core.http.models.HttpRetryOptions;
1313
import io.clientcore.core.http.models.ProxyOptions;
14-
import io.clientcore.core.http.pipeline.HttpLoggingPolicy;
14+
import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
1515
import io.clientcore.core.http.pipeline.HttpPipeline;
1616
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
1717
import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
1818
import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
1919
import io.clientcore.core.http.pipeline.HttpRetryPolicy;
2020
import io.clientcore.core.http.pipeline.KeyCredentialPolicy;
21+
import io.clientcore.core.instrumentation.logging.ClientLogger;
2122
import io.clientcore.core.models.traits.ConfigurationTrait;
2223
import io.clientcore.core.models.traits.EndpointTrait;
2324
import io.clientcore.core.models.traits.HttpTrait;
2425
import io.clientcore.core.models.traits.KeyCredentialTrait;
2526
import io.clientcore.core.models.traits.ProxyTrait;
26-
import io.clientcore.core.util.ClientLogger;
2727
import io.clientcore.core.util.configuration.Configuration;
2828
import java.util.ArrayList;
2929
import java.util.List;
@@ -243,7 +243,7 @@ private HttpPipeline createHttpPipeline() {
243243
if (keyCredential != null) {
244244
policies.add(new KeyCredentialPolicy("authorization", keyCredential, "Bearer"));
245245
}
246-
policies.add(new HttpLoggingPolicy(localHttpLogOptions));
246+
policies.add(new HttpInstrumentationPolicy(null, localHttpLogOptions));
247247
httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
248248
return httpPipelineBuilder.build();
249249
}

‎packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/numeric/NumericClientBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
import io.clientcore.core.http.models.HttpRedirectOptions;
1111
import io.clientcore.core.http.models.HttpRetryOptions;
1212
import io.clientcore.core.http.models.ProxyOptions;
13-
import io.clientcore.core.http.pipeline.HttpLoggingPolicy;
13+
import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
1414
import io.clientcore.core.http.pipeline.HttpPipeline;
1515
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
1616
import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
1717
import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
1818
import io.clientcore.core.http.pipeline.HttpRetryPolicy;
19+
import io.clientcore.core.instrumentation.logging.ClientLogger;
1920
import io.clientcore.core.models.traits.ConfigurationTrait;
2021
import io.clientcore.core.models.traits.EndpointTrait;
2122
import io.clientcore.core.models.traits.HttpTrait;
2223
import io.clientcore.core.models.traits.ProxyTrait;
23-
import io.clientcore.core.util.ClientLogger;
2424
import io.clientcore.core.util.configuration.Configuration;
2525
import java.util.ArrayList;
2626
import java.util.List;
@@ -221,7 +221,7 @@ private HttpPipeline createHttpPipeline() {
221221
policies.add(redirectOptions == null ? new HttpRedirectPolicy() : new HttpRedirectPolicy(redirectOptions));
222222
policies.add(retryOptions == null ? new HttpRetryPolicy() : new HttpRetryPolicy(retryOptions));
223223
this.pipelinePolicies.stream().forEach(p -> policies.add(p));
224-
policies.add(new HttpLoggingPolicy(localHttpLogOptions));
224+
policies.add(new HttpInstrumentationPolicy(null, localHttpLogOptions));
225225
httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
226226
return httpPipelineBuilder.build();
227227
}

‎packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/parameters/basic/BasicClientBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
import io.clientcore.core.http.models.HttpRedirectOptions;
1010
import io.clientcore.core.http.models.HttpRetryOptions;
1111
import io.clientcore.core.http.models.ProxyOptions;
12-
import io.clientcore.core.http.pipeline.HttpLoggingPolicy;
12+
import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
1313
import io.clientcore.core.http.pipeline.HttpPipeline;
1414
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
1515
import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
1616
import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
1717
import io.clientcore.core.http.pipeline.HttpRetryPolicy;
18+
import io.clientcore.core.instrumentation.logging.ClientLogger;
1819
import io.clientcore.core.models.traits.ConfigurationTrait;
1920
import io.clientcore.core.models.traits.EndpointTrait;
2021
import io.clientcore.core.models.traits.HttpTrait;
2122
import io.clientcore.core.models.traits.ProxyTrait;
22-
import io.clientcore.core.util.ClientLogger;
2323
import io.clientcore.core.util.configuration.Configuration;
2424
import java.util.ArrayList;
2525
import java.util.List;
@@ -221,7 +221,7 @@ private HttpPipeline createHttpPipeline() {
221221
policies.add(redirectOptions == null ? new HttpRedirectPolicy() : new HttpRedirectPolicy(redirectOptions));
222222
policies.add(retryOptions == null ? new HttpRetryPolicy() : new HttpRetryPolicy(retryOptions));
223223
this.pipelinePolicies.stream().forEach(p -> policies.add(p));
224-
policies.add(new HttpLoggingPolicy(localHttpLogOptions));
224+
policies.add(new HttpInstrumentationPolicy(null, localHttpLogOptions));
225225
httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
226226
return httpPipelineBuilder.build();
227227
}

‎packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/parameters/bodyoptionality/BodyOptionalityClientBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
import io.clientcore.core.http.models.HttpRedirectOptions;
1010
import io.clientcore.core.http.models.HttpRetryOptions;
1111
import io.clientcore.core.http.models.ProxyOptions;
12-
import io.clientcore.core.http.pipeline.HttpLoggingPolicy;
12+
import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
1313
import io.clientcore.core.http.pipeline.HttpPipeline;
1414
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
1515
import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
1616
import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
1717
import io.clientcore.core.http.pipeline.HttpRetryPolicy;
18+
import io.clientcore.core.instrumentation.logging.ClientLogger;
1819
import io.clientcore.core.models.traits.ConfigurationTrait;
1920
import io.clientcore.core.models.traits.EndpointTrait;
2021
import io.clientcore.core.models.traits.HttpTrait;
2122
import io.clientcore.core.models.traits.ProxyTrait;
22-
import io.clientcore.core.util.ClientLogger;
2323
import io.clientcore.core.util.configuration.Configuration;
2424
import java.util.ArrayList;
2525
import java.util.List;
@@ -222,7 +222,7 @@ private HttpPipeline createHttpPipeline() {
222222
policies.add(redirectOptions == null ? new HttpRedirectPolicy() : new HttpRedirectPolicy(redirectOptions));
223223
policies.add(retryOptions == null ? new HttpRetryPolicy() : new HttpRetryPolicy(retryOptions));
224224
this.pipelinePolicies.stream().forEach(p -> policies.add(p));
225-
policies.add(new HttpLoggingPolicy(localHttpLogOptions));
225+
policies.add(new HttpInstrumentationPolicy(null, localHttpLogOptions));
226226
httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
227227
return httpPipelineBuilder.build();
228228
}

‎packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/parameters/collectionformat/CollectionFormatClientBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
import io.clientcore.core.http.models.HttpRedirectOptions;
1010
import io.clientcore.core.http.models.HttpRetryOptions;
1111
import io.clientcore.core.http.models.ProxyOptions;
12-
import io.clientcore.core.http.pipeline.HttpLoggingPolicy;
12+
import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
1313
import io.clientcore.core.http.pipeline.HttpPipeline;
1414
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
1515
import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
1616
import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
1717
import io.clientcore.core.http.pipeline.HttpRetryPolicy;
18+
import io.clientcore.core.instrumentation.logging.ClientLogger;
1819
import io.clientcore.core.models.traits.ConfigurationTrait;
1920
import io.clientcore.core.models.traits.EndpointTrait;
2021
import io.clientcore.core.models.traits.HttpTrait;
2122
import io.clientcore.core.models.traits.ProxyTrait;
22-
import io.clientcore.core.util.ClientLogger;
2323
import io.clientcore.core.util.configuration.Configuration;
2424
import java.util.ArrayList;
2525
import java.util.List;
@@ -222,7 +222,7 @@ private HttpPipeline createHttpPipeline() {
222222
policies.add(redirectOptions == null ? new HttpRedirectPolicy() : new HttpRedirectPolicy(redirectOptions));
223223
policies.add(retryOptions == null ? new HttpRetryPolicy() : new HttpRetryPolicy(retryOptions));
224224
this.pipelinePolicies.stream().forEach(p -> policies.add(p));
225-
policies.add(new HttpLoggingPolicy(localHttpLogOptions));
225+
policies.add(new HttpInstrumentationPolicy(null, localHttpLogOptions));
226226
httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
227227
return httpPipelineBuilder.build();
228228
}

‎packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/parameters/spread/SpreadClientBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
import io.clientcore.core.http.models.HttpRedirectOptions;
1010
import io.clientcore.core.http.models.HttpRetryOptions;
1111
import io.clientcore.core.http.models.ProxyOptions;
12-
import io.clientcore.core.http.pipeline.HttpLoggingPolicy;
12+
import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
1313
import io.clientcore.core.http.pipeline.HttpPipeline;
1414
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
1515
import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
1616
import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
1717
import io.clientcore.core.http.pipeline.HttpRetryPolicy;
18+
import io.clientcore.core.instrumentation.logging.ClientLogger;
1819
import io.clientcore.core.models.traits.ConfigurationTrait;
1920
import io.clientcore.core.models.traits.EndpointTrait;
2021
import io.clientcore.core.models.traits.HttpTrait;
2122
import io.clientcore.core.models.traits.ProxyTrait;
22-
import io.clientcore.core.util.ClientLogger;
2323
import io.clientcore.core.util.configuration.Configuration;
2424
import java.util.ArrayList;
2525
import java.util.List;
@@ -221,7 +221,7 @@ private HttpPipeline createHttpPipeline() {
221221
policies.add(redirectOptions == null ? new HttpRedirectPolicy() : new HttpRedirectPolicy(redirectOptions));
222222
policies.add(retryOptions == null ? new HttpRetryPolicy() : new HttpRetryPolicy(retryOptions));
223223
this.pipelinePolicies.stream().forEach(p -> policies.add(p));
224-
policies.add(new HttpLoggingPolicy(localHttpLogOptions));
224+
policies.add(new HttpInstrumentationPolicy(null, localHttpLogOptions));
225225
httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
226226
return httpPipelineBuilder.build();
227227
}

‎packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/contentnegotiation/ContentNegotiationClientBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
import io.clientcore.core.http.models.HttpRedirectOptions;
1010
import io.clientcore.core.http.models.HttpRetryOptions;
1111
import io.clientcore.core.http.models.ProxyOptions;
12-
import io.clientcore.core.http.pipeline.HttpLoggingPolicy;
12+
import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
1313
import io.clientcore.core.http.pipeline.HttpPipeline;
1414
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
1515
import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
1616
import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
1717
import io.clientcore.core.http.pipeline.HttpRetryPolicy;
18+
import io.clientcore.core.instrumentation.logging.ClientLogger;
1819
import io.clientcore.core.models.traits.ConfigurationTrait;
1920
import io.clientcore.core.models.traits.EndpointTrait;
2021
import io.clientcore.core.models.traits.HttpTrait;
2122
import io.clientcore.core.models.traits.ProxyTrait;
22-
import io.clientcore.core.util.ClientLogger;
2323
import io.clientcore.core.util.configuration.Configuration;
2424
import java.util.ArrayList;
2525
import java.util.List;
@@ -222,7 +222,7 @@ private HttpPipeline createHttpPipeline() {
222222
policies.add(redirectOptions == null ? new HttpRedirectPolicy() : new HttpRedirectPolicy(redirectOptions));
223223
policies.add(retryOptions == null ? new HttpRetryPolicy() : new HttpRetryPolicy(retryOptions));
224224
this.pipelinePolicies.stream().forEach(p -> policies.add(p));
225-
policies.add(new HttpLoggingPolicy(localHttpLogOptions));
225+
policies.add(new HttpInstrumentationPolicy(null, localHttpLogOptions));
226226
httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
227227
return httpPipelineBuilder.build();
228228
}

0 commit comments

Comments
 (0)