Skip to content

Commit 14764fc

Browse files
http-client-java, support cross language version (#10674)
fix #10608 --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
1 parent c51ad5f commit 14764fc

216 files changed

Lines changed: 362 additions & 229 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
changeKind: feature
3+
packages:
4+
- "@typespec/http-client-java"
5+
---
6+
7+
Support crossLanguageVersion

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,9 @@ export class CodeModelBuilder {
321321
this.sdkContext.sdkPackage.metadata.apiVersions,
322322
);
323323
}
324+
// cross-language metadata
325+
this.codeModel.crossLanguagePackageId = this.sdkContext.sdkPackage.crossLanguagePackageId;
326+
this.codeModel.crossLanguageVersion = this.sdkContext.sdkPackage.crossLanguageVersion;
324327

325328
// license
326329
if (this.sdkContext.sdkPackage.licenseInfo) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ export interface CodeModel extends Metadata {
2424
arm?: boolean;
2525

2626
apiVersionMap?: Record<string, string>;
27+
28+
// cross-language metadata
29+
crossLanguagePackageId?: string;
30+
crossLanguageVersion?: string;
2731
}
2832

2933
export class CodeModel extends Metadata implements CodeModel {
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"authentication.apikey.ApiKeyClient":"Authentication.ApiKey","authentication.apikey.ApiKeyClientBuilder":"Authentication.ApiKey","authentication.apikey.InvalidAuth":"Authentication.ApiKey.InvalidAuth"},"generatedFiles":["src/main/java/authentication/apikey/ApiKeyClient.java","src/main/java/authentication/apikey/ApiKeyClientBuilder.java","src/main/java/authentication/apikey/InvalidAuth.java","src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java","src/main/java/authentication/apikey/implementation/package-info.java","src/main/java/authentication/apikey/package-info.java","src/main/java/module-info.java"]}
1+
{"flavor":"generic","apiVersions":{},"crossLanguagePackageId":"Authentication.ApiKey","crossLanguageVersion":"710670aee537","crossLanguageDefinitions":{"authentication.apikey.ApiKeyClient":"Authentication.ApiKey","authentication.apikey.ApiKeyClientBuilder":"Authentication.ApiKey","authentication.apikey.InvalidAuth":"Authentication.ApiKey.InvalidAuth"},"generatedFiles":["src/main/java/authentication/apikey/ApiKeyClient.java","src/main/java/authentication/apikey/ApiKeyClientBuilder.java","src/main/java/authentication/apikey/InvalidAuth.java","src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java","src/main/java/authentication/apikey/implementation/package-info.java","src/main/java/authentication/apikey/package-info.java","src/main/java/module-info.java"]}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"authentication.http.custom.CustomClient":"Authentication.Http.Custom","authentication.http.custom.CustomClientBuilder":"Authentication.Http.Custom","authentication.http.custom.InvalidAuth":"Authentication.Http.Custom.InvalidAuth"},"generatedFiles":["src/main/java/authentication/http/custom/CustomClient.java","src/main/java/authentication/http/custom/CustomClientBuilder.java","src/main/java/authentication/http/custom/InvalidAuth.java","src/main/java/authentication/http/custom/implementation/CustomClientImpl.java","src/main/java/authentication/http/custom/implementation/package-info.java","src/main/java/authentication/http/custom/package-info.java","src/main/java/module-info.java"]}
1+
{"flavor":"generic","apiVersions":{},"crossLanguagePackageId":"Authentication.Http.Custom","crossLanguageVersion":"0a0f8f05c5e1","crossLanguageDefinitions":{"authentication.http.custom.CustomClient":"Authentication.Http.Custom","authentication.http.custom.CustomClientBuilder":"Authentication.Http.Custom","authentication.http.custom.InvalidAuth":"Authentication.Http.Custom.InvalidAuth"},"generatedFiles":["src/main/java/authentication/http/custom/CustomClient.java","src/main/java/authentication/http/custom/CustomClientBuilder.java","src/main/java/authentication/http/custom/InvalidAuth.java","src/main/java/authentication/http/custom/implementation/CustomClientImpl.java","src/main/java/authentication/http/custom/implementation/package-info.java","src/main/java/authentication/http/custom/package-info.java","src/main/java/module-info.java"]}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"authentication.noauth.union.UnionClient":"Authentication.Noauth.Union","authentication.noauth.union.UnionClientBuilder":"Authentication.Noauth.Union"},"generatedFiles":["src/main/java/authentication/noauth/union/UnionClient.java","src/main/java/authentication/noauth/union/UnionClientBuilder.java","src/main/java/authentication/noauth/union/implementation/UnionClientImpl.java","src/main/java/authentication/noauth/union/implementation/package-info.java","src/main/java/authentication/noauth/union/package-info.java","src/main/java/module-info.java"]}
1+
{"flavor":"generic","apiVersions":{},"crossLanguagePackageId":"Authentication.Noauth.Union","crossLanguageVersion":"c5a2710d89b1","crossLanguageDefinitions":{"authentication.noauth.union.UnionClient":"Authentication.Noauth.Union","authentication.noauth.union.UnionClientBuilder":"Authentication.Noauth.Union"},"generatedFiles":["src/main/java/authentication/noauth/union/UnionClient.java","src/main/java/authentication/noauth/union/UnionClientBuilder.java","src/main/java/authentication/noauth/union/implementation/UnionClientImpl.java","src/main/java/authentication/noauth/union/implementation/package-info.java","src/main/java/authentication/noauth/union/package-info.java","src/main/java/module-info.java"]}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"authentication.oauth2.InvalidAuth":"Authentication.OAuth2.InvalidAuth","authentication.oauth2.OAuth2Client":"Authentication.OAuth2","authentication.oauth2.OAuth2ClientBuilder":"Authentication.OAuth2"},"generatedFiles":["src/main/java/authentication/oauth2/InvalidAuth.java","src/main/java/authentication/oauth2/OAuth2Client.java","src/main/java/authentication/oauth2/OAuth2ClientBuilder.java","src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java","src/main/java/authentication/oauth2/implementation/package-info.java","src/main/java/authentication/oauth2/package-info.java","src/main/java/module-info.java"]}
1+
{"flavor":"generic","apiVersions":{},"crossLanguagePackageId":"Authentication.OAuth2","crossLanguageVersion":"26e44da61596","crossLanguageDefinitions":{"authentication.oauth2.InvalidAuth":"Authentication.OAuth2.InvalidAuth","authentication.oauth2.OAuth2Client":"Authentication.OAuth2","authentication.oauth2.OAuth2ClientBuilder":"Authentication.OAuth2"},"generatedFiles":["src/main/java/authentication/oauth2/InvalidAuth.java","src/main/java/authentication/oauth2/OAuth2Client.java","src/main/java/authentication/oauth2/OAuth2ClientBuilder.java","src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java","src/main/java/authentication/oauth2/implementation/package-info.java","src/main/java/authentication/oauth2/package-info.java","src/main/java/module-info.java"]}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"authentication.union.UnionClient":"Authentication.Union","authentication.union.UnionClientBuilder":"Authentication.Union"},"generatedFiles":["src/main/java/authentication/union/UnionClient.java","src/main/java/authentication/union/UnionClientBuilder.java","src/main/java/authentication/union/implementation/UnionClientImpl.java","src/main/java/authentication/union/implementation/package-info.java","src/main/java/authentication/union/package-info.java","src/main/java/module-info.java"]}
1+
{"flavor":"generic","apiVersions":{},"crossLanguagePackageId":"Authentication.Union","crossLanguageVersion":"9aecad8f2900","crossLanguageDefinitions":{"authentication.union.UnionClient":"Authentication.Union","authentication.union.UnionClientBuilder":"Authentication.Union"},"generatedFiles":["src/main/java/authentication/union/UnionClient.java","src/main/java/authentication/union/UnionClientBuilder.java","src/main/java/authentication/union/implementation/UnionClientImpl.java","src/main/java/authentication/union/implementation/package-info.java","src/main/java/authentication/union/package-info.java","src/main/java/module-info.java"]}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"documentation.DocumentationClientBuilder":"Documentation","documentation.ListsClient":"Documentation.Lists","documentation.TextFormattingClient":"Documentation.TextFormatting","documentation.lists.BulletPointsEnum":"Documentation.Lists.BulletPointsEnum","documentation.lists.BulletPointsModel":"Documentation.Lists.BulletPointsModel","documentation.lists.implementation.BulletPointsModelRequest":"Documentation.Lists.bulletPointsModel.Request.anonymous"},"generatedFiles":["src/main/java/documentation/DocumentationClientBuilder.java","src/main/java/documentation/ListsClient.java","src/main/java/documentation/TextFormattingClient.java","src/main/java/documentation/implementation/DocumentationClientImpl.java","src/main/java/documentation/implementation/ListsImpl.java","src/main/java/documentation/implementation/TextFormattingsImpl.java","src/main/java/documentation/implementation/package-info.java","src/main/java/documentation/lists/BulletPointsEnum.java","src/main/java/documentation/lists/BulletPointsModel.java","src/main/java/documentation/lists/implementation/BulletPointsModelRequest.java","src/main/java/documentation/lists/implementation/package-info.java","src/main/java/documentation/lists/package-info.java","src/main/java/documentation/package-info.java","src/main/java/module-info.java"]}
1+
{"flavor":"generic","apiVersions":{},"crossLanguagePackageId":"Documentation","crossLanguageVersion":"6c27465aee37","crossLanguageDefinitions":{"documentation.DocumentationClientBuilder":"Documentation","documentation.ListsClient":"Documentation.Lists","documentation.TextFormattingClient":"Documentation.TextFormatting","documentation.lists.BulletPointsEnum":"Documentation.Lists.BulletPointsEnum","documentation.lists.BulletPointsModel":"Documentation.Lists.BulletPointsModel","documentation.lists.implementation.BulletPointsModelRequest":"Documentation.Lists.bulletPointsModel.Request.anonymous"},"generatedFiles":["src/main/java/documentation/DocumentationClientBuilder.java","src/main/java/documentation/ListsClient.java","src/main/java/documentation/TextFormattingClient.java","src/main/java/documentation/implementation/DocumentationClientImpl.java","src/main/java/documentation/implementation/ListsImpl.java","src/main/java/documentation/implementation/TextFormattingsImpl.java","src/main/java/documentation/implementation/package-info.java","src/main/java/documentation/lists/BulletPointsEnum.java","src/main/java/documentation/lists/BulletPointsModel.java","src/main/java/documentation/lists/implementation/BulletPointsModelRequest.java","src/main/java/documentation/lists/implementation/package-info.java","src/main/java/documentation/lists/package-info.java","src/main/java/documentation/package-info.java","src/main/java/module-info.java"]}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"encode.array.ArrayClient":"Encode.Array.Property","encode.array.ArrayClientBuilder":"Encode.Array","encode.array.Colors":"Encode.Array.Colors","encode.array.ColorsExtensibleEnum":"Encode.Array.ColorsExtensibleEnum","encode.array.CommaDelimitedArrayProperty":"Encode.Array.CommaDelimitedArrayProperty","encode.array.CommaDelimitedEnumArrayProperty":"Encode.Array.CommaDelimitedEnumArrayProperty","encode.array.CommaDelimitedExtensibleEnumArrayProperty":"Encode.Array.CommaDelimitedExtensibleEnumArrayProperty","encode.array.NewlineDelimitedArrayProperty":"Encode.Array.NewlineDelimitedArrayProperty","encode.array.NewlineDelimitedEnumArrayProperty":"Encode.Array.NewlineDelimitedEnumArrayProperty","encode.array.NewlineDelimitedExtensibleEnumArrayProperty":"Encode.Array.NewlineDelimitedExtensibleEnumArrayProperty","encode.array.PipeDelimitedArrayProperty":"Encode.Array.PipeDelimitedArrayProperty","encode.array.PipeDelimitedEnumArrayProperty":"Encode.Array.PipeDelimitedEnumArrayProperty","encode.array.PipeDelimitedExtensibleEnumArrayProperty":"Encode.Array.PipeDelimitedExtensibleEnumArrayProperty","encode.array.SpaceDelimitedArrayProperty":"Encode.Array.SpaceDelimitedArrayProperty","encode.array.SpaceDelimitedEnumArrayProperty":"Encode.Array.SpaceDelimitedEnumArrayProperty","encode.array.SpaceDelimitedExtensibleEnumArrayProperty":"Encode.Array.SpaceDelimitedExtensibleEnumArrayProperty"},"generatedFiles":["src/main/java/encode/array/ArrayClient.java","src/main/java/encode/array/ArrayClientBuilder.java","src/main/java/encode/array/Colors.java","src/main/java/encode/array/ColorsExtensibleEnum.java","src/main/java/encode/array/CommaDelimitedArrayProperty.java","src/main/java/encode/array/CommaDelimitedEnumArrayProperty.java","src/main/java/encode/array/CommaDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/NewlineDelimitedArrayProperty.java","src/main/java/encode/array/NewlineDelimitedEnumArrayProperty.java","src/main/java/encode/array/NewlineDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/PipeDelimitedArrayProperty.java","src/main/java/encode/array/PipeDelimitedEnumArrayProperty.java","src/main/java/encode/array/PipeDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/SpaceDelimitedArrayProperty.java","src/main/java/encode/array/SpaceDelimitedEnumArrayProperty.java","src/main/java/encode/array/SpaceDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/implementation/ArrayClientImpl.java","src/main/java/encode/array/implementation/PropertiesImpl.java","src/main/java/encode/array/implementation/package-info.java","src/main/java/encode/array/package-info.java","src/main/java/module-info.java"]}
1+
{"flavor":"generic","apiVersions":{},"crossLanguagePackageId":"Encode.Array","crossLanguageVersion":"a865d79aecde","crossLanguageDefinitions":{"encode.array.ArrayClient":"Encode.Array.Property","encode.array.ArrayClientBuilder":"Encode.Array","encode.array.Colors":"Encode.Array.Colors","encode.array.ColorsExtensibleEnum":"Encode.Array.ColorsExtensibleEnum","encode.array.CommaDelimitedArrayProperty":"Encode.Array.CommaDelimitedArrayProperty","encode.array.CommaDelimitedEnumArrayProperty":"Encode.Array.CommaDelimitedEnumArrayProperty","encode.array.CommaDelimitedExtensibleEnumArrayProperty":"Encode.Array.CommaDelimitedExtensibleEnumArrayProperty","encode.array.NewlineDelimitedArrayProperty":"Encode.Array.NewlineDelimitedArrayProperty","encode.array.NewlineDelimitedEnumArrayProperty":"Encode.Array.NewlineDelimitedEnumArrayProperty","encode.array.NewlineDelimitedExtensibleEnumArrayProperty":"Encode.Array.NewlineDelimitedExtensibleEnumArrayProperty","encode.array.PipeDelimitedArrayProperty":"Encode.Array.PipeDelimitedArrayProperty","encode.array.PipeDelimitedEnumArrayProperty":"Encode.Array.PipeDelimitedEnumArrayProperty","encode.array.PipeDelimitedExtensibleEnumArrayProperty":"Encode.Array.PipeDelimitedExtensibleEnumArrayProperty","encode.array.SpaceDelimitedArrayProperty":"Encode.Array.SpaceDelimitedArrayProperty","encode.array.SpaceDelimitedEnumArrayProperty":"Encode.Array.SpaceDelimitedEnumArrayProperty","encode.array.SpaceDelimitedExtensibleEnumArrayProperty":"Encode.Array.SpaceDelimitedExtensibleEnumArrayProperty"},"generatedFiles":["src/main/java/encode/array/ArrayClient.java","src/main/java/encode/array/ArrayClientBuilder.java","src/main/java/encode/array/Colors.java","src/main/java/encode/array/ColorsExtensibleEnum.java","src/main/java/encode/array/CommaDelimitedArrayProperty.java","src/main/java/encode/array/CommaDelimitedEnumArrayProperty.java","src/main/java/encode/array/CommaDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/NewlineDelimitedArrayProperty.java","src/main/java/encode/array/NewlineDelimitedEnumArrayProperty.java","src/main/java/encode/array/NewlineDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/PipeDelimitedArrayProperty.java","src/main/java/encode/array/PipeDelimitedEnumArrayProperty.java","src/main/java/encode/array/PipeDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/SpaceDelimitedArrayProperty.java","src/main/java/encode/array/SpaceDelimitedEnumArrayProperty.java","src/main/java/encode/array/SpaceDelimitedExtensibleEnumArrayProperty.java","src/main/java/encode/array/implementation/ArrayClientImpl.java","src/main/java/encode/array/implementation/PropertiesImpl.java","src/main/java/encode/array/implementation/package-info.java","src/main/java/encode/array/package-info.java","src/main/java/module-info.java"]}

0 commit comments

Comments
 (0)