Skip to content

Commit eb971ec

Browse files
weidongxu-microsoftweidongxu-microsoft
authored
eng, sync 6185 and prepare 0.27.6 (#3033)
* sync * liftr-base 0.8
1 parent 8f9817c commit eb971ec

File tree

12 files changed

+378
-12
lines changed

12 files changed

+378
-12
lines changed

‎core

Submodule core updated 426 files

‎typespec-extension/changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release History
22

3+
## 0.27.6 (2025-02-28)
4+
5+
Compatible with compiler 0.65.
6+
37
## 0.27.5 (2025-02-27)
48

59
Compatible with compiler 0.65.

‎typespec-extension/package-lock.json

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎typespec-extension/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@azure-tools/typespec-java",
3-
"version": "0.27.5",
3+
"version": "0.27.6",
44
"description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
55
"keywords": [
66
"TypeSpec"
@@ -89,6 +89,6 @@
8989
"rimraf": "~6.0.1",
9090
"typescript": "~5.7.3",
9191
"vitest": "^3.0.7",
92-
"@azure-tools/typespec-liftr-base": "0.7.0"
92+
"@azure-tools/typespec-liftr-base": "0.8.0"
9393
}
9494
}

‎typespec-tests/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"@typespec/http-specs": "0.1.0-alpha.9",
1313
"@azure-tools/azure-http-specs": "0.1.0-alpha.6",
14-
"@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.27.5.tgz"
14+
"@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.27.6.tgz"
1515
},
1616
"devDependencies": {
1717
"@typespec/prettier-plugin-typespec": "~0.65.0",

‎typespec-tests/src/main/java/tsptest/errormodel/ErrorModelAsyncClient.java

+10
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,16 @@ public final class ErrorModelAsyncClient {
5858
* innererror (Optional): (recursive schema, see innererror above)
5959
* }
6060
* }
61+
* subError (Required): {
62+
* code: String (Required)
63+
* message: String (Required)
64+
* target: String (Optional)
65+
* details (Optional): [
66+
* (recursive schema, see above)
67+
* ]
68+
* innererror (Optional): (recursive schema, see innererror above)
69+
* subCode: String (Required)
70+
* }
6171
* }
6272
* }
6373
* </pre>

‎typespec-tests/src/main/java/tsptest/errormodel/ErrorModelClient.java

+10
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,16 @@ public final class ErrorModelClient {
5656
* innererror (Optional): (recursive schema, see innererror above)
5757
* }
5858
* }
59+
* subError (Required): {
60+
* code: String (Required)
61+
* message: String (Required)
62+
* target: String (Optional)
63+
* details (Optional): [
64+
* (recursive schema, see above)
65+
* ]
66+
* innererror (Optional): (recursive schema, see innererror above)
67+
* subCode: String (Required)
68+
* }
5969
* }
6070
* }
6171
* </pre>

‎typespec-tests/src/main/java/tsptest/errormodel/implementation/ErrorOpsImpl.java

+20
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,16 @@ Response<BinaryData> readSync(@HostParam("endpoint") String endpoint, @HeaderPar
9595
* innererror (Optional): (recursive schema, see innererror above)
9696
* }
9797
* }
98+
* subError (Required): {
99+
* code: String (Required)
100+
* message: String (Required)
101+
* target: String (Optional)
102+
* details (Optional): [
103+
* (recursive schema, see above)
104+
* ]
105+
* innererror (Optional): (recursive schema, see innererror above)
106+
* subCode: String (Required)
107+
* }
98108
* }
99109
* }
100110
* </pre>
@@ -133,6 +143,16 @@ public Mono<Response<BinaryData>> readWithResponseAsync(RequestOptions requestOp
133143
* innererror (Optional): (recursive schema, see innererror above)
134144
* }
135145
* }
146+
* subError (Required): {
147+
* code: String (Required)
148+
* message: String (Required)
149+
* target: String (Optional)
150+
* details (Optional): [
151+
* (recursive schema, see above)
152+
* ]
153+
* innererror (Optional): (recursive schema, see innererror above)
154+
* subCode: String (Required)
155+
* }
136156
* }
137157
* }
138158
* </pre>

‎typespec-tests/src/main/java/tsptest/errormodel/models/Diagnostic.java

