Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion core
Submodule core updated 114 files
250 changes: 125 additions & 125 deletions typespec-extension/package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions typespec-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@
"@azure-tools/typespec-azure-core": "0.67.0",
"@azure-tools/typespec-azure-resource-manager": "0.67.0",
"@azure-tools/typespec-azure-rulesets": "0.67.0",
"@azure-tools/typespec-client-generator-core": "0.67.0",
"@azure-tools/typespec-client-generator-core": "0.67.1",
"@azure-tools/typespec-liftr-base": "0.13.0",
"@microsoft/api-extractor": "^7.58.1",
"@microsoft/api-extractor": "^7.58.2",
"@types/js-yaml": "~4.0.9",
"@types/lodash": "~4.17.24",
"@types/node": "~25.5.2",
"@typescript-eslint/eslint-plugin": "~8.58.0",
"@typescript-eslint/parser": "~8.58.0",
"@typescript-eslint/eslint-plugin": "~8.58.1",
"@typescript-eslint/parser": "~8.58.1",
"@typespec/compiler": "1.11.0",
"@typespec/events": "0.81.0",
"@typespec/http": "1.11.0",
Expand All @@ -95,19 +95,19 @@
"@vitest/coverage-v8": "^4.1.3",
"@vitest/ui": "^4.1.3",
"c8": "~11.0.0",
"eslint": "~10.1.0",
"eslint": "~10.2.0",
"eslint-plugin-deprecation": "~3.0.0",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-unicorn": "^64.0.0",
"prettier": "~3.8.1",
"rimraf": "~6.1.3",
"typescript": "~5.9.2",
"typescript-eslint": "^8.58.0",
"typescript-eslint": "^8.58.1",
"vitest": "^4.1.3"
},
"overrides": {
"eslint": "~10.1.0",
"@typescript-eslint/eslint-plugin": "~8.58.0",
"@typescript-eslint/parser": "~8.58.0"
"eslint": "~10.2.0",
"@typescript-eslint/eslint-plugin": "~8.58.1",
"@typescript-eslint/parser": "~8.58.1"
}
}
2 changes: 1 addition & 1 deletion typespec-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@typespec/sse": "0.81.0",
"@typespec/streams": "0.81.0",
"@azure-tools/typespec-azure-core": "0.67.0",
"@azure-tools/typespec-client-generator-core": "0.67.0",
"@azure-tools/typespec-client-generator-core": "0.67.1",
"@azure-tools/typespec-azure-resource-manager": "0.67.0",
"@azure-tools/typespec-autorest": "0.67.0",
"@azure-tools/typespec-liftr-base": "0.13.0"
Expand Down
22 changes: 8 additions & 14 deletions typespec-tests/src/main/java/type/file/FileAsyncClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ public Mono<Response<BinaryData>> downloadFileMultipleContentTypesWithResponse(S
* }
* </pre>
*
* @param contentType Body parameter's content type. Known values are *&#47;*.
* @param file The file parameter.
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
* @throws HttpResponseException thrown if the request is rejected by server.
Expand All @@ -208,9 +207,9 @@ public Mono<Response<BinaryData>> downloadFileMultipleContentTypesWithResponse(S
*/
@Generated
@ServiceMethod(returns = ReturnType.SINGLE)
public Mono<Response<Void>> uploadFileDefaultContentTypeWithResponse(String contentType, BinaryData file,
public Mono<Response<Void>> uploadFileDefaultContentTypeWithResponse(BinaryData file,
RequestOptions requestOptions) {
return this.serviceClient.uploadFileDefaultContentTypeWithResponseAsync(contentType, file, requestOptions);
return this.serviceClient.uploadFileDefaultContentTypeWithResponseAsync(file, requestOptions);
}

/**
Expand All @@ -223,7 +222,6 @@ public Mono<Response<Void>> uploadFileDefaultContentTypeWithResponse(String cont
* }
* </pre>
*
* @param accept The accept parameter.
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
* @throws HttpResponseException thrown if the request is rejected by server.
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
Expand All @@ -233,9 +231,8 @@ public Mono<Response<Void>> uploadFileDefaultContentTypeWithResponse(String cont
*/
@Generated
@ServiceMethod(returns = ReturnType.SINGLE)
public Mono<Response<BinaryData>> downloadFileDefaultContentTypeWithResponse(String accept,
RequestOptions requestOptions) {
return this.serviceClient.downloadFileDefaultContentTypeWithResponseAsync(accept, requestOptions);
public Mono<Response<BinaryData>> downloadFileDefaultContentTypeWithResponse(RequestOptions requestOptions) {
return this.serviceClient.downloadFileDefaultContentTypeWithResponseAsync(requestOptions);
}

/**
Expand Down Expand Up @@ -338,7 +335,6 @@ public Mono<BinaryData> downloadFileMultipleContentTypes(DownloadFileMultipleCon
/**
* The uploadFileDefaultContentType operation.
*
* @param contentType Body parameter's content type. Known values are *&#47;*.
* @param file The file parameter.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws HttpResponseException thrown if the request is rejected by server.
Expand All @@ -350,17 +346,15 @@ public Mono<BinaryData> downloadFileMultipleContentTypes(DownloadFileMultipleCon
*/
@Generated
@ServiceMethod(returns = ReturnType.SINGLE)
public Mono<Void> uploadFileDefaultContentType(String contentType, BinaryData file) {
public Mono<Void> uploadFileDefaultContentType(BinaryData file) {
// Generated convenience method for uploadFileDefaultContentTypeWithResponse
RequestOptions requestOptions = new RequestOptions();
return uploadFileDefaultContentTypeWithResponse(contentType, file, requestOptions).flatMap(FluxUtil::toMono);
return uploadFileDefaultContentTypeWithResponse(file, requestOptions).flatMap(FluxUtil::toMono);
}

/**
* The downloadFileDefaultContentType operation.
*
* @param accept The accept parameter.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws HttpResponseException thrown if the request is rejected by server.
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
* @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
Expand All @@ -370,9 +364,9 @@ public Mono<Void> uploadFileDefaultContentType(String contentType, BinaryData fi
*/
@Generated
@ServiceMethod(returns = ReturnType.SINGLE)
public Mono<BinaryData> downloadFileDefaultContentType(String accept) {
public Mono<BinaryData> downloadFileDefaultContentType() {
// Generated convenience method for downloadFileDefaultContentTypeWithResponse
RequestOptions requestOptions = new RequestOptions();
return downloadFileDefaultContentTypeWithResponse(accept, requestOptions).flatMap(FluxUtil::toMono);
return downloadFileDefaultContentTypeWithResponse(requestOptions).flatMap(FluxUtil::toMono);
}
}
23 changes: 8 additions & 15 deletions typespec-tests/src/main/java/type/file/FileClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ public Response<BinaryData> downloadFileMultipleContentTypesWithResponse(String
* }
* </pre>
*
* @param contentType Body parameter's content type. Known values are *&#47;*.
* @param file The file parameter.
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
* @throws HttpResponseException thrown if the request is rejected by server.
Expand All @@ -205,9 +204,8 @@ public Response<BinaryData> downloadFileMultipleContentTypesWithResponse(String
*/
@Generated
@ServiceMethod(returns = ReturnType.SINGLE)
public Response<Void> uploadFileDefaultContentTypeWithResponse(String contentType, BinaryData file,
RequestOptions requestOptions) {
return this.serviceClient.uploadFileDefaultContentTypeWithResponse(contentType, file, requestOptions);
public Response<Void> uploadFileDefaultContentTypeWithResponse(BinaryData file, RequestOptions requestOptions) {
return this.serviceClient.uploadFileDefaultContentTypeWithResponse(file, requestOptions);
}

/**
Expand All @@ -220,7 +218,6 @@ public Response<Void> uploadFileDefaultContentTypeWithResponse(String contentTyp
* }
* </pre>
*
* @param accept The accept parameter.
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
* @throws HttpResponseException thrown if the request is rejected by server.
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
Expand All @@ -230,9 +227,8 @@ public Response<Void> uploadFileDefaultContentTypeWithResponse(String contentTyp
*/
@Generated
@ServiceMethod(returns = ReturnType.SINGLE)
public Response<BinaryData> downloadFileDefaultContentTypeWithResponse(String accept,
RequestOptions requestOptions) {
return this.serviceClient.downloadFileDefaultContentTypeWithResponse(accept, requestOptions);
public Response<BinaryData> downloadFileDefaultContentTypeWithResponse(RequestOptions requestOptions) {
return this.serviceClient.downloadFileDefaultContentTypeWithResponse(requestOptions);
}

/**
Expand Down Expand Up @@ -332,7 +328,6 @@ public BinaryData downloadFileMultipleContentTypes(DownloadFileMultipleContentTy
/**
* The uploadFileDefaultContentType operation.
*
* @param contentType Body parameter's content type. Known values are *&#47;*.
* @param file The file parameter.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws HttpResponseException thrown if the request is rejected by server.
Expand All @@ -343,17 +338,15 @@ public BinaryData downloadFileMultipleContentTypes(DownloadFileMultipleContentTy
*/
@Generated
@ServiceMethod(returns = ReturnType.SINGLE)
public void uploadFileDefaultContentType(String contentType, BinaryData file) {
public void uploadFileDefaultContentType(BinaryData file) {
// Generated convenience method for uploadFileDefaultContentTypeWithResponse
RequestOptions requestOptions = new RequestOptions();
uploadFileDefaultContentTypeWithResponse(contentType, file, requestOptions).getValue();
uploadFileDefaultContentTypeWithResponse(file, requestOptions).getValue();
}

/**
* The downloadFileDefaultContentType operation.
*
* @param accept The accept parameter.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws HttpResponseException thrown if the request is rejected by server.
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
* @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
Expand All @@ -363,9 +356,9 @@ public void uploadFileDefaultContentType(String contentType, BinaryData file) {
*/
@Generated
@ServiceMethod(returns = ReturnType.SINGLE)
public BinaryData downloadFileDefaultContentType(String accept) {
public BinaryData downloadFileDefaultContentType() {
// Generated convenience method for downloadFileDefaultContentTypeWithResponse
RequestOptions requestOptions = new RequestOptions();
return downloadFileDefaultContentTypeWithResponse(accept, requestOptions).getValue();
return downloadFileDefaultContentTypeWithResponse(requestOptions).getValue();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,6 @@ public Response<BinaryData> downloadFileMultipleContentTypesWithResponse(String
* }
* </pre>
*
* @param contentType Body parameter's content type. Known values are *&#47;*.
* @param file The file parameter.
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
* @throws HttpResponseException thrown if the request is rejected by server.
Expand All @@ -532,8 +531,9 @@ public Response<BinaryData> downloadFileMultipleContentTypesWithResponse(String
* @return the {@link Response} on successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public Mono<Response<Void>> uploadFileDefaultContentTypeWithResponseAsync(String contentType, BinaryData file,
public Mono<Response<Void>> uploadFileDefaultContentTypeWithResponseAsync(BinaryData file,
RequestOptions requestOptions) {
final String contentType = "*/*";
return FluxUtil.withContext(context -> service.uploadFileDefaultContentType(this.client.getEndpoint(),
contentType, file, requestOptions, context));
}
Expand All @@ -548,7 +548,6 @@ public Mono<Response<Void>> uploadFileDefaultContentTypeWithResponseAsync(String
* }
* </pre>
*
* @param contentType Body parameter's content type. Known values are *&#47;*.
* @param file The file parameter.
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
* @throws HttpResponseException thrown if the request is rejected by server.
Expand All @@ -558,8 +557,8 @@ public Mono<Response<Void>> uploadFileDefaultContentTypeWithResponseAsync(String
* @return the {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public Response<Void> uploadFileDefaultContentTypeWithResponse(String contentType, BinaryData file,
RequestOptions requestOptions) {
public Response<Void> uploadFileDefaultContentTypeWithResponse(BinaryData file, RequestOptions requestOptions) {
final String contentType = "*/*";
return service.uploadFileDefaultContentTypeSync(this.client.getEndpoint(), contentType, file, requestOptions,
Context.NONE);
}
Expand All @@ -574,7 +573,6 @@ public Response<Void> uploadFileDefaultContentTypeWithResponse(String contentTyp
* }
* </pre>
*
* @param accept The accept parameter.
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
* @throws HttpResponseException thrown if the request is rejected by server.
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
Expand All @@ -583,8 +581,8 @@ public Response<Void> uploadFileDefaultContentTypeWithResponse(String contentTyp
* @return the response body along with {@link Response} on successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public Mono<Response<BinaryData>> downloadFileDefaultContentTypeWithResponseAsync(String accept,
RequestOptions requestOptions) {
public Mono<Response<BinaryData>> downloadFileDefaultContentTypeWithResponseAsync(RequestOptions requestOptions) {
final String accept = "*/*";
return FluxUtil.withContext(context -> service.downloadFileDefaultContentType(this.client.getEndpoint(), accept,
requestOptions, context));
}
Expand All @@ -599,7 +597,6 @@ public Mono<Response<BinaryData>> downloadFileDefaultContentTypeWithResponseAsyn
* }
* </pre>
*
* @param accept The accept parameter.
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
* @throws HttpResponseException thrown if the request is rejected by server.
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
Expand All @@ -608,8 +605,8 @@ public Mono<Response<BinaryData>> downloadFileDefaultContentTypeWithResponseAsyn
* @return the response body along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public Response<BinaryData> downloadFileDefaultContentTypeWithResponse(String accept,
RequestOptions requestOptions) {
public Response<BinaryData> downloadFileDefaultContentTypeWithResponse(RequestOptions requestOptions) {
final String accept = "*/*";
return service.downloadFileDefaultContentTypeSync(this.client.getEndpoint(), accept, requestOptions,
Context.NONE);
}
Expand Down
7 changes: 5 additions & 2 deletions typespec-tests/src/test/java/type/file/FileTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

package type.file;

import com.azure.core.http.HttpHeaderName;
import com.azure.core.http.rest.RequestOptions;
import com.azure.core.util.BinaryData;
import java.nio.file.Path;
import org.junit.jupiter.api.Assertions;
Expand Down Expand Up @@ -54,12 +56,13 @@ public void testDownloadFileMultipleContentTypes() {

@Test
public void testUploadFileDefaultContentType() {
client.uploadFileDefaultContentType("image/png", BinaryData.fromFile(PNG_FILE));
client.uploadFileDefaultContentTypeWithResponse(BinaryData.fromFile(PNG_FILE),
new RequestOptions().setHeader(HttpHeaderName.CONTENT_TYPE, "image/png"));
}

@Test
public void testDownloadFileDefaultContentType() {
BinaryData response = client.downloadFileDefaultContentType("image/png");
BinaryData response = client.downloadFileDefaultContentType();
Assertions.assertNotNull(response);
}
}
Loading