Skip to content

http-client-java, update compiler 1.0.0 #7258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 7, 2025
Merged

http-client-java, update compiler 1.0.0 #7258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ed153f
bump compiler to 1.0.0
weidongxu-microsoft May 7, 2025
5883e04
regen
weidongxu-microsoft May 7, 2025
704e268
update npm
weidongxu-microsoft May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions packages/http-client-java/generator/http-client-generator-clientcore-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@
"spector-stop": "tsp-spector server stop"
},
"dependencies": {
"@typespec/spector": "0.1.0-alpha.12",
"@typespec/spec-api": "0.1.0-alpha.4",
"@typespec/http-specs": "0.1.0-alpha.20",
"@typespec/spector": "0.1.0-alpha.13",
"@typespec/spec-api": "0.1.0-alpha.6",
"@typespec/http-specs": "0.1.0-alpha.22",
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.3.2.tgz",
"@typespec/http-client-java-tests": "file:"
},
"overrides": {
"@typespec/compiler": "^1.0.0-rc.1",
"@typespec/http": "^1.0.0-rc.1",
"@typespec/rest": "~0.69.0",
"@typespec/versioning": "~0.69.0",
"@typespec/openapi": "^1.0.0-rc.1",
"@typespec/xml": "~0.69.0",
"@typespec/events": "~0.69.0",
"@typespec/sse": "~0.69.0",
"@typespec/streams": "~0.69.0",
"@azure-tools/typespec-azure-core": "~0.55.0",
"@azure-tools/typespec-client-generator-core": "~0.55.1",
"@azure-tools/typespec-azure-resource-manager": "~0.55.0",
"@azure-tools/typespec-autorest": "~0.55.0"
"@typespec/compiler": "~1.0.0",
"@typespec/http": "~1.0.0",
"@typespec/rest": "~0.70.0",
"@typespec/versioning": "~0.70.0",
"@typespec/openapi": "~1.0.0",
"@typespec/xml": "~0.70.0",
"@typespec/events": "~0.70.0",
"@typespec/sse": "~0.70.0",
"@typespec/streams": "~0.70.0",
"@azure-tools/typespec-azure-core": "~0.56.0",
"@azure-tools/typespec-client-generator-core": "~0.56.0",
"@azure-tools/typespec-azure-resource-manager": "~0.56.0",
"@azure-tools/typespec-autorest": "~0.56.0"
Comment on lines +22 to +34
Copy link
Contributor Author

@weidongxu-microsoft weidongxu-microsoft May 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am using the ~ for allow of patch only.

In future if we again see problem with versions, we can just fix it at e.g. 1.0.0

},
"private": true
}
34 changes: 17 additions & 17 deletions packages/http-client-java/generator/http-client-generator-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@
"spector-stop": "tsp-spector server stop"
},
"dependencies": {
"@typespec/spector": "0.1.0-alpha.12",
"@typespec/spec-api": "0.1.0-alpha.4",
"@typespec/http-specs": "0.1.0-alpha.20",
"@azure-tools/azure-http-specs": "0.1.0-alpha.15",
"@typespec/spector": "0.1.0-alpha.13",
"@typespec/spec-api": "0.1.0-alpha.6",
"@typespec/http-specs": "0.1.0-alpha.22",
"@azure-tools/azure-http-specs": "0.1.0-alpha.17",
"@typespec/http-client-java": "file:../../typespec-http-client-java-0.3.2.tgz",
"@typespec/http-client-java-tests": "file:"
},
"overrides": {
"@typespec/compiler": "^1.0.0-rc.1",
"@typespec/http": "^1.0.0-rc.1",
"@typespec/rest": "~0.69.0",
"@typespec/versioning": "~0.69.0",
"@typespec/openapi": "^1.0.0-rc.1",
"@typespec/xml": "~0.69.0",
"@typespec/events": "~0.69.0",
"@typespec/sse": "~0.69.0",
"@typespec/streams": "~0.69.0",
"@azure-tools/typespec-azure-core": "~0.55.0",
"@azure-tools/typespec-client-generator-core": "~0.55.1",
"@azure-tools/typespec-azure-resource-manager": "~0.55.0",
"@azure-tools/typespec-autorest": "~0.55.0"
"@typespec/compiler": "~1.0.0",
"@typespec/http": "~1.0.0",
"@typespec/rest": "~0.70.0",
"@typespec/versioning": "~0.70.0",
"@typespec/openapi": "~1.0.0",
"@typespec/xml": "~0.70.0",
"@typespec/events": "~0.70.0",
"@typespec/sse": "~0.70.0",
"@typespec/streams": "~0.70.0",
"@azure-tools/typespec-azure-core": "~0.56.0",
"@azure-tools/typespec-client-generator-core": "~0.56.0",
"@azure-tools/typespec-azure-resource-manager": "~0.56.0",
"@azure-tools/typespec-autorest": "~0.56.0"
},
"private": true
}
6 changes: 3 additions & 3 deletions ...erializeEmptyStringAsNullAsyncClient.java → ...erializeEmptyStringAsNullAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) TypeSpec Code Generator.