+24-2
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,24 @@ public final class Diagnostic implements JsonSerializable<Diagnostic> {
3030
@Generated
3131
private final ResponseError error;
3232

33+
/*
34+
* The subError property.
35+
*/
36+
@Generated
37+
private final SubError subError;
38+
3339
/**
3440
* Creates an instance of Diagnostic class.
3541
*
3642
* @param name the name value to set.
3743
* @param error the error value to set.
44+
* @param subError the subError value to set.
3845
*/
3946
@Generated
40-
private Diagnostic(String name, ResponseError error) {
47+
private Diagnostic(String name, ResponseError error, SubError subError) {
4148
this.name = name;
4249
this.error = error;
50+
this.subError = subError;
4351
}
4452

4553
/**
@@ -62,6 +70,16 @@ public ResponseError getError() {
6270
return this.error;
6371
}
6472

73+
/**
74+
* Get the subError property: The subError property.
75+
*
76+
* @return the subError value.
77+
*/
78+
@Generated
79+
public SubError getSubError() {
80+
return this.subError;
81+
}
82+
6583
/**
6684
* {@inheritDoc}
6785
*/
@@ -71,6 +89,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
7189
jsonWriter.writeStartObject();
7290
jsonWriter.writeStringField("name", this.name);
7391
jsonWriter.writeJsonField("error", this.error);
92+
jsonWriter.writeJsonField("subError", this.subError);
7493
return jsonWriter.writeEndObject();
7594
}
7695

@@ -88,6 +107,7 @@ public static Diagnostic fromJson(JsonReader jsonReader) throws IOException {
88107
return jsonReader.readObject(reader -> {
89108
String name = null;
90109
ResponseError error = null;
110+
SubError subError = null;
91111
while (reader.nextToken() != JsonToken.END_OBJECT) {
92112
String fieldName = reader.getFieldName();
93113
reader.nextToken();
@@ -96,11 +116,13 @@ public static Diagnostic fromJson(JsonReader jsonReader) throws IOException {
96116
name = reader.getString();
97117
} else if ("error".equals(fieldName)) {
98118
error = ResponseError.fromJson(reader);
119+
} else if ("subError".equals(fieldName)) {
120+
subError = SubError.fromJson(reader);
99121
} else {
100122
reader.skipChildren();
101123
}
102124
}
103-
return new Diagnostic(name, error);
125+
return new Diagnostic(name, error, subError);
104126
});
105127
}
106128
}

‎typespec-tests/src/main/java/tsptest/errormodel/models/InnerError.java

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
// Code generated by Microsoft (R) TypeSpec Code Generator.
4+
5+
package tsptest.errormodel.models;
6+
7+
import com.azure.core.annotation.Generated;
8+
import com.azure.core.annotation.Immutable;
9+
import com.azure.json.JsonReader;
10+
import com.azure.json.JsonSerializable;
11+
import com.azure.json.JsonToken;
12+
import com.azure.json.JsonWriter;
13+
import java.io.IOException;
14+
15+
/**
16+
* An object containing more specific information about the error. As per Microsoft One API guidelines -
17+
* https://github.com/Microsoft/api-guidelines/blob/vNext/Guidelines.md#7102-error-condition-responses.
18+
*/
19+
@Immutable
20+
public final class InnerError implements JsonSerializable<InnerError> {
21+
/*
22+
* One of a server-defined set of error codes.
23+
*/
24+
@Generated
25+
private String code;
26+
27+
/*
28+
* Inner error.
29+
*/
30+
@Generated
31+
private InnerError innerError;
32+
33+
/**
34+
* Creates an instance of InnerError class.
35+
*/
36+
@Generated
37+
private InnerError() {
38+
}
39+
40+
/**
41+
* Get the code property: One of a server-defined set of error codes.
42+
*
43+
* @return the code value.
44+
*/
45+
@Generated
46+
public String getCode() {
47+
return this.code;
48+
}
49+
50+
/**
51+
* Get the innerError property: Inner error.
52+
*
53+
* @return the innerError value.
54+
*/
55+
@Generated
56+
public InnerError getInnerError() {
57+
return this.innerError;
58+
}
59+
60+
/**
61+
* {@inheritDoc}
62+
*/
63+
@Generated
64+
@Override
65+
public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
66+
jsonWriter.writeStartObject();
67+
jsonWriter.writeStringField("code", this.code);
68+
jsonWriter.writeJsonField("innererror", this.innerError);
69+
return jsonWriter.writeEndObject();
70+
}
71+
72+
/**
73+
* Reads an instance of InnerError from the JsonReader.
74+
*
75+
* @param jsonReader The JsonReader being read.
76+
* @return An instance of InnerError if the JsonReader was pointing to an instance of it, or null if it was pointing
77+
* to JSON null.
78+
* @throws IOException If an error occurs while reading the InnerError.
79+
*/
80+
@Generated
81+
public static InnerError fromJson(JsonReader jsonReader) throws IOException {
82+
return jsonReader.readObject(reader -> {
83+
InnerError deserializedInnerError = new InnerError();
84+
while (reader.nextToken() != JsonToken.END_OBJECT) {
85+
String fieldName = reader.getFieldName();
86+
reader.nextToken();
87+
88+
if ("code".equals(fieldName)) {
89+
deserializedInnerError.code = reader.getString();
90+
} else if ("innererror".equals(fieldName)) {
91+
deserializedInnerError.innerError = InnerError.fromJson(reader);
92+
} else {
93+
reader.skipChildren();
94+
}
95+
}
96+
97+
return deserializedInnerError;
98+
});
99+
}
100+
}

0 commit comments

Comments
 (0)