Skip to content

Commit 6e5651f

Browse files
weidongxu-microsoftweidongxu-microsoft
authored
http-client-java, bug fix follow #9059 (#9103)
a few more issue found in Azure/autorest.java#3224 (after the resolution of eclipse lib dependencies) fixes - 3a7c202 - 557ef6b (ran an agent to check if other possible errors -- it says no :-)) - 2c7c94f All of them just to revert bugs introduced from #9059
1 parent beacc27 commit 6e5651f

File tree

8 files changed

+277
-252
lines changed

8 files changed

+277
-252
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@typespec/streams": "0.76.0",
3232
"@azure-tools/typespec-azure-core": "0.62.0",
3333
"@azure-tools/typespec-client-generator-core": "0.62.0",
34-
"@azure-tools/typespec-azure-resource-manager": "0.62.0",
34+
"@azure-tools/typespec-azure-resource-manager": "0.62.1",
3535
"@azure-tools/typespec-autorest": "0.62.0"
3636
},
3737
"private": true

‎packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClassType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private static Builder withVNextReplacementBuilder(String azureClass, String azu
8888
public static final ClassType ACCESS_TOKEN = withClientCoreReplacement("com.azure.core.credential.AccessToken",
8989
"io.clientcore.core.credentials.oauth.AccessToken");
9090
public static final ClassType AZURE_KEY_CREDENTIAL
91-
= new Builder(false).packageName("com.azure.core.credential").name("AccessToken").build();
91+
= new Builder(false).packageName("com.azure.core.credential").name("AzureKeyCredential").build();
9292
public static final ClassType KEY_CREDENTIAL = withClientCoreReplacement("com.azure.core.credential.KeyCredential",
9393
"io.clientcore.core.credentials.KeyCredential");
9494
public static final ClassType TOKEN_CREDENTIAL = withClientCoreAndVNextReplacement(

‎packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/GenericType.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ private String convert(String expression, boolean isToClient) {
231231
+ "(el -> %2$s).collect(java.util.stream.Collectors.toList())", expression, mapping);
232232
} else if (this instanceof MapType) {
233233
String mapping = isToClient
234-
? wireTypeArguments[i].convertToClientType("el")
235-
: wireTypeArguments[i].convertFromClientType("el");
234+
? wireTypeArguments[i].convertToClientType("el.getValue()")
235+
: wireTypeArguments[i].convertFromClientType("el.getValue()");
236236
// Key is always String in Swagger 2
237237
expression = String.format(
238238
"%1$s.entrySet().stream().collect(java.util.stream.Collectors.toMap(Map.Entry::getKey, el -> %2$s))",

‎packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/TemplateHelper.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,8 @@ public static String getPomProjectDescription(String serviceName) {
3636
}
3737

3838
public static String getByteCloneExpression(String propertyName) {
39-
return JavaSettings.getInstance().isAzureV1() ? "CoreUtils.clone(" + propertyName + ")" : propertyName; // TODO:
40-
// generic
41-
// not
42-
// having
43-
// CoreUtils
39+
// TODO: generic not having CoreUtils
40+
return JavaSettings.getInstance().isAzureV1() ? "CoreUtils.clone(" + propertyName + ")" : propertyName;
4441
}
4542

4643
public static void createHttpPipelineMethod(JavaSettings settings, String defaultCredentialScopes,

‎packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/util/ModelTemplateHeaderHelper.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public final class ModelTemplateHeaderHelper {
6060
// HttpHeaderNames for both maps. Then add the few extra azure-core headers here.
6161
// If HttpHeaderNames are missed from azure-core, they will be handled as unknown headers, which has effectively
6262
// no difference from this optimization other than code bloat.
63-
headerToKnownHttpHeaderName.put("Azure-AsyncOperation", "AZURE_ASYNC_OPERATION");
63+
headerToKnownHttpHeaderName.put("Azure-AsyncOperation", "AZURE_ASYNCOPERATION");
64+
headerToKnownHttpHeaderName.put("Operation-Location", "OPERATION_LOCATION");
6465
headerToKnownHttpHeaderName.put("retry-after-ms", "RETRY_AFTER_MS");
6566
headerToKnownHttpHeaderName.put("x-ms-client-id", "X_MS_CLIENT_ID");
6667
headerToKnownHttpHeaderName.put("x-ms-client-request-id", "X_MS_CLIENT_REQUEST_ID");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@typespec/streams": "0.76.0",
3232
"@azure-tools/typespec-azure-core": "0.62.0",
3333
"@azure-tools/typespec-client-generator-core": "0.62.0",
34-
"@azure-tools/typespec-azure-resource-manager": "0.62.0",
34+
"@azure-tools/typespec-azure-resource-manager": "0.62.1",
3535
"@azure-tools/typespec-autorest": "0.62.0"
3636
},
3737
"private": true

‎packages/http-client-java/package-lock.json‎

Lines changed: 259 additions & 232 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/http-client-java/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"peerDependencies": {
5252
"@azure-tools/typespec-autorest": ">=0.62.0 <1.0.0",
5353
"@azure-tools/typespec-azure-core": ">=0.62.0 <1.0.0",
54-
"@azure-tools/typespec-azure-resource-manager": ">=0.62.0 <1.0.0",
54+
"@azure-tools/typespec-azure-resource-manager": ">=0.62.1 <1.0.0",
5555
"@azure-tools/typespec-client-generator-core": ">=0.62.0 <1.0.0",
5656
"@typespec/compiler": "^1.6.0",
5757
"@typespec/events": ">=0.76.0 <1.0.0",
@@ -71,13 +71,13 @@
7171
"devDependencies": {
7272
"@azure-tools/typespec-autorest": "0.62.0",
7373
"@azure-tools/typespec-azure-core": "0.62.0",
74-
"@azure-tools/typespec-azure-resource-manager": "0.62.0",
74+
"@azure-tools/typespec-azure-resource-manager": "0.62.1",
7575
"@azure-tools/typespec-azure-rulesets": "0.62.0",
7676
"@azure-tools/typespec-client-generator-core": "0.62.0",
77-
"@microsoft/api-extractor": "^7.55.0",
78-
"@microsoft/api-extractor-model": "^7.32.0",
77+
"@microsoft/api-extractor": "^7.55.1",
78+
"@microsoft/api-extractor-model": "^7.32.1",
7979
"@types/js-yaml": "~4.0.9",
80-
"@types/lodash": "~4.17.20",
80+
"@types/lodash": "~4.17.21",
8181
"@types/node": "~24.10.1",
8282
"@typespec/compiler": "1.6.0",
8383
"@typespec/events": "0.76.0",
@@ -89,11 +89,11 @@
8989
"@typespec/streams": "0.76.0",
9090
"@typespec/versioning": "0.76.0",
9191
"@typespec/xml": "0.76.0",
92-
"@vitest/coverage-v8": "^4.0.8",
93-
"@vitest/ui": "^4.0.8",
92+
"@vitest/coverage-v8": "^4.0.14",
93+
"@vitest/ui": "^4.0.14",
9494
"c8": "~10.1.3",
95-
"rimraf": "~6.1.0",
95+
"rimraf": "~6.1.2",
9696
"typescript": "~5.9.3",
97-
"vitest": "^4.0.8"
97+
"vitest": "^4.0.14"
9898
}
9999
}

0 commit comments

Comments
 (0)