package _specs_.azure.clientgenerator.core.deserializeemptystringasnull;
package azure.clientgenerator.core.deserialize.emptystringnull;

import _specs_.azure.clientgenerator.core.deserializeemptystringasnull.implementation.DeserializeEmptyStringAsNullClientImpl;
import _specs_.azure.clientgenerator.core.deserializeemptystringasnull.models.ResponseModel;
import azure.clientgenerator.core.deserialize.emptystringnull.implementation.DeserializeEmptyStringAsNullClientImpl;
import azure.clientgenerator.core.deserialize.emptystringnull.models.ResponseModel;
import com.azure.core.annotation.Generated;
import com.azure.core.annotation.ReturnType;
import com.azure.core.annotation.ServiceClient;
Expand Down
6 changes: 3 additions & 3 deletions ...l/DeserializeEmptyStringAsNullClient.java → ...l/DeserializeEmptyStringAsNullClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) TypeSpec Code Generator.

package _specs_.azure.clientgenerator.core.deserializeemptystringasnull;
package azure.clientgenerator.core.deserialize.emptystringnull;

import _specs_.azure.clientgenerator.core.deserializeemptystringasnull.implementation.DeserializeEmptyStringAsNullClientImpl;
import _specs_.azure.clientgenerator.core.deserializeemptystringasnull.models.ResponseModel;
import azure.clientgenerator.core.deserialize.emptystringnull.implementation.DeserializeEmptyStringAsNullClientImpl;
import azure.clientgenerator.core.deserialize.emptystringnull.models.ResponseModel;
import com.azure.core.annotation.Generated;
import com.azure.core.annotation.ReturnType;
import com.azure.core.annotation.ServiceClient;
Expand Down
6 changes: 3 additions & 3 deletions ...ializeEmptyStringAsNullClientBuilder.java → ...ializeEmptyStringAsNullClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) TypeSpec Code Generator.

package _specs_.azure.clientgenerator.core.deserializeemptystringasnull;
package azure.clientgenerator.core.deserialize.emptystringnull;

import _specs_.azure.clientgenerator.core.deserializeemptystringasnull.implementation.DeserializeEmptyStringAsNullClientImpl;
import azure.clientgenerator.core.deserialize.emptystringnull.implementation.DeserializeEmptyStringAsNullClientImpl;
import com.azure.core.annotation.Generated;
import com.azure.core.annotation.ServiceClientBuilder;
import com.azure.core.client.traits.ConfigurationTrait;
Expand Down Expand Up @@ -53,7 +53,7 @@ public final class DeserializeEmptyStringAsNullClientBuilder implements

@Generated
private static final Map<String, String> PROPERTIES
= CoreUtils.getProperties("_specs_-azure-clientgenerator-core-deserializeemptystringasnull.properties");
= CoreUtils.getProperties("azure-clientgenerator-core-deserialize-emptystringnull.properties");

@Generated
private final List<HttpPipelinePolicy> pipelinePolicies;
Expand Down
2 changes: 1 addition & 1 deletion ...serializeEmptyStringAsNullClientImpl.java → ...serializeEmptyStringAsNullClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) TypeSpec Code Generator.

