diff --git a/typespec-extension/src/code-model-builder.ts b/typespec-extension/src/code-model-builder.ts index 521d15ce5f..ea580632fb 100644 --- a/typespec-extension/src/code-model-builder.ts +++ b/typespec-extension/src/code-model-builder.ts @@ -95,7 +95,6 @@ import { getOverloadedOperation, getProjectedName, getSummary, - getTypeName, getVisibility, ignoreDiagnostics, isArrayModelType, @@ -156,8 +155,6 @@ import { ProcessingCache, getAccess, getDurationFormatFromSdkType, - getNameForTemplate, - getNamePrefixForProperty, getUnionDescription, getUsage, hasScalarAsBase, @@ -1350,7 +1347,8 @@ export class CodeModelBuilder { } const isAnonymousModel = sdkType.kind === "model" && sdkType.isGeneratedName === true; - const parameter = new Parameter(this.getName(body), this.getDoc(body), schema, { + const parameterName = body.kind === "Model" ? (sdkType.kind === "model" ? sdkType.name : "") : this.getName(body); + const parameter = new Parameter(parameterName, this.getDoc(body), schema, { summary: this.getSummary(body), implementation: ImplementationLocation.Method, required: body.kind === "Model" || !body.optional, @@ -1598,10 +1596,10 @@ export class CodeModelBuilder { } if (match) { schema = candidateResponseSchema; + const sdkType = getClientType(this.sdkContext, bodyType); + const modelName = sdkType.kind === "model" ? sdkType.name : undefined; this.trace( - `Replace TypeSpec model '${this.getName(bodyType)}' with '${ - candidateResponseSchema.language.default.name - }'`, + `Replace TypeSpec model '${modelName}' with '${candidateResponseSchema.language.default.name}'`, ); } } @@ -1890,7 +1888,7 @@ export class CodeModelBuilder { const schemaType = type.isFixed ? SealedChoiceSchema : ChoiceSchema; - const schema = new schemaType(type.name ? type.name : name, type.details ?? "", { + const schema = new schemaType(type.name ?? name, type.details ?? "", { summary: type.description, choiceType: valueType as any, choices: choices, @@ -1911,7 +1909,7 @@ export class CodeModelBuilder { const valueType = this.processSchemaFromSdkType(type.valueType, type.valueType.kind); return this.codeModel.schemas.add( - new ConstantSchema(name, type.details ?? "", { + new ConstantSchema(type.name ?? name, type.details ?? "", { summary: type.description, valueType: valueType, value: new ConstantValue(type.value), @@ -1923,7 +1921,7 @@ export class CodeModelBuilder { const valueType = this.processSchemaFromSdkType(type.enumType, type.enumType.name); return this.codeModel.schemas.add( - new ConstantSchema(name, type.details ?? "", { + new ConstantSchema(type.name ?? name, type.details ?? "", { summary: type.description, valueType: valueType, value: new ConstantValue(type.value ?? type.name), @@ -2091,10 +2089,7 @@ export class CodeModelBuilder { } private processModelPropertyFromSdkType(prop: SdkModelPropertyType): Property { - const rawModelPropertyType = prop.__raw as ModelProperty | undefined; - // TODO: This case is related with literal.tsp, once TCGC supports giving a name, we can use TCGC generatedName - const schemaNameHint = pascalCase(getNamePrefixForProperty(rawModelPropertyType)) + pascalCase(prop.name); - let schema = this.processSchemaFromSdkType(prop.type, schemaNameHint); + let schema = this.processSchemaFromSdkType(prop.type, ""); let nullable = prop.nullable; let extensions: Record | undefined = undefined; @@ -2133,7 +2128,6 @@ export class CodeModelBuilder { throw new Error(`Invalid type for union: '${type.kind}'.`); } const rawUnionType: Union = type.__raw as Union; - // TODO: name from typespec-client-generator-core const namespace = getNamespace(rawUnionType); const baseName = type.name ?? pascalCase(name) + "Model"; this.logWarning( @@ -2265,13 +2259,9 @@ export class CodeModelBuilder { } private getName( - target: Model | Union | UnionVariant | Enum | EnumMember | ModelProperty | Scalar | Operation | undefined, + target: Union | UnionVariant | Enum | EnumMember | ModelProperty | Operation, nameHint: string | undefined = undefined, ): string { - if (!target) { - return nameHint || ""; - } - // TODO: once getLibraryName API in typespec-client-generator-core can get projected name from language and client, as well as can handle template case, use getLibraryName API const emitterClientName = getClientNameOverride(this.sdkContext, target); if (emitterClientName && typeof emitterClientName === "string") { @@ -2293,24 +2283,6 @@ export class CodeModelBuilder { return friendlyName; } - // if no projectedName and friendlyName found, return the name of the target (including special handling for template) - if ( - target.kind === "Model" && - target.templateMapper && - target.templateMapper.args && - target.templateMapper.args.length > 0 - ) { - const tspName = getTypeName(target, this.typeNameOptions); - const newName = getNameForTemplate(target); - this.logWarning(`Rename TypeSpec Model '${tspName}' to '${newName}'`); - return newName; - } - - if (!target.name && nameHint) { - const newName = nameHint; - this.logWarning(`Rename anonymous TypeSpec ${target.kind} to '${newName}'`); - return newName; - } if (typeof target.name === "symbol") { return ""; } diff --git a/typespec-extension/src/type-utils.ts b/typespec-extension/src/type-utils.ts index 0b184c57aa..1aa1b08cde 100644 --- a/typespec-extension/src/type-utils.ts +++ b/typespec-extension/src/type-utils.ts @@ -5,7 +5,6 @@ import { EnumMember, IntrinsicScalarName, Model, - ModelProperty, Program, Scalar, StringLiteral, @@ -21,7 +20,7 @@ import { } from "@typespec/compiler"; import { SchemaContext } from "@autorest/codemodel"; import { DurationSchema } from "./common/schemas/time.js"; -import { getNamespace, pascalCase } from "./utils.js"; +import { getNamespace } from "./utils.js"; import { getUnionAsEnum } from "@azure-tools/typespec-azure-core"; import { SdkDurationType, isSdkFloatKind, isSdkIntKind } from "@azure-tools/typespec-client-generator-core"; import { Version } from "@typespec/versioning"; @@ -83,24 +82,6 @@ export function isModelReferredInTemplate(template: TemplatedTypeBase, target: M ); } -export function getNameForTemplate(target: Type): string { - switch (target.kind) { - case "Model": { - let name = target.name; - if (target.templateMapper && target.templateMapper.args) { - name = name + target.templateMapper.args.map((it) => ("kind" in it ? getNameForTemplate(it) : "")).join(""); - } - return name; - } - - case "String": - return target.value; - - default: - return ""; - } -} - export function isNullableType(type: Type): boolean { if (type.kind === "Union") { const nullVariants = Array.from(type.variants.values()).filter((it) => isNullType(it.type)); @@ -222,33 +203,6 @@ export function getUnionDescription(union: Union, typeNameOptions: TypeNameOptio return name; } -export function getNamePrefixForProperty(property: ModelProperty | undefined): string { - if (property && property.model) { - if (property.model.name) { - return property.model.name; - } else if (property.model.namespace) { - for (const model of property.model.namespace.models.values()) { - for (const prop of model.properties.values()) { - const candidateModel = prop.type; - // find the property that refers to the unnamed property.model - if ( - candidateModel.kind === "Model" && - (candidateModel === property.model || candidateModel.indexer?.value === property.model) - ) { - return getNamePrefixForProperty(prop) + pascalCase(prop.name); - } else if ( - candidateModel.kind === "Union" && - Array.from(candidateModel.variants.values()).find((it) => it.type === property.model) - ) { - return getNamePrefixForProperty(prop) + pascalCase(prop.name); - } - } - } - } - } - return ""; -} - export function modelIs(model: Model, name: string, namespace: string): boolean { let currentModel: Model | undefined = model; while (currentModel) { diff --git a/typespec-tests/src/main/java/com/cadl/literalservice/LiteralServiceAsyncClient.java b/typespec-tests/src/main/java/com/cadl/literalservice/LiteralServiceAsyncClient.java index d409bba8fa..7b7f0d2cf2 100644 --- a/typespec-tests/src/main/java/com/cadl/literalservice/LiteralServiceAsyncClient.java +++ b/typespec-tests/src/main/java/com/cadl/literalservice/LiteralServiceAsyncClient.java @@ -18,7 +18,7 @@ import com.azure.core.util.FluxUtil; import com.cadl.literalservice.implementation.LiteralOpsImpl; import com.cadl.literalservice.models.Model; -import com.cadl.literalservice.models.OptionalLiteralParam; +import com.cadl.literalservice.models.PutRequestOptionalLiteralParam; import reactor.core.publisher.Mono; /** @@ -96,7 +96,7 @@ public Mono> putWithResponse(BinaryData model, RequestOptio */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono put(Model model, OptionalLiteralParam optionalLiteralParam) { + public Mono put(Model model, PutRequestOptionalLiteralParam optionalLiteralParam) { // Generated convenience method for putWithResponse RequestOptions requestOptions = new RequestOptions(); if (optionalLiteralParam != null) { diff --git a/typespec-tests/src/main/java/com/cadl/literalservice/LiteralServiceClient.java b/typespec-tests/src/main/java/com/cadl/literalservice/LiteralServiceClient.java index 1536e39ca9..6234e31bf6 100644 --- a/typespec-tests/src/main/java/com/cadl/literalservice/LiteralServiceClient.java +++ b/typespec-tests/src/main/java/com/cadl/literalservice/LiteralServiceClient.java @@ -17,7 +17,7 @@ import com.azure.core.util.BinaryData; import com.cadl.literalservice.implementation.LiteralOpsImpl; import com.cadl.literalservice.models.Model; -import com.cadl.literalservice.models.OptionalLiteralParam; +import com.cadl.literalservice.models.PutRequestOptionalLiteralParam; /** * Initializes a new instance of the synchronous LiteralServiceClient type. @@ -94,7 +94,7 @@ public Response putWithResponse(BinaryData model, RequestOptions req */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Model put(Model model, OptionalLiteralParam optionalLiteralParam) { + public Model put(Model model, PutRequestOptionalLiteralParam optionalLiteralParam) { // Generated convenience method for putWithResponse RequestOptions requestOptions = new RequestOptions(); if (optionalLiteralParam != null) { diff --git a/typespec-tests/src/main/java/com/cadl/literalservice/models/Model.java b/typespec-tests/src/main/java/com/cadl/literalservice/models/Model.java index d37c9708b2..143157bf1a 100644 --- a/typespec-tests/src/main/java/com/cadl/literalservice/models/Model.java +++ b/typespec-tests/src/main/java/com/cadl/literalservice/models/Model.java @@ -27,7 +27,7 @@ public final class Model implements JsonSerializable { * The optionalLiteral property. */ @Generated - private ModelOptionalLiteral optionalLiteral; + private ModelOptionalLiteralOptionalLiteral optionalLiteral; /** * Creates an instance of Model class. @@ -52,7 +52,7 @@ public String getLiteral() { * @return the optionalLiteral value. */ @Generated - public ModelOptionalLiteral getOptionalLiteral() { + public ModelOptionalLiteralOptionalLiteral getOptionalLiteral() { return this.optionalLiteral; } @@ -63,7 +63,7 @@ public ModelOptionalLiteral getOptionalLiteral() { * @return the Model object itself. */ @Generated - public Model setOptionalLiteral(ModelOptionalLiteral optionalLiteral) { + public Model setOptionalLiteral(ModelOptionalLiteralOptionalLiteral optionalLiteral) { this.optionalLiteral = optionalLiteral; return this; } @@ -99,7 +99,8 @@ public static Model fromJson(JsonReader jsonReader) throws IOException { reader.nextToken(); if ("optionalLiteral".equals(fieldName)) { - deserializedModel.optionalLiteral = ModelOptionalLiteral.fromString(reader.getString()); + deserializedModel.optionalLiteral + = ModelOptionalLiteralOptionalLiteral.fromString(reader.getString()); } else { reader.skipChildren(); } diff --git a/typespec-tests/src/main/java/com/cadl/literalservice/models/ModelOptionalLiteral.java b/typespec-tests/src/main/java/com/cadl/literalservice/models/ModelOptionalLiteralOptionalLiteral.java similarity index 53% rename from typespec-tests/src/main/java/com/cadl/literalservice/models/ModelOptionalLiteral.java rename to typespec-tests/src/main/java/com/cadl/literalservice/models/ModelOptionalLiteralOptionalLiteral.java index d91cb650df..9804c262c8 100644 --- a/typespec-tests/src/main/java/com/cadl/literalservice/models/ModelOptionalLiteral.java +++ b/typespec-tests/src/main/java/com/cadl/literalservice/models/ModelOptionalLiteralOptionalLiteral.java @@ -5,35 +5,35 @@ package com.cadl.literalservice.models; /** - * Defines values for ModelOptionalLiteral. + * Defines values for ModelOptionalLiteralOptionalLiteral. */ -public enum ModelOptionalLiteral { +public enum ModelOptionalLiteralOptionalLiteral { /** * Enum value optionalLiteral. */ OPTIONAL_LITERAL("optionalLiteral"); /** - * The actual serialized value for a ModelOptionalLiteral instance. + * The actual serialized value for a ModelOptionalLiteralOptionalLiteral instance. */ private final String value; - ModelOptionalLiteral(String value) { + ModelOptionalLiteralOptionalLiteral(String value) { this.value = value; } /** - * Parses a serialized value to a ModelOptionalLiteral instance. + * Parses a serialized value to a ModelOptionalLiteralOptionalLiteral instance. * * @param value the serialized value to parse. - * @return the parsed ModelOptionalLiteral object, or null if unable to parse. + * @return the parsed ModelOptionalLiteralOptionalLiteral object, or null if unable to parse. */ - public static ModelOptionalLiteral fromString(String value) { + public static ModelOptionalLiteralOptionalLiteral fromString(String value) { if (value == null) { return null; } - ModelOptionalLiteral[] items = ModelOptionalLiteral.values(); - for (ModelOptionalLiteral item : items) { + ModelOptionalLiteralOptionalLiteral[] items = ModelOptionalLiteralOptionalLiteral.values(); + for (ModelOptionalLiteralOptionalLiteral item : items) { if (item.toString().equalsIgnoreCase(value)) { return item; } diff --git a/typespec-tests/src/main/java/com/cadl/literalservice/models/OptionalLiteralParam.java b/typespec-tests/src/main/java/com/cadl/literalservice/models/PutRequestOptionalLiteralParam.java similarity index 55% rename from typespec-tests/src/main/java/com/cadl/literalservice/models/OptionalLiteralParam.java rename to typespec-tests/src/main/java/com/cadl/literalservice/models/PutRequestOptionalLiteralParam.java index 18394b7469..f0141ba725 100644 --- a/typespec-tests/src/main/java/com/cadl/literalservice/models/OptionalLiteralParam.java +++ b/typespec-tests/src/main/java/com/cadl/literalservice/models/PutRequestOptionalLiteralParam.java @@ -5,35 +5,35 @@ package com.cadl.literalservice.models; /** - * Defines values for OptionalLiteralParam. + * Defines values for PutRequestOptionalLiteralParam. */ -public enum OptionalLiteralParam { +public enum PutRequestOptionalLiteralParam { /** * Enum value optionalLiteralParam. */ OPTIONAL_LITERAL_PARAM("optionalLiteralParam"); /** - * The actual serialized value for a OptionalLiteralParam instance. + * The actual serialized value for a PutRequestOptionalLiteralParam instance. */ private final String value; - OptionalLiteralParam(String value) { + PutRequestOptionalLiteralParam(String value) { this.value = value; } /** - * Parses a serialized value to a OptionalLiteralParam instance. + * Parses a serialized value to a PutRequestOptionalLiteralParam instance. * * @param value the serialized value to parse. - * @return the parsed OptionalLiteralParam object, or null if unable to parse. + * @return the parsed PutRequestOptionalLiteralParam object, or null if unable to parse. */ - public static OptionalLiteralParam fromString(String value) { + public static PutRequestOptionalLiteralParam fromString(String value) { if (value == null) { return null; } - OptionalLiteralParam[] items = OptionalLiteralParam.values(); - for (OptionalLiteralParam item : items) { + PutRequestOptionalLiteralParam[] items = PutRequestOptionalLiteralParam.values(); + for (PutRequestOptionalLiteralParam item : items) { if (item.toString().equalsIgnoreCase(value)) { return item; } diff --git a/typespec-tests/src/main/java/com/cadl/specialchars/SpecialCharsAsyncClient.java b/typespec-tests/src/main/java/com/cadl/specialchars/SpecialCharsAsyncClient.java index 2237bbc4a5..1020144144 100644 --- a/typespec-tests/src/main/java/com/cadl/specialchars/SpecialCharsAsyncClient.java +++ b/typespec-tests/src/main/java/com/cadl/specialchars/SpecialCharsAsyncClient.java @@ -61,7 +61,7 @@ public final class SpecialCharsAsyncClient { * } * } * - * @param request The request parameter. + * @param readRequest The readRequest 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. @@ -71,8 +71,8 @@ public final class SpecialCharsAsyncClient { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> readWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.readWithResponseAsync(request, requestOptions); + public Mono> readWithResponse(BinaryData readRequest, RequestOptions requestOptions) { + return this.serviceClient.readWithResponseAsync(readRequest, requestOptions); } /** @@ -92,9 +92,9 @@ public Mono> readWithResponse(BinaryData request, RequestOp public Mono read(String id) { // Generated convenience method for readWithResponse RequestOptions requestOptions = new RequestOptions(); - ReadRequest requestObj = new ReadRequest(id); - BinaryData request = BinaryData.fromObject(requestObj); - return readWithResponse(request, requestOptions).flatMap(FluxUtil::toMono) + ReadRequest readRequestObj = new ReadRequest(id); + BinaryData readRequest = BinaryData.fromObject(readRequestObj); + return readWithResponse(readRequest, requestOptions).flatMap(FluxUtil::toMono) .map(protocolMethodData -> protocolMethodData.toObject(Resource.class)); } } diff --git a/typespec-tests/src/main/java/com/cadl/specialchars/SpecialCharsClient.java b/typespec-tests/src/main/java/com/cadl/specialchars/SpecialCharsClient.java index be6cadb7dd..c04954982d 100644 --- a/typespec-tests/src/main/java/com/cadl/specialchars/SpecialCharsClient.java +++ b/typespec-tests/src/main/java/com/cadl/specialchars/SpecialCharsClient.java @@ -59,7 +59,7 @@ public final class SpecialCharsClient { * } * } * - * @param request The request parameter. + * @param readRequest The readRequest 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. @@ -69,8 +69,8 @@ public final class SpecialCharsClient { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response readWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.readWithResponse(request, requestOptions); + public Response readWithResponse(BinaryData readRequest, RequestOptions requestOptions) { + return this.serviceClient.readWithResponse(readRequest, requestOptions); } /** @@ -90,8 +90,8 @@ public Response readWithResponse(BinaryData request, RequestOptions public Resource read(String id) { // Generated convenience method for readWithResponse RequestOptions requestOptions = new RequestOptions(); - ReadRequest requestObj = new ReadRequest(id); - BinaryData request = BinaryData.fromObject(requestObj); - return readWithResponse(request, requestOptions).getValue().toObject(Resource.class); + ReadRequest readRequestObj = new ReadRequest(id); + BinaryData readRequest = BinaryData.fromObject(readRequestObj); + return readWithResponse(readRequest, requestOptions).getValue().toObject(Resource.class); } } diff --git a/typespec-tests/src/main/java/com/cadl/specialchars/implementation/BuiltinOpsImpl.java b/typespec-tests/src/main/java/com/cadl/specialchars/implementation/BuiltinOpsImpl.java index 00d9bcbe43..5392d88b0a 100644 --- a/typespec-tests/src/main/java/com/cadl/specialchars/implementation/BuiltinOpsImpl.java +++ b/typespec-tests/src/main/java/com/cadl/specialchars/implementation/BuiltinOpsImpl.java @@ -65,7 +65,7 @@ public interface BuiltinOpsService { @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> read(@HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData readRequest, RequestOptions requestOptions, Context context); @Post("/specialchars") @ExpectedResponses({ 200 }) @@ -74,7 +74,7 @@ Mono> read(@HostParam("endpoint") String endpoint, @HeaderP @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response readSync(@HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData readRequest, RequestOptions requestOptions, Context context); } /** @@ -99,7 +99,7 @@ Response readSync(@HostParam("endpoint") String endpoint, @HeaderPar * } * } * - * @param request The request parameter. + * @param readRequest The readRequest 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. @@ -108,10 +108,10 @@ Response readSync(@HostParam("endpoint") String endpoint, @HeaderPar * @return the response body along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> readWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> readWithResponseAsync(BinaryData readRequest, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil - .withContext(context -> service.read(this.client.getEndpoint(), accept, request, requestOptions, context)); + return FluxUtil.withContext( + context -> service.read(this.client.getEndpoint(), accept, readRequest, requestOptions, context)); } /** @@ -136,7 +136,7 @@ public Mono> readWithResponseAsync(BinaryData request, Requ * } * } * - * @param request The request parameter. + * @param readRequest The readRequest 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. @@ -145,8 +145,8 @@ public Mono> readWithResponseAsync(BinaryData request, Requ * @return the response body along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response readWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response readWithResponse(BinaryData readRequest, RequestOptions requestOptions) { final String accept = "application/json"; - return service.readSync(this.client.getEndpoint(), accept, request, requestOptions, Context.NONE); + return service.readSync(this.client.getEndpoint(), accept, readRequest, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/main/java/com/parameters/basic/ImplicitBodyAsyncClient.java b/typespec-tests/src/main/java/com/parameters/basic/ImplicitBodyAsyncClient.java index a18a3c43ab..f46dacbd4c 100644 --- a/typespec-tests/src/main/java/com/parameters/basic/ImplicitBodyAsyncClient.java +++ b/typespec-tests/src/main/java/com/parameters/basic/ImplicitBodyAsyncClient.java @@ -48,7 +48,7 @@ public final class ImplicitBodyAsyncClient { * } * } * - * @param request The request parameter. + * @param simpleRequest The simpleRequest 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. @@ -58,8 +58,8 @@ public final class ImplicitBodyAsyncClient { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> simpleWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.simpleWithResponseAsync(request, requestOptions); + public Mono> simpleWithResponse(BinaryData simpleRequest, RequestOptions requestOptions) { + return this.serviceClient.simpleWithResponseAsync(simpleRequest, requestOptions); } /** @@ -79,8 +79,8 @@ public Mono> simpleWithResponse(BinaryData request, RequestOption public Mono simple(String name) { // Generated convenience method for simpleWithResponse RequestOptions requestOptions = new RequestOptions(); - SimpleRequest requestObj = new SimpleRequest(name); - BinaryData request = BinaryData.fromObject(requestObj); - return simpleWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SimpleRequest simpleRequestObj = new SimpleRequest(name); + BinaryData simpleRequest = BinaryData.fromObject(simpleRequestObj); + return simpleWithResponse(simpleRequest, requestOptions).flatMap(FluxUtil::toMono); } } diff --git a/typespec-tests/src/main/java/com/parameters/basic/ImplicitBodyClient.java b/typespec-tests/src/main/java/com/parameters/basic/ImplicitBodyClient.java index 026a9fd3da..bb3c238c13 100644 --- a/typespec-tests/src/main/java/com/parameters/basic/ImplicitBodyClient.java +++ b/typespec-tests/src/main/java/com/parameters/basic/ImplicitBodyClient.java @@ -46,7 +46,7 @@ public final class ImplicitBodyClient { * } * } * - * @param request The request parameter. + * @param simpleRequest The simpleRequest 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. @@ -56,8 +56,8 @@ public final class ImplicitBodyClient { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response simpleWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.simpleWithResponse(request, requestOptions); + public Response simpleWithResponse(BinaryData simpleRequest, RequestOptions requestOptions) { + return this.serviceClient.simpleWithResponse(simpleRequest, requestOptions); } /** @@ -76,8 +76,8 @@ public Response simpleWithResponse(BinaryData request, RequestOptions requ public void simple(String name) { // Generated convenience method for simpleWithResponse RequestOptions requestOptions = new RequestOptions(); - SimpleRequest requestObj = new SimpleRequest(name); - BinaryData request = BinaryData.fromObject(requestObj); - simpleWithResponse(request, requestOptions).getValue(); + SimpleRequest simpleRequestObj = new SimpleRequest(name); + BinaryData simpleRequest = BinaryData.fromObject(simpleRequestObj); + simpleWithResponse(simpleRequest, requestOptions).getValue(); } } diff --git a/typespec-tests/src/main/java/com/parameters/basic/implementation/ImplicitBodiesImpl.java b/typespec-tests/src/main/java/com/parameters/basic/implementation/ImplicitBodiesImpl.java index 8d446782a6..e6488ff8c4 100644 --- a/typespec-tests/src/main/java/com/parameters/basic/implementation/ImplicitBodiesImpl.java +++ b/typespec-tests/src/main/java/com/parameters/basic/implementation/ImplicitBodiesImpl.java @@ -64,7 +64,7 @@ public interface ImplicitBodiesService { @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> simple(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData simpleRequest, RequestOptions requestOptions, Context context); @Put("/parameters/basic/implicit-body/simple") @ExpectedResponses({ 204 }) @@ -73,7 +73,7 @@ Mono> simple(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response simpleSync(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData simpleRequest, RequestOptions requestOptions, Context context); } /** @@ -86,7 +86,7 @@ Response simpleSync(@HeaderParam("accept") String accept, * } * } * - * @param request The request parameter. + * @param simpleRequest The simpleRequest 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. @@ -95,9 +95,9 @@ Response simpleSync(@HeaderParam("accept") String accept, * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> simpleWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> simpleWithResponseAsync(BinaryData simpleRequest, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.simple(accept, request, requestOptions, context)); + return FluxUtil.withContext(context -> service.simple(accept, simpleRequest, requestOptions, context)); } /** @@ -110,7 +110,7 @@ public Mono> simpleWithResponseAsync(BinaryData request, RequestO * } * } * - * @param request The request parameter. + * @param simpleRequest The simpleRequest 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. @@ -119,8 +119,8 @@ public Mono> simpleWithResponseAsync(BinaryData request, RequestO * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response simpleWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response simpleWithResponse(BinaryData simpleRequest, RequestOptions requestOptions) { final String accept = "application/json"; - return service.simpleSync(accept, request, requestOptions, Context.NONE); + return service.simpleSync(accept, simpleRequest, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/main/java/com/parameters/spread/AliasAsyncClient.java b/typespec-tests/src/main/java/com/parameters/spread/AliasAsyncClient.java index cda79335d6..3b6905e66c 100644 --- a/typespec-tests/src/main/java/com/parameters/spread/AliasAsyncClient.java +++ b/typespec-tests/src/main/java/com/parameters/spread/AliasAsyncClient.java @@ -51,7 +51,7 @@ public final class AliasAsyncClient { * } * } * - * @param request The request parameter. + * @param spreadAsRequestBodyRequest The spreadAsRequestBodyRequest 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. @@ -61,8 +61,9 @@ public final class AliasAsyncClient { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> spreadAsRequestBodyWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.spreadAsRequestBodyWithResponseAsync(request, requestOptions); + public Mono> spreadAsRequestBodyWithResponse(BinaryData spreadAsRequestBodyRequest, + RequestOptions requestOptions) { + return this.serviceClient.spreadAsRequestBodyWithResponseAsync(spreadAsRequestBodyRequest, requestOptions); } /** @@ -142,9 +143,9 @@ public Mono> spreadWithMultipleParametersWithResponse(String id, public Mono spreadAsRequestBody(String name) { // Generated convenience method for spreadAsRequestBodyWithResponse RequestOptions requestOptions = new RequestOptions(); - SpreadAsRequestBodyRequest requestObj = new SpreadAsRequestBodyRequest(name); - BinaryData request = BinaryData.fromObject(requestObj); - return spreadAsRequestBodyWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SpreadAsRequestBodyRequest spreadAsRequestBodyRequestObj = new SpreadAsRequestBodyRequest(name); + BinaryData spreadAsRequestBodyRequest = BinaryData.fromObject(spreadAsRequestBodyRequestObj); + return spreadAsRequestBodyWithResponse(spreadAsRequestBodyRequest, requestOptions).flatMap(FluxUtil::toMono); } /** diff --git a/typespec-tests/src/main/java/com/parameters/spread/AliasClient.java b/typespec-tests/src/main/java/com/parameters/spread/AliasClient.java index 79e59192e5..d163e2282d 100644 --- a/typespec-tests/src/main/java/com/parameters/spread/AliasClient.java +++ b/typespec-tests/src/main/java/com/parameters/spread/AliasClient.java @@ -49,7 +49,7 @@ public final class AliasClient { * } * } * - * @param request The request parameter. + * @param spreadAsRequestBodyRequest The spreadAsRequestBodyRequest 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. @@ -59,8 +59,9 @@ public final class AliasClient { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response spreadAsRequestBodyWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.spreadAsRequestBodyWithResponse(request, requestOptions); + public Response spreadAsRequestBodyWithResponse(BinaryData spreadAsRequestBodyRequest, + RequestOptions requestOptions) { + return this.serviceClient.spreadAsRequestBodyWithResponse(spreadAsRequestBodyRequest, requestOptions); } /** @@ -138,9 +139,9 @@ public Response spreadWithMultipleParametersWithResponse(String id, String public void spreadAsRequestBody(String name) { // Generated convenience method for spreadAsRequestBodyWithResponse RequestOptions requestOptions = new RequestOptions(); - SpreadAsRequestBodyRequest requestObj = new SpreadAsRequestBodyRequest(name); - BinaryData request = BinaryData.fromObject(requestObj); - spreadAsRequestBodyWithResponse(request, requestOptions).getValue(); + SpreadAsRequestBodyRequest spreadAsRequestBodyRequestObj = new SpreadAsRequestBodyRequest(name); + BinaryData spreadAsRequestBodyRequest = BinaryData.fromObject(spreadAsRequestBodyRequestObj); + spreadAsRequestBodyWithResponse(spreadAsRequestBodyRequest, requestOptions).getValue(); } /** diff --git a/typespec-tests/src/main/java/com/parameters/spread/implementation/AliasImpl.java b/typespec-tests/src/main/java/com/parameters/spread/implementation/AliasImpl.java index f42b4bc4e2..b991b74332 100644 --- a/typespec-tests/src/main/java/com/parameters/spread/implementation/AliasImpl.java +++ b/typespec-tests/src/main/java/com/parameters/spread/implementation/AliasImpl.java @@ -64,7 +64,8 @@ public interface AliasService { @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> spreadAsRequestBody(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData spreadAsRequestBodyRequest, RequestOptions requestOptions, + Context context); @Put("/parameters/spread/alias/request-body") @ExpectedResponses({ 204 }) @@ -73,7 +74,8 @@ Mono> spreadAsRequestBody(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response spreadAsRequestBodySync(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData spreadAsRequestBodyRequest, RequestOptions requestOptions, + Context context); @Put("/parameters/spread/alias/request-parameter/{id}") @ExpectedResponses({ 204 }) @@ -126,7 +128,7 @@ Response spreadWithMultipleParametersSync(@PathParam("id") String id, * } * } * - * @param request The request parameter. + * @param spreadAsRequestBodyRequest The spreadAsRequestBodyRequest 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. @@ -135,10 +137,11 @@ Response spreadWithMultipleParametersSync(@PathParam("id") String id, * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> spreadAsRequestBodyWithResponseAsync(BinaryData request, + public Mono> spreadAsRequestBodyWithResponseAsync(BinaryData spreadAsRequestBodyRequest, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.spreadAsRequestBody(accept, request, requestOptions, context)); + return FluxUtil.withContext( + context -> service.spreadAsRequestBody(accept, spreadAsRequestBodyRequest, requestOptions, context)); } /** @@ -151,7 +154,7 @@ public Mono> spreadAsRequestBodyWithResponseAsync(BinaryData requ * } * } * - * @param request The request parameter. + * @param spreadAsRequestBodyRequest The spreadAsRequestBodyRequest 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. @@ -160,9 +163,10 @@ public Mono> spreadAsRequestBodyWithResponseAsync(BinaryData requ * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response spreadAsRequestBodyWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response spreadAsRequestBodyWithResponse(BinaryData spreadAsRequestBodyRequest, + RequestOptions requestOptions) { final String accept = "application/json"; - return service.spreadAsRequestBodySync(accept, request, requestOptions, Context.NONE); + return service.spreadAsRequestBodySync(accept, spreadAsRequestBodyRequest, requestOptions, Context.NONE); } /** diff --git a/typespec-tests/src/main/java/com/type/property/optional/models/BooleanLiteralProperty.java b/typespec-tests/src/main/java/com/type/property/optional/models/BooleanLiteralProperty.java index 4d68c92ad1..77a88618b6 100644 --- a/typespec-tests/src/main/java/com/type/property/optional/models/BooleanLiteralProperty.java +++ b/typespec-tests/src/main/java/com/type/property/optional/models/BooleanLiteralProperty.java @@ -21,7 +21,7 @@ public final class BooleanLiteralProperty implements JsonSerializable> getWithResponse(RequestOptions requestOptions) * } * } * - * @param request The request parameter. + * @param sendRequest3 The sendRequest3 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. @@ -89,8 +89,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponseAsync(request, requestOptions); + public Mono> sendWithResponse(BinaryData sendRequest3, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponseAsync(sendRequest3, requestOptions); } /** @@ -129,8 +129,8 @@ public Mono get() { public Mono send(EnumsOnlyCases prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest6 requestObj = new SendRequest6(prop); - BinaryData request = BinaryData.fromObject(requestObj); - return sendWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SendRequest6 sendRequest3Obj = new SendRequest6(prop); + BinaryData sendRequest3 = BinaryData.fromObject(sendRequest3Obj); + return sendWithResponse(sendRequest3, requestOptions).flatMap(FluxUtil::toMono); } } diff --git a/typespec-tests/src/main/java/com/type/union/EnumsOnlyClient.java b/typespec-tests/src/main/java/com/type/union/EnumsOnlyClient.java index ffc03d9b49..769c874663 100644 --- a/typespec-tests/src/main/java/com/type/union/EnumsOnlyClient.java +++ b/typespec-tests/src/main/java/com/type/union/EnumsOnlyClient.java @@ -77,7 +77,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest3 The sendRequest3 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. @@ -87,8 +87,8 @@ public Response getWithResponse(RequestOptions requestOptions) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponse(request, requestOptions); + public Response sendWithResponse(BinaryData sendRequest3, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponse(sendRequest3, requestOptions); } /** @@ -125,8 +125,8 @@ public GetResponse3 get() { public void send(EnumsOnlyCases prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest6 requestObj = new SendRequest6(prop); - BinaryData request = BinaryData.fromObject(requestObj); - sendWithResponse(request, requestOptions).getValue(); + SendRequest6 sendRequest3Obj = new SendRequest6(prop); + BinaryData sendRequest3 = BinaryData.fromObject(sendRequest3Obj); + sendWithResponse(sendRequest3, requestOptions).getValue(); } } diff --git a/typespec-tests/src/main/java/com/type/union/FloatsOnlyAsyncClient.java b/typespec-tests/src/main/java/com/type/union/FloatsOnlyAsyncClient.java index 5591d11f38..36aded8ce8 100644 --- a/typespec-tests/src/main/java/com/type/union/FloatsOnlyAsyncClient.java +++ b/typespec-tests/src/main/java/com/type/union/FloatsOnlyAsyncClient.java @@ -73,7 +73,7 @@ public Mono> getWithResponse(RequestOptions requestOptions) * } * } * - * @param request The request parameter. + * @param sendRequest5 The sendRequest5 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. @@ -83,8 +83,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponseAsync(request, requestOptions); + public Mono> sendWithResponse(BinaryData sendRequest5, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponseAsync(sendRequest5, requestOptions); } /** @@ -123,8 +123,8 @@ public Mono get() { public Mono send(GetResponseProp1 prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest4 requestObj = new SendRequest4(prop); - BinaryData request = BinaryData.fromObject(requestObj); - return sendWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SendRequest4 sendRequest5Obj = new SendRequest4(prop); + BinaryData sendRequest5 = BinaryData.fromObject(sendRequest5Obj); + return sendWithResponse(sendRequest5, requestOptions).flatMap(FluxUtil::toMono); } } diff --git a/typespec-tests/src/main/java/com/type/union/FloatsOnlyClient.java b/typespec-tests/src/main/java/com/type/union/FloatsOnlyClient.java index abf22e4e49..89810763ef 100644 --- a/typespec-tests/src/main/java/com/type/union/FloatsOnlyClient.java +++ b/typespec-tests/src/main/java/com/type/union/FloatsOnlyClient.java @@ -71,7 +71,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest5 The sendRequest5 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. @@ -81,8 +81,8 @@ public Response getWithResponse(RequestOptions requestOptions) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponse(request, requestOptions); + public Response sendWithResponse(BinaryData sendRequest5, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponse(sendRequest5, requestOptions); } /** @@ -119,8 +119,8 @@ public GetResponse5 get() { public void send(GetResponseProp1 prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest4 requestObj = new SendRequest4(prop); - BinaryData request = BinaryData.fromObject(requestObj); - sendWithResponse(request, requestOptions).getValue(); + SendRequest4 sendRequest5Obj = new SendRequest4(prop); + BinaryData sendRequest5 = BinaryData.fromObject(sendRequest5Obj); + sendWithResponse(sendRequest5, requestOptions).getValue(); } } diff --git a/typespec-tests/src/main/java/com/type/union/IntsOnlyAsyncClient.java b/typespec-tests/src/main/java/com/type/union/IntsOnlyAsyncClient.java index 80009146b3..3962e61816 100644 --- a/typespec-tests/src/main/java/com/type/union/IntsOnlyAsyncClient.java +++ b/typespec-tests/src/main/java/com/type/union/IntsOnlyAsyncClient.java @@ -73,7 +73,7 @@ public Mono> getWithResponse(RequestOptions requestOptions) * } * } * - * @param request The request parameter. + * @param sendRequest6 The sendRequest6 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. @@ -83,8 +83,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponseAsync(request, requestOptions); + public Mono> sendWithResponse(BinaryData sendRequest6, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponseAsync(sendRequest6, requestOptions); } /** @@ -123,8 +123,8 @@ public Mono get() { public Mono send(GetResponseProp3 prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest3 requestObj = new SendRequest3(prop); - BinaryData request = BinaryData.fromObject(requestObj); - return sendWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SendRequest3 sendRequest6Obj = new SendRequest3(prop); + BinaryData sendRequest6 = BinaryData.fromObject(sendRequest6Obj); + return sendWithResponse(sendRequest6, requestOptions).flatMap(FluxUtil::toMono); } } diff --git a/typespec-tests/src/main/java/com/type/union/IntsOnlyClient.java b/typespec-tests/src/main/java/com/type/union/IntsOnlyClient.java index 3e871d63b1..6064495db7 100644 --- a/typespec-tests/src/main/java/com/type/union/IntsOnlyClient.java +++ b/typespec-tests/src/main/java/com/type/union/IntsOnlyClient.java @@ -71,7 +71,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest6 The sendRequest6 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. @@ -81,8 +81,8 @@ public Response getWithResponse(RequestOptions requestOptions) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponse(request, requestOptions); + public Response sendWithResponse(BinaryData sendRequest6, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponse(sendRequest6, requestOptions); } /** @@ -119,8 +119,8 @@ public GetResponse6 get() { public void send(GetResponseProp3 prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest3 requestObj = new SendRequest3(prop); - BinaryData request = BinaryData.fromObject(requestObj); - sendWithResponse(request, requestOptions).getValue(); + SendRequest3 sendRequest6Obj = new SendRequest3(prop); + BinaryData sendRequest6 = BinaryData.fromObject(sendRequest6Obj); + sendWithResponse(sendRequest6, requestOptions).getValue(); } } diff --git a/typespec-tests/src/main/java/com/type/union/MixedLiteralsAsyncClient.java b/typespec-tests/src/main/java/com/type/union/MixedLiteralsAsyncClient.java index 0c9a277204..7f0d86c52e 100644 --- a/typespec-tests/src/main/java/com/type/union/MixedLiteralsAsyncClient.java +++ b/typespec-tests/src/main/java/com/type/union/MixedLiteralsAsyncClient.java @@ -83,7 +83,7 @@ public Mono> getWithResponse(RequestOptions requestOptions) * } * } * - * @param request The request parameter. + * @param sendRequest1 The sendRequest1 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. @@ -93,8 +93,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponseAsync(request, requestOptions); + public Mono> sendWithResponse(BinaryData sendRequest1, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponseAsync(sendRequest1, requestOptions); } /** @@ -133,8 +133,8 @@ public Mono get() { public Mono send(MixedLiteralsCases prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest8 requestObj = new SendRequest8(prop); - BinaryData request = BinaryData.fromObject(requestObj); - return sendWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SendRequest8 sendRequest1Obj = new SendRequest8(prop); + BinaryData sendRequest1 = BinaryData.fromObject(sendRequest1Obj); + return sendWithResponse(sendRequest1, requestOptions).flatMap(FluxUtil::toMono); } } diff --git a/typespec-tests/src/main/java/com/type/union/MixedLiteralsClient.java b/typespec-tests/src/main/java/com/type/union/MixedLiteralsClient.java index 8cfb2f23c9..afbedea7b9 100644 --- a/typespec-tests/src/main/java/com/type/union/MixedLiteralsClient.java +++ b/typespec-tests/src/main/java/com/type/union/MixedLiteralsClient.java @@ -81,7 +81,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest1 The sendRequest1 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. @@ -91,8 +91,8 @@ public Response getWithResponse(RequestOptions requestOptions) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponse(request, requestOptions); + public Response sendWithResponse(BinaryData sendRequest1, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponse(sendRequest1, requestOptions); } /** @@ -129,8 +129,8 @@ public GetResponse1 get() { public void send(MixedLiteralsCases prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest8 requestObj = new SendRequest8(prop); - BinaryData request = BinaryData.fromObject(requestObj); - sendWithResponse(request, requestOptions).getValue(); + SendRequest8 sendRequest1Obj = new SendRequest8(prop); + BinaryData sendRequest1 = BinaryData.fromObject(sendRequest1Obj); + sendWithResponse(sendRequest1, requestOptions).getValue(); } } diff --git a/typespec-tests/src/main/java/com/type/union/MixedTypesAsyncClient.java b/typespec-tests/src/main/java/com/type/union/MixedTypesAsyncClient.java index 0924e3283e..b656c96c63 100644 --- a/typespec-tests/src/main/java/com/type/union/MixedTypesAsyncClient.java +++ b/typespec-tests/src/main/java/com/type/union/MixedTypesAsyncClient.java @@ -89,7 +89,7 @@ public Mono> getWithResponse(RequestOptions requestOptions) * } * } * - * @param request The request parameter. + * @param sendRequest The sendRequest 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. @@ -99,8 +99,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponseAsync(request, requestOptions); + public Mono> sendWithResponse(BinaryData sendRequest, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponseAsync(sendRequest, requestOptions); } /** @@ -139,8 +139,8 @@ public Mono get() { public Mono send(MixedTypesCases prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest9 requestObj = new SendRequest9(prop); - BinaryData request = BinaryData.fromObject(requestObj); - return sendWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SendRequest9 sendRequestObj = new SendRequest9(prop); + BinaryData sendRequest = BinaryData.fromObject(sendRequestObj); + return sendWithResponse(sendRequest, requestOptions).flatMap(FluxUtil::toMono); } } diff --git a/typespec-tests/src/main/java/com/type/union/MixedTypesClient.java b/typespec-tests/src/main/java/com/type/union/MixedTypesClient.java index 78a13623c2..a289ac1d2d 100644 --- a/typespec-tests/src/main/java/com/type/union/MixedTypesClient.java +++ b/typespec-tests/src/main/java/com/type/union/MixedTypesClient.java @@ -87,7 +87,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest The sendRequest 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. @@ -97,8 +97,8 @@ public Response getWithResponse(RequestOptions requestOptions) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponse(request, requestOptions); + public Response sendWithResponse(BinaryData sendRequest, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponse(sendRequest, requestOptions); } /** @@ -135,8 +135,8 @@ public GetResponse get() { public void send(MixedTypesCases prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest9 requestObj = new SendRequest9(prop); - BinaryData request = BinaryData.fromObject(requestObj); - sendWithResponse(request, requestOptions).getValue(); + SendRequest9 sendRequestObj = new SendRequest9(prop); + BinaryData sendRequest = BinaryData.fromObject(sendRequestObj); + sendWithResponse(sendRequest, requestOptions).getValue(); } } diff --git a/typespec-tests/src/main/java/com/type/union/ModelsOnlyAsyncClient.java b/typespec-tests/src/main/java/com/type/union/ModelsOnlyAsyncClient.java index cf61edbfa8..38bd977e66 100644 --- a/typespec-tests/src/main/java/com/type/union/ModelsOnlyAsyncClient.java +++ b/typespec-tests/src/main/java/com/type/union/ModelsOnlyAsyncClient.java @@ -72,7 +72,7 @@ public Mono> getWithResponse(RequestOptions requestOptions) * } * } * - * @param request The request parameter. + * @param sendRequest4 The sendRequest4 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. @@ -82,8 +82,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponseAsync(request, requestOptions); + public Mono> sendWithResponse(BinaryData sendRequest4, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponseAsync(sendRequest4, requestOptions); } /** @@ -122,8 +122,8 @@ public Mono get() { public Mono send(BinaryData prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest5 requestObj = new SendRequest5(prop); - BinaryData request = BinaryData.fromObject(requestObj); - return sendWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SendRequest5 sendRequest4Obj = new SendRequest5(prop); + BinaryData sendRequest4 = BinaryData.fromObject(sendRequest4Obj); + return sendWithResponse(sendRequest4, requestOptions).flatMap(FluxUtil::toMono); } } diff --git a/typespec-tests/src/main/java/com/type/union/ModelsOnlyClient.java b/typespec-tests/src/main/java/com/type/union/ModelsOnlyClient.java index 2dda70e791..127f6c388e 100644 --- a/typespec-tests/src/main/java/com/type/union/ModelsOnlyClient.java +++ b/typespec-tests/src/main/java/com/type/union/ModelsOnlyClient.java @@ -70,7 +70,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest4 The sendRequest4 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. @@ -80,8 +80,8 @@ public Response getWithResponse(RequestOptions requestOptions) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponse(request, requestOptions); + public Response sendWithResponse(BinaryData sendRequest4, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponse(sendRequest4, requestOptions); } /** @@ -118,8 +118,8 @@ public GetResponse4 get() { public void send(BinaryData prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest5 requestObj = new SendRequest5(prop); - BinaryData request = BinaryData.fromObject(requestObj); - sendWithResponse(request, requestOptions).getValue(); + SendRequest5 sendRequest4Obj = new SendRequest5(prop); + BinaryData sendRequest4 = BinaryData.fromObject(sendRequest4Obj); + sendWithResponse(sendRequest4, requestOptions).getValue(); } } diff --git a/typespec-tests/src/main/java/com/type/union/StringAndArrayAsyncClient.java b/typespec-tests/src/main/java/com/type/union/StringAndArrayAsyncClient.java index a599abd916..a014aafd67 100644 --- a/typespec-tests/src/main/java/com/type/union/StringAndArrayAsyncClient.java +++ b/typespec-tests/src/main/java/com/type/union/StringAndArrayAsyncClient.java @@ -79,7 +79,7 @@ public Mono> getWithResponse(RequestOptions requestOptions) * } * } * - * @param request The request parameter. + * @param sendRequest2 The sendRequest2 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. @@ -89,8 +89,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponseAsync(request, requestOptions); + public Mono> sendWithResponse(BinaryData sendRequest2, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponseAsync(sendRequest2, requestOptions); } /** @@ -129,8 +129,8 @@ public Mono get() { public Mono send(StringAndArrayCases prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest7 requestObj = new SendRequest7(prop); - BinaryData request = BinaryData.fromObject(requestObj); - return sendWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SendRequest7 sendRequest2Obj = new SendRequest7(prop); + BinaryData sendRequest2 = BinaryData.fromObject(sendRequest2Obj); + return sendWithResponse(sendRequest2, requestOptions).flatMap(FluxUtil::toMono); } } diff --git a/typespec-tests/src/main/java/com/type/union/StringAndArrayClient.java b/typespec-tests/src/main/java/com/type/union/StringAndArrayClient.java index fee9b5ea7a..73dce75b70 100644 --- a/typespec-tests/src/main/java/com/type/union/StringAndArrayClient.java +++ b/typespec-tests/src/main/java/com/type/union/StringAndArrayClient.java @@ -77,7 +77,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest2 The sendRequest2 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. @@ -87,8 +87,8 @@ public Response getWithResponse(RequestOptions requestOptions) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponse(request, requestOptions); + public Response sendWithResponse(BinaryData sendRequest2, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponse(sendRequest2, requestOptions); } /** @@ -125,8 +125,8 @@ public GetResponse2 get() { public void send(StringAndArrayCases prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest7 requestObj = new SendRequest7(prop); - BinaryData request = BinaryData.fromObject(requestObj); - sendWithResponse(request, requestOptions).getValue(); + SendRequest7 sendRequest2Obj = new SendRequest7(prop); + BinaryData sendRequest2 = BinaryData.fromObject(sendRequest2Obj); + sendWithResponse(sendRequest2, requestOptions).getValue(); } } diff --git a/typespec-tests/src/main/java/com/type/union/StringExtensibleAsyncClient.java b/typespec-tests/src/main/java/com/type/union/StringExtensibleAsyncClient.java index f275ce8db5..e55a9a2338 100644 --- a/typespec-tests/src/main/java/com/type/union/StringExtensibleAsyncClient.java +++ b/typespec-tests/src/main/java/com/type/union/StringExtensibleAsyncClient.java @@ -73,7 +73,7 @@ public Mono> getWithResponse(RequestOptions requestOptions) * } * } * - * @param request The request parameter. + * @param sendRequest8 The sendRequest8 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. @@ -83,8 +83,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponseAsync(request, requestOptions); + public Mono> sendWithResponse(BinaryData sendRequest8, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponseAsync(sendRequest8, requestOptions); } /** @@ -123,8 +123,8 @@ public Mono get() { public Mono send(GetResponseProp4 prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest1 requestObj = new SendRequest1(prop); - BinaryData request = BinaryData.fromObject(requestObj); - return sendWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SendRequest1 sendRequest8Obj = new SendRequest1(prop); + BinaryData sendRequest8 = BinaryData.fromObject(sendRequest8Obj); + return sendWithResponse(sendRequest8, requestOptions).flatMap(FluxUtil::toMono); } } diff --git a/typespec-tests/src/main/java/com/type/union/StringExtensibleClient.java b/typespec-tests/src/main/java/com/type/union/StringExtensibleClient.java index d8141d02b6..54d118dbc9 100644 --- a/typespec-tests/src/main/java/com/type/union/StringExtensibleClient.java +++ b/typespec-tests/src/main/java/com/type/union/StringExtensibleClient.java @@ -71,7 +71,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest8 The sendRequest8 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. @@ -81,8 +81,8 @@ public Response getWithResponse(RequestOptions requestOptions) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponse(request, requestOptions); + public Response sendWithResponse(BinaryData sendRequest8, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponse(sendRequest8, requestOptions); } /** @@ -119,8 +119,8 @@ public GetResponse8 get() { public void send(GetResponseProp4 prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest1 requestObj = new SendRequest1(prop); - BinaryData request = BinaryData.fromObject(requestObj); - sendWithResponse(request, requestOptions).getValue(); + SendRequest1 sendRequest8Obj = new SendRequest1(prop); + BinaryData sendRequest8 = BinaryData.fromObject(sendRequest8Obj); + sendWithResponse(sendRequest8, requestOptions).getValue(); } } diff --git a/typespec-tests/src/main/java/com/type/union/StringExtensibleNamedAsyncClient.java b/typespec-tests/src/main/java/com/type/union/StringExtensibleNamedAsyncClient.java index b14411bbc3..99f53508a1 100644 --- a/typespec-tests/src/main/java/com/type/union/StringExtensibleNamedAsyncClient.java +++ b/typespec-tests/src/main/java/com/type/union/StringExtensibleNamedAsyncClient.java @@ -73,7 +73,7 @@ public Mono> getWithResponse(RequestOptions requestOptions) * } * } * - * @param request The request parameter. + * @param sendRequest7 The sendRequest7 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. @@ -83,8 +83,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponseAsync(request, requestOptions); + public Mono> sendWithResponse(BinaryData sendRequest7, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponseAsync(sendRequest7, requestOptions); } /** @@ -123,8 +123,8 @@ public Mono get() { public Mono send(StringExtensibleNamedUnion prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest2 requestObj = new SendRequest2(prop); - BinaryData request = BinaryData.fromObject(requestObj); - return sendWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SendRequest2 sendRequest7Obj = new SendRequest2(prop); + BinaryData sendRequest7 = BinaryData.fromObject(sendRequest7Obj); + return sendWithResponse(sendRequest7, requestOptions).flatMap(FluxUtil::toMono); } } diff --git a/typespec-tests/src/main/java/com/type/union/StringExtensibleNamedClient.java b/typespec-tests/src/main/java/com/type/union/StringExtensibleNamedClient.java index 203f162297..1f46812f08 100644 --- a/typespec-tests/src/main/java/com/type/union/StringExtensibleNamedClient.java +++ b/typespec-tests/src/main/java/com/type/union/StringExtensibleNamedClient.java @@ -71,7 +71,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest7 The sendRequest7 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. @@ -81,8 +81,8 @@ public Response getWithResponse(RequestOptions requestOptions) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponse(request, requestOptions); + public Response sendWithResponse(BinaryData sendRequest7, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponse(sendRequest7, requestOptions); } /** @@ -119,8 +119,8 @@ public GetResponse7 get() { public void send(StringExtensibleNamedUnion prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest2 requestObj = new SendRequest2(prop); - BinaryData request = BinaryData.fromObject(requestObj); - sendWithResponse(request, requestOptions).getValue(); + SendRequest2 sendRequest7Obj = new SendRequest2(prop); + BinaryData sendRequest7 = BinaryData.fromObject(sendRequest7Obj); + sendWithResponse(sendRequest7, requestOptions).getValue(); } } diff --git a/typespec-tests/src/main/java/com/type/union/StringsOnlyAsyncClient.java b/typespec-tests/src/main/java/com/type/union/StringsOnlyAsyncClient.java index 77239b656a..c4a12f6ab2 100644 --- a/typespec-tests/src/main/java/com/type/union/StringsOnlyAsyncClient.java +++ b/typespec-tests/src/main/java/com/type/union/StringsOnlyAsyncClient.java @@ -73,7 +73,7 @@ public Mono> getWithResponse(RequestOptions requestOptions) * } * } * - * @param request The request parameter. + * @param sendRequest9 The sendRequest9 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. @@ -83,8 +83,8 @@ public Mono> getWithResponse(RequestOptions requestOptions) */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponseAsync(request, requestOptions); + public Mono> sendWithResponse(BinaryData sendRequest9, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponseAsync(sendRequest9, requestOptions); } /** @@ -123,8 +123,8 @@ public Mono get() { public Mono send(GetResponseProp5 prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest requestObj = new SendRequest(prop); - BinaryData request = BinaryData.fromObject(requestObj); - return sendWithResponse(request, requestOptions).flatMap(FluxUtil::toMono); + SendRequest sendRequest9Obj = new SendRequest(prop); + BinaryData sendRequest9 = BinaryData.fromObject(sendRequest9Obj); + return sendWithResponse(sendRequest9, requestOptions).flatMap(FluxUtil::toMono); } } diff --git a/typespec-tests/src/main/java/com/type/union/StringsOnlyClient.java b/typespec-tests/src/main/java/com/type/union/StringsOnlyClient.java index ef893a18aa..945b27e5c7 100644 --- a/typespec-tests/src/main/java/com/type/union/StringsOnlyClient.java +++ b/typespec-tests/src/main/java/com/type/union/StringsOnlyClient.java @@ -71,7 +71,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest9 The sendRequest9 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. @@ -81,8 +81,8 @@ public Response getWithResponse(RequestOptions requestOptions) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { - return this.serviceClient.sendWithResponse(request, requestOptions); + public Response sendWithResponse(BinaryData sendRequest9, RequestOptions requestOptions) { + return this.serviceClient.sendWithResponse(sendRequest9, requestOptions); } /** @@ -119,8 +119,8 @@ public GetResponse9 get() { public void send(GetResponseProp5 prop) { // Generated convenience method for sendWithResponse RequestOptions requestOptions = new RequestOptions(); - SendRequest requestObj = new SendRequest(prop); - BinaryData request = BinaryData.fromObject(requestObj); - sendWithResponse(request, requestOptions).getValue(); + SendRequest sendRequest9Obj = new SendRequest(prop); + BinaryData sendRequest9 = BinaryData.fromObject(sendRequest9Obj); + sendWithResponse(sendRequest9, requestOptions).getValue(); } } diff --git a/typespec-tests/src/main/java/com/type/union/implementation/EnumsOnliesImpl.java b/typespec-tests/src/main/java/com/type/union/implementation/EnumsOnliesImpl.java index d4b9472b43..1e77334931 100644 --- a/typespec-tests/src/main/java/com/type/union/implementation/EnumsOnliesImpl.java +++ b/typespec-tests/src/main/java/com/type/union/implementation/EnumsOnliesImpl.java @@ -83,7 +83,7 @@ Response getSync(@HeaderParam("accept") String accept, RequestOption @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> send(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData sendRequest3, RequestOptions requestOptions, Context context); @Post("/type/union/enums-only") @ExpectedResponses({ 204 }) @@ -91,8 +91,8 @@ Mono> send(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sendSync(@HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData request, - RequestOptions requestOptions, Context context); + Response sendSync(@HeaderParam("accept") String accept, + @BodyParam("application/json") BinaryData sendRequest3, RequestOptions requestOptions, Context context); } /** @@ -160,7 +160,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest3 The sendRequest3 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. @@ -169,9 +169,9 @@ public Response getWithResponse(RequestOptions requestOptions) { * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> sendWithResponseAsync(BinaryData sendRequest3, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.send(accept, request, requestOptions, context)); + return FluxUtil.withContext(context -> service.send(accept, sendRequest3, requestOptions, context)); } /** @@ -187,7 +187,7 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * } * } * - * @param request The request parameter. + * @param sendRequest3 The sendRequest3 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. @@ -196,8 +196,8 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response sendWithResponse(BinaryData sendRequest3, RequestOptions requestOptions) { final String accept = "application/json"; - return service.sendSync(accept, request, requestOptions, Context.NONE); + return service.sendSync(accept, sendRequest3, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/main/java/com/type/union/implementation/FloatsOnliesImpl.java b/typespec-tests/src/main/java/com/type/union/implementation/FloatsOnliesImpl.java index 73d6685dcb..0d38239585 100644 --- a/typespec-tests/src/main/java/com/type/union/implementation/FloatsOnliesImpl.java +++ b/typespec-tests/src/main/java/com/type/union/implementation/FloatsOnliesImpl.java @@ -83,7 +83,7 @@ Response getSync(@HeaderParam("accept") String accept, RequestOption @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> send(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData sendRequest5, RequestOptions requestOptions, Context context); @Post("/type/union/floats-only") @ExpectedResponses({ 204 }) @@ -91,8 +91,8 @@ Mono> send(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sendSync(@HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData request, - RequestOptions requestOptions, Context context); + Response sendSync(@HeaderParam("accept") String accept, + @BodyParam("application/json") BinaryData sendRequest5, RequestOptions requestOptions, Context context); } /** @@ -151,7 +151,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest5 The sendRequest5 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. @@ -160,9 +160,9 @@ public Response getWithResponse(RequestOptions requestOptions) { * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> sendWithResponseAsync(BinaryData sendRequest5, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.send(accept, request, requestOptions, context)); + return FluxUtil.withContext(context -> service.send(accept, sendRequest5, requestOptions, context)); } /** @@ -175,7 +175,7 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * } * } * - * @param request The request parameter. + * @param sendRequest5 The sendRequest5 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. @@ -184,8 +184,8 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response sendWithResponse(BinaryData sendRequest5, RequestOptions requestOptions) { final String accept = "application/json"; - return service.sendSync(accept, request, requestOptions, Context.NONE); + return service.sendSync(accept, sendRequest5, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/main/java/com/type/union/implementation/IntsOnliesImpl.java b/typespec-tests/src/main/java/com/type/union/implementation/IntsOnliesImpl.java index 6aef63ed02..a83f054fc6 100644 --- a/typespec-tests/src/main/java/com/type/union/implementation/IntsOnliesImpl.java +++ b/typespec-tests/src/main/java/com/type/union/implementation/IntsOnliesImpl.java @@ -83,7 +83,7 @@ Response getSync(@HeaderParam("accept") String accept, RequestOption @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> send(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData sendRequest6, RequestOptions requestOptions, Context context); @Post("/type/union/ints-only") @ExpectedResponses({ 204 }) @@ -91,8 +91,8 @@ Mono> send(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sendSync(@HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData request, - RequestOptions requestOptions, Context context); + Response sendSync(@HeaderParam("accept") String accept, + @BodyParam("application/json") BinaryData sendRequest6, RequestOptions requestOptions, Context context); } /** @@ -151,7 +151,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest6 The sendRequest6 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. @@ -160,9 +160,9 @@ public Response getWithResponse(RequestOptions requestOptions) { * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> sendWithResponseAsync(BinaryData sendRequest6, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.send(accept, request, requestOptions, context)); + return FluxUtil.withContext(context -> service.send(accept, sendRequest6, requestOptions, context)); } /** @@ -175,7 +175,7 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * } * } * - * @param request The request parameter. + * @param sendRequest6 The sendRequest6 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. @@ -184,8 +184,8 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response sendWithResponse(BinaryData sendRequest6, RequestOptions requestOptions) { final String accept = "application/json"; - return service.sendSync(accept, request, requestOptions, Context.NONE); + return service.sendSync(accept, sendRequest6, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/main/java/com/type/union/implementation/MixedLiteralsImpl.java b/typespec-tests/src/main/java/com/type/union/implementation/MixedLiteralsImpl.java index 66d6a86dc0..0009929c23 100644 --- a/typespec-tests/src/main/java/com/type/union/implementation/MixedLiteralsImpl.java +++ b/typespec-tests/src/main/java/com/type/union/implementation/MixedLiteralsImpl.java @@ -83,7 +83,7 @@ Response getSync(@HeaderParam("accept") String accept, RequestOption @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> send(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData sendRequest1, RequestOptions requestOptions, Context context); @Post("/type/union/mixed-literals") @ExpectedResponses({ 204 }) @@ -91,8 +91,8 @@ Mono> send(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sendSync(@HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData request, - RequestOptions requestOptions, Context context); + Response sendSync(@HeaderParam("accept") String accept, + @BodyParam("application/json") BinaryData sendRequest1, RequestOptions requestOptions, Context context); } /** @@ -166,7 +166,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest1 The sendRequest1 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. @@ -175,9 +175,9 @@ public Response getWithResponse(RequestOptions requestOptions) { * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> sendWithResponseAsync(BinaryData sendRequest1, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.send(accept, request, requestOptions, context)); + return FluxUtil.withContext(context -> service.send(accept, sendRequest1, requestOptions, context)); } /** @@ -195,7 +195,7 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * } * } * - * @param request The request parameter. + * @param sendRequest1 The sendRequest1 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. @@ -204,8 +204,8 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response sendWithResponse(BinaryData sendRequest1, RequestOptions requestOptions) { final String accept = "application/json"; - return service.sendSync(accept, request, requestOptions, Context.NONE); + return service.sendSync(accept, sendRequest1, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/main/java/com/type/union/implementation/MixedTypesImpl.java b/typespec-tests/src/main/java/com/type/union/implementation/MixedTypesImpl.java index c3092c8e3d..cfa98f8b9f 100644 --- a/typespec-tests/src/main/java/com/type/union/implementation/MixedTypesImpl.java +++ b/typespec-tests/src/main/java/com/type/union/implementation/MixedTypesImpl.java @@ -83,7 +83,7 @@ Response getSync(@HeaderParam("accept") String accept, RequestOption @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> send(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData sendRequest, RequestOptions requestOptions, Context context); @Post("/type/union/mixed-types") @ExpectedResponses({ 204 }) @@ -91,8 +91,8 @@ Mono> send(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sendSync(@HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData request, - RequestOptions requestOptions, Context context); + Response sendSync(@HeaderParam("accept") String accept, + @BodyParam("application/json") BinaryData sendRequest, RequestOptions requestOptions, Context context); } /** @@ -175,7 +175,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest The sendRequest 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. @@ -184,9 +184,9 @@ public Response getWithResponse(RequestOptions requestOptions) { * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> sendWithResponseAsync(BinaryData sendRequest, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.send(accept, request, requestOptions, context)); + return FluxUtil.withContext(context -> service.send(accept, sendRequest, requestOptions, context)); } /** @@ -207,7 +207,7 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * } * } * - * @param request The request parameter. + * @param sendRequest The sendRequest 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. @@ -216,8 +216,8 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response sendWithResponse(BinaryData sendRequest, RequestOptions requestOptions) { final String accept = "application/json"; - return service.sendSync(accept, request, requestOptions, Context.NONE); + return service.sendSync(accept, sendRequest, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/main/java/com/type/union/implementation/ModelsOnliesImpl.java b/typespec-tests/src/main/java/com/type/union/implementation/ModelsOnliesImpl.java index a60b627807..b4e16f01c6 100644 --- a/typespec-tests/src/main/java/com/type/union/implementation/ModelsOnliesImpl.java +++ b/typespec-tests/src/main/java/com/type/union/implementation/ModelsOnliesImpl.java @@ -83,7 +83,7 @@ Response getSync(@HeaderParam("accept") String accept, RequestOption @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> send(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData sendRequest4, RequestOptions requestOptions, Context context); @Post("/type/union/models-only") @ExpectedResponses({ 204 }) @@ -91,8 +91,8 @@ Mono> send(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sendSync(@HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData request, - RequestOptions requestOptions, Context context); + Response sendSync(@HeaderParam("accept") String accept, + @BodyParam("application/json") BinaryData sendRequest4, RequestOptions requestOptions, Context context); } /** @@ -151,7 +151,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest4 The sendRequest4 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. @@ -160,9 +160,9 @@ public Response getWithResponse(RequestOptions requestOptions) { * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> sendWithResponseAsync(BinaryData sendRequest4, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.send(accept, request, requestOptions, context)); + return FluxUtil.withContext(context -> service.send(accept, sendRequest4, requestOptions, context)); } /** @@ -175,7 +175,7 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * } * } * - * @param request The request parameter. + * @param sendRequest4 The sendRequest4 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. @@ -184,8 +184,8 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response sendWithResponse(BinaryData sendRequest4, RequestOptions requestOptions) { final String accept = "application/json"; - return service.sendSync(accept, request, requestOptions, Context.NONE); + return service.sendSync(accept, sendRequest4, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/main/java/com/type/union/implementation/StringAndArraysImpl.java b/typespec-tests/src/main/java/com/type/union/implementation/StringAndArraysImpl.java index 338204c4a5..82db1f931b 100644 --- a/typespec-tests/src/main/java/com/type/union/implementation/StringAndArraysImpl.java +++ b/typespec-tests/src/main/java/com/type/union/implementation/StringAndArraysImpl.java @@ -83,7 +83,7 @@ Response getSync(@HeaderParam("accept") String accept, RequestOption @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> send(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData sendRequest2, RequestOptions requestOptions, Context context); @Post("/type/union/string-and-array") @ExpectedResponses({ 204 }) @@ -91,8 +91,8 @@ Mono> send(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sendSync(@HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData request, - RequestOptions requestOptions, Context context); + Response sendSync(@HeaderParam("accept") String accept, + @BodyParam("application/json") BinaryData sendRequest2, RequestOptions requestOptions, Context context); } /** @@ -160,7 +160,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest2 The sendRequest2 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. @@ -169,9 +169,9 @@ public Response getWithResponse(RequestOptions requestOptions) { * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> sendWithResponseAsync(BinaryData sendRequest2, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.send(accept, request, requestOptions, context)); + return FluxUtil.withContext(context -> service.send(accept, sendRequest2, requestOptions, context)); } /** @@ -187,7 +187,7 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * } * } * - * @param request The request parameter. + * @param sendRequest2 The sendRequest2 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. @@ -196,8 +196,8 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response sendWithResponse(BinaryData sendRequest2, RequestOptions requestOptions) { final String accept = "application/json"; - return service.sendSync(accept, request, requestOptions, Context.NONE); + return service.sendSync(accept, sendRequest2, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/main/java/com/type/union/implementation/StringExtensibleNamedsImpl.java b/typespec-tests/src/main/java/com/type/union/implementation/StringExtensibleNamedsImpl.java index 311cadf42b..8066f73f79 100644 --- a/typespec-tests/src/main/java/com/type/union/implementation/StringExtensibleNamedsImpl.java +++ b/typespec-tests/src/main/java/com/type/union/implementation/StringExtensibleNamedsImpl.java @@ -83,7 +83,7 @@ Response getSync(@HeaderParam("accept") String accept, RequestOption @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> send(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData sendRequest7, RequestOptions requestOptions, Context context); @Post("/type/union/string-extensible-named") @ExpectedResponses({ 204 }) @@ -91,8 +91,8 @@ Mono> send(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sendSync(@HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData request, - RequestOptions requestOptions, Context context); + Response sendSync(@HeaderParam("accept") String accept, + @BodyParam("application/json") BinaryData sendRequest7, RequestOptions requestOptions, Context context); } /** @@ -151,7 +151,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest7 The sendRequest7 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. @@ -160,9 +160,9 @@ public Response getWithResponse(RequestOptions requestOptions) { * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> sendWithResponseAsync(BinaryData sendRequest7, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.send(accept, request, requestOptions, context)); + return FluxUtil.withContext(context -> service.send(accept, sendRequest7, requestOptions, context)); } /** @@ -175,7 +175,7 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * } * } * - * @param request The request parameter. + * @param sendRequest7 The sendRequest7 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. @@ -184,8 +184,8 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response sendWithResponse(BinaryData sendRequest7, RequestOptions requestOptions) { final String accept = "application/json"; - return service.sendSync(accept, request, requestOptions, Context.NONE); + return service.sendSync(accept, sendRequest7, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/main/java/com/type/union/implementation/StringExtensiblesImpl.java b/typespec-tests/src/main/java/com/type/union/implementation/StringExtensiblesImpl.java index 61a65df8c9..ed83e7409a 100644 --- a/typespec-tests/src/main/java/com/type/union/implementation/StringExtensiblesImpl.java +++ b/typespec-tests/src/main/java/com/type/union/implementation/StringExtensiblesImpl.java @@ -83,7 +83,7 @@ Response getSync(@HeaderParam("accept") String accept, RequestOption @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> send(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData sendRequest8, RequestOptions requestOptions, Context context); @Post("/type/union/string-extensible") @ExpectedResponses({ 204 }) @@ -91,8 +91,8 @@ Mono> send(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sendSync(@HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData request, - RequestOptions requestOptions, Context context); + Response sendSync(@HeaderParam("accept") String accept, + @BodyParam("application/json") BinaryData sendRequest8, RequestOptions requestOptions, Context context); } /** @@ -151,7 +151,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest8 The sendRequest8 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. @@ -160,9 +160,9 @@ public Response getWithResponse(RequestOptions requestOptions) { * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> sendWithResponseAsync(BinaryData sendRequest8, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.send(accept, request, requestOptions, context)); + return FluxUtil.withContext(context -> service.send(accept, sendRequest8, requestOptions, context)); } /** @@ -175,7 +175,7 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * } * } * - * @param request The request parameter. + * @param sendRequest8 The sendRequest8 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. @@ -184,8 +184,8 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response sendWithResponse(BinaryData sendRequest8, RequestOptions requestOptions) { final String accept = "application/json"; - return service.sendSync(accept, request, requestOptions, Context.NONE); + return service.sendSync(accept, sendRequest8, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/main/java/com/type/union/implementation/StringsOnliesImpl.java b/typespec-tests/src/main/java/com/type/union/implementation/StringsOnliesImpl.java index 49a7d88c54..58d503544e 100644 --- a/typespec-tests/src/main/java/com/type/union/implementation/StringsOnliesImpl.java +++ b/typespec-tests/src/main/java/com/type/union/implementation/StringsOnliesImpl.java @@ -83,7 +83,7 @@ Response getSync(@HeaderParam("accept") String accept, RequestOption @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> send(@HeaderParam("accept") String accept, - @BodyParam("application/json") BinaryData request, RequestOptions requestOptions, Context context); + @BodyParam("application/json") BinaryData sendRequest9, RequestOptions requestOptions, Context context); @Post("/type/union/strings-only") @ExpectedResponses({ 204 }) @@ -91,8 +91,8 @@ Mono> send(@HeaderParam("accept") String accept, @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sendSync(@HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData request, - RequestOptions requestOptions, Context context); + Response sendSync(@HeaderParam("accept") String accept, + @BodyParam("application/json") BinaryData sendRequest9, RequestOptions requestOptions, Context context); } /** @@ -151,7 +151,7 @@ public Response getWithResponse(RequestOptions requestOptions) { * } * } * - * @param request The request parameter. + * @param sendRequest9 The sendRequest9 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. @@ -160,9 +160,9 @@ public Response getWithResponse(RequestOptions requestOptions) { * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> sendWithResponseAsync(BinaryData request, RequestOptions requestOptions) { + public Mono> sendWithResponseAsync(BinaryData sendRequest9, RequestOptions requestOptions) { final String accept = "application/json"; - return FluxUtil.withContext(context -> service.send(accept, request, requestOptions, context)); + return FluxUtil.withContext(context -> service.send(accept, sendRequest9, requestOptions, context)); } /** @@ -175,7 +175,7 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * } * } * - * @param request The request parameter. + * @param sendRequest9 The sendRequest9 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. @@ -184,8 +184,8 @@ public Mono> sendWithResponseAsync(BinaryData request, RequestOpt * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response sendWithResponse(BinaryData request, RequestOptions requestOptions) { + public Response sendWithResponse(BinaryData sendRequest9, RequestOptions requestOptions) { final String accept = "application/json"; - return service.sendSync(accept, request, requestOptions, Context.NONE); + return service.sendSync(accept, sendRequest9, requestOptions, Context.NONE); } } diff --git a/typespec-tests/src/test/java/com/type/property/optional/BooleanLiteralClientTests.java b/typespec-tests/src/test/java/com/type/property/optional/BooleanLiteralClientTests.java index 321bf6718a..b640851aeb 100644 --- a/typespec-tests/src/test/java/com/type/property/optional/BooleanLiteralClientTests.java +++ b/typespec-tests/src/test/java/com/type/property/optional/BooleanLiteralClientTests.java @@ -4,7 +4,7 @@ package com.type.property.optional; import com.type.property.optional.models.BooleanLiteralProperty; -import com.type.property.optional.models.BooleanLiteralPropertyProperty; +import com.type.property.optional.models.BooleanLiteralPropertyPropertyTrue; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ public class BooleanLiteralClientTests { @Test public void getAll() { BooleanLiteralProperty booleanLiteralProperty = client.getAll(); - Assertions.assertEquals(BooleanLiteralPropertyProperty.TRUE, booleanLiteralProperty.getProperty()); + Assertions.assertEquals(BooleanLiteralPropertyPropertyTrue.TRUE, booleanLiteralProperty.getProperty()); } @Test @@ -26,7 +26,7 @@ public void getDefault() { @Test public void putAll() { BooleanLiteralProperty booleanLiteralProperty = new BooleanLiteralProperty(); - booleanLiteralProperty.setProperty(BooleanLiteralPropertyProperty.TRUE); + booleanLiteralProperty.setProperty(BooleanLiteralPropertyPropertyTrue.TRUE); client.putAll(booleanLiteralProperty); } diff --git a/typespec-tests/src/test/java/com/type/property/optional/FloatLiteralClientTests.java b/typespec-tests/src/test/java/com/type/property/optional/FloatLiteralClientTests.java index 32d620364b..4b8fe74f15 100644 --- a/typespec-tests/src/test/java/com/type/property/optional/FloatLiteralClientTests.java +++ b/typespec-tests/src/test/java/com/type/property/optional/FloatLiteralClientTests.java @@ -4,7 +4,7 @@ package com.type.property.optional; import com.type.property.optional.models.FloatLiteralProperty; -import com.type.property.optional.models.FloatLiteralPropertyProperty; +import com.type.property.optional.models.FloatLiteralPropertyProperty125; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ public class FloatLiteralClientTests { @Test public void getAll() { FloatLiteralProperty floatLiteralProperty = client.getAll(); - Assertions.assertEquals(FloatLiteralPropertyProperty.ONE_TWO_FIVE, floatLiteralProperty.getProperty()); + Assertions.assertEquals(FloatLiteralPropertyProperty125.ONE_TWO_FIVE, floatLiteralProperty.getProperty()); } @Test @@ -26,7 +26,7 @@ public void getDefault() { @Test public void putAll() { FloatLiteralProperty floatLiteralProperty = new FloatLiteralProperty(); - floatLiteralProperty.setProperty(FloatLiteralPropertyProperty.ONE_TWO_FIVE); + floatLiteralProperty.setProperty(FloatLiteralPropertyProperty125.ONE_TWO_FIVE); client.putAll(floatLiteralProperty); } diff --git a/typespec-tests/src/test/java/com/type/property/optional/IntLiteralClientTests.java b/typespec-tests/src/test/java/com/type/property/optional/IntLiteralClientTests.java index 20ed9f3195..fa3fb55929 100644 --- a/typespec-tests/src/test/java/com/type/property/optional/IntLiteralClientTests.java +++ b/typespec-tests/src/test/java/com/type/property/optional/IntLiteralClientTests.java @@ -4,7 +4,7 @@ package com.type.property.optional; import com.type.property.optional.models.IntLiteralProperty; -import com.type.property.optional.models.IntLiteralPropertyProperty; +import com.type.property.optional.models.IntLiteralPropertyProperty1; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ public class IntLiteralClientTests { @Test public void getAll() { IntLiteralProperty intLiteralProperty = client.getAll(); - Assertions.assertEquals(IntLiteralPropertyProperty.ONE, intLiteralProperty.getProperty()); + Assertions.assertEquals(IntLiteralPropertyProperty1.ONE, intLiteralProperty.getProperty()); } @Test @@ -26,7 +26,7 @@ public void getDefault() { @Test public void putAll() { IntLiteralProperty intLiteralProperty = new IntLiteralProperty(); - intLiteralProperty.setProperty(IntLiteralPropertyProperty.ONE); + intLiteralProperty.setProperty(IntLiteralPropertyProperty1.ONE); client.putAll(intLiteralProperty); } diff --git a/typespec-tests/src/test/java/com/type/property/optional/StringLiteralClientTests.java b/typespec-tests/src/test/java/com/type/property/optional/StringLiteralClientTests.java index 67c25424b7..7a887ebb56 100644 --- a/typespec-tests/src/test/java/com/type/property/optional/StringLiteralClientTests.java +++ b/typespec-tests/src/test/java/com/type/property/optional/StringLiteralClientTests.java @@ -4,7 +4,7 @@ package com.type.property.optional; import com.type.property.optional.models.StringLiteralProperty; -import com.type.property.optional.models.StringLiteralPropertyProperty; +import com.type.property.optional.models.StringLiteralPropertyPropertyHello; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ public class StringLiteralClientTests { @Test public void getAll() { StringLiteralProperty stringLiteralProperty = client.getAll(); - Assertions.assertEquals(StringLiteralPropertyProperty.HELLO, stringLiteralProperty.getProperty()); + Assertions.assertEquals(StringLiteralPropertyPropertyHello.HELLO, stringLiteralProperty.getProperty()); } @Test @@ -26,7 +26,7 @@ public void getDefault() { @Test public void putAll() { StringLiteralProperty stringLiteralProperty = new StringLiteralProperty(); - stringLiteralProperty.setProperty(StringLiteralPropertyProperty.HELLO); + stringLiteralProperty.setProperty(StringLiteralPropertyPropertyHello.HELLO); client.putAll(stringLiteralProperty); }