package _specs_.azure.clientgenerator.core.deserializeemptystringasnull.implementation;
package azure.clientgenerator.core.deserialize.emptystringnull.implementation;

import com.azure.core.annotation.ExpectedResponses;
import com.azure.core.annotation.Get;
Expand Down
2 changes: 1 addition & 1 deletion ...ngasnull/implementation/package-info.java → ...ringnull/implementation/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
* Test decorator &#064;deserializeEmptyStringAsNull.
* <!-- end generated doc -->
*/
package _specs_.azure.clientgenerator.core.deserializeemptystringasnull.implementation;
package azure.clientgenerator.core.deserialize.emptystringnull.implementation;
2 changes: 1 addition & 1 deletion ...ptystringasnull/models/ResponseModel.java → ...emptystringnull/models/ResponseModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) TypeSpec Code Generator.

package _specs_.azure.clientgenerator.core.deserializeemptystringasnull.models;
package azure.clientgenerator.core.deserialize.emptystringnull.models;

import com.azure.core.annotation.Generated;
import com.azure.core.annotation.Immutable;
Expand Down
2 changes: 1 addition & 1 deletion ...mptystringasnull/models/package-info.java → .../emptystringnull/models/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
* Test decorator &#064;deserializeEmptyStringAsNull.
* <!-- end generated doc -->
*/
package _specs_.azure.clientgenerator.core.deserializeemptystringasnull.models;
package azure.clientgenerator.core.deserialize.emptystringnull.models;
2 changes: 1 addition & 1 deletion ...ializeemptystringasnull/package-info.java → ...rialize/emptystringnull/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
* Test decorator &#064;deserializeEmptyStringAsNull.
* <!-- end generated doc -->
*/
package _specs_.azure.clientgenerator.core.deserializeemptystringasnull;
package azure.clientgenerator.core.deserialize.emptystringnull;
30 changes: 15 additions & 15 deletions ...est/src/main/java/azure/resourcemanager/commonproperties/models/UserAssignedIdentity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
@Immutable
public final class UserAssignedIdentity implements JsonSerializable<UserAssignedIdentity> {
/*
* The client ID of the assigned identity.
* The principal ID of the assigned identity.
*/
@Generated
private String clientId;
private String principalId;

/*
* The principal ID of the assigned identity.
* The client ID of the assigned identity.
*/
@Generated
private String principalId;
private String clientId;

/**
* Creates an instance of UserAssignedIdentity class.
Expand All @@ -37,23 +37,23 @@ public UserAssignedIdentity() {
}

/**
* Get the clientId property: The client ID of the assigned identity.
* Get the principalId property: The principal ID of the assigned identity.
*
* @return the clientId value.
* @return the principalId value.
*/
@Generated
public String clientId() {
return this.clientId;
public String principalId() {
return this.principalId;
}

/**
* Get the principalId property: The principal ID of the assigned identity.
* Get the clientId property: The client ID of the assigned identity.
*
* @return the principalId value.
* @return the clientId value.
*/
@Generated
public String principalId() {
return this.principalId;
public String clientId() {
return this.clientId;
}

/**
Expand Down Expand Up @@ -88,10 +88,10 @@ public static UserAssignedIdentity fromJson(JsonReader jsonReader) throws IOExce
String fieldName = reader.getFieldName();
reader.nextToken();

if ("clientId".equals(fieldName)) {
deserializedUserAssignedIdentity.clientId = reader.getString();
} else if ("principalId".equals(fieldName)) {
if ("principalId".equals(fieldName)) {
deserializedUserAssignedIdentity.principalId = reader.getString();
} else if ("clientId".equals(fieldName)) {
deserializedUserAssignedIdentity.clientId = reader.getString();
} else {
reader.skipChildren();
}
Expand Down
2 changes: 2 additions & 0 deletions .../src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OperationInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import java.io.IOException;

/**
* REST API Operation
*
* Details of a REST API operation, returned from the Resource Provider Operations API.
*/
@Immutable
Expand Down
2 changes: 2 additions & 0 deletions ...enerator-test/src/main/java/tsptest/armresourceprovider/fluent/models/OperationInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import tsptest.armresourceprovider.models.Origin;

/**
* REST API Operation
*
* Details of a REST API operation, returned from the Resource Provider Operations API.
*/
@Immutable
Expand Down
30 changes: 15 additions & 15 deletions ...generator-test/src/main/java/tsptest/armresourceprovider/models/UserAssignedIdentity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
@Immutable
public final class UserAssignedIdentity implements JsonSerializable<UserAssignedIdentity> {
/*
* The client ID of the assigned identity.
* The principal ID of the assigned identity.
*/
@Generated
private String clientId;
private String principalId;

/*
* The principal ID of the assigned identity.
* The client ID of the assigned identity.
*/
@Generated
private String principalId;
private String clientId;

/**
* Creates an instance of UserAssignedIdentity class.
Expand All @@ -37,23 +37,23 @@ public UserAssignedIdentity() {
}

/**
* Get the clientId property: The client ID of the assigned identity.
* Get the principalId property: The principal ID of the assigned identity.
*
* @return the clientId value.
* @return the principalId value.
*/
@Generated
public String clientId() {
return this.clientId;
public String principalId() {
return this.principalId;
}

/**
* Get the principalId property: The principal ID of the assigned identity.
* Get the clientId property: The client ID of the assigned identity.
*
* @return the principalId value.
* @return the clientId value.
*/
@Generated
public String principalId() {
return this.principalId;
public String clientId() {
return this.clientId;
}

/**
Expand Down Expand Up @@ -88,10 +88,10 @@ public static UserAssignedIdentity fromJson(JsonReader jsonReader) throws IOExce
String fieldName = reader.getFieldName();
reader.nextToken();

if ("clientId".equals(fieldName)) {
deserializedUserAssignedIdentity.clientId = reader.getString();
} else if ("principalId".equals(fieldName)) {
if ("principalId".equals(fieldName)) {
deserializedUserAssignedIdentity.principalId = reader.getString();
} else if ("clientId".equals(fieldName)) {
deserializedUserAssignedIdentity.clientId = reader.getString();
} else {
reader.skipChildren();
}
Expand Down
13 changes: 0 additions & 13 deletions ...F/_specs_-azure-clientgenerator-core-deserializeemptystringasnull_apiview_properties.json
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions ...s/META-INF/azure-clientgenerator-core-deserialize-emptystringnull_apiview_properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"flavor": "Azure",
"CrossLanguageDefinitionId": {
"azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull",
"azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient.get": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get",
"azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullAsyncClient.getWithResponse": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get",
"azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull",
"azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient.get": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get",
"azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient.getWithResponse": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.get",
"azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClientBuilder": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull",
"azure.clientgenerator.core.deserialize.emptystringnull.models.ResponseModel": "_Specs_.Azure.ClientGenerator.Core.DeserializeEmptyStringAsNull.ResponseModel"
}
}
0 ...e-deserializeemptystringasnull.properties → ...re-deserialize-emptystringnull.properties
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...alizeEmptyStringAsNullClientTestBase.java → ...alizeEmptyStringAsNullClientTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) TypeSpec Code Generator.

package _specs_.azure.clientgenerator.core.deserializeemptystringasnull.generated;
package azure.clientgenerator.core.deserialize.emptystringnull.generated;

// The Java test files under 'generated' package are generated for your reference.
// If you wish to modify these files, please copy them out of the 'generated' package, and modify there.
// See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test.

import _specs_.azure.clientgenerator.core.deserializeemptystringasnull.DeserializeEmptyStringAsNullClient;
import _specs_.azure.clientgenerator.core.deserializeemptystringasnull.DeserializeEmptyStringAsNullClientBuilder;
import azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClient;
import azure.clientgenerator.core.deserialize.emptystringnull.DeserializeEmptyStringAsNullClientBuilder;
import com.azure.core.http.policy.HttpLogDetailLevel;
import com.azure.core.http.policy.HttpLogOptions;
import com.azure.core.test.TestMode;
Expand Down
Loading
Loading