tsp, tcgc, adopt sdkpackage

typespec-extension/src/operation-utils.ts

@@ -26,7 +26,7 @@ import { CodeModel } from "./common/code-model.js";
 import { EmitterOptions } from "./emitter.js";
 import { getNamespace, logWarning, pascalCase } from "./utils.js";
 import { modelIs, unionReferredByType } from "./type-utils.js";
-import { SdkContext, getDefaultApiVersion } from "@azure-tools/typespec-client-generator-core";
+import { SdkContext, SdkHttpOperation, getDefaultApiVersion } from "@azure-tools/typespec-client-generator-core";
 import { pathToFileURL } from "url";
 
 export const SPECIAL_HEADER_NAMES = new Set([
@@ -173,33 +173,67 @@ function pascalCaseForOperationId(name: string) {
     .join("_");
 }
 
-export function operationIsJsonMergePatch(op: HttpOperation): boolean {
-  return operationIsContentType(op, "application/merge-patch+json");
+// export function operationIsJsonMergePatch(op: HttpOperation): boolean {
+//   return operationIsContentType(op, "application/merge-patch+json");
+// }
+
+// export function operationIsMultipart(op: HttpOperation): boolean {
+//   return operationIsContentType(op, "multipart/form-data");
+// }
+
+// function operationIsContentType(op: HttpOperation, contentType: string): boolean {
+//   for (const param of op.parameters.parameters) {
+//     if (param.type === "header" && param.name.toLowerCase() === CONTENT_TYPE_KEY) {
+//       if (param.param.type.kind === "String" && param.param.type.value === contentType) {
+//         return true;
+//       }
+//     }
+//   }
+//   return false;
+// }
+
+// export function operationIsMultipleContentTypes(op: HttpOperation): boolean {
+//   if (
+//     op.parameters.parameters &&
+//     op.parameters.parameters.some(
+//       (parameter) =>
+//         parameter?.type === "header" &&
+//         parameter?.name?.toLowerCase() === CONTENT_TYPE_KEY &&
+//         parameter?.param?.type?.kind === "Union",
+//     )
+//   ) {
+//     return true;
+//   }
+//   return false;
+// }
+
+export function sdkHttpOperationIsJsonMergePatch(op: SdkHttpOperation): boolean {
+  return sdkHttpOperationIsContentType(op, "application/merge-patch+json");
 }
 
-export function operationIsMultipart(op: HttpOperation): boolean {
-  return operationIsContentType(op, "multipart/form-data");
+export function sdkHttpOperationIsMultipart(op: SdkHttpOperation): boolean {
+  return sdkHttpOperationIsContentType(op, "multipart/form-data");
 }
 
-function operationIsContentType(op: HttpOperation, contentType: string): boolean {
-  for (const param of op.parameters.parameters) {
-    if (param.type === "header" && param.name.toLowerCase() === CONTENT_TYPE_KEY) {
-      if (param.param.type.kind === "String" && param.param.type.value === contentType) {
+function sdkHttpOperationIsContentType(op: SdkHttpOperation, contentType: string): boolean {
+  for (const param of op.parameters) {
+    if (param.kind === "header" && param.serializedName.toLowerCase() === CONTENT_TYPE_KEY) {
+      if (param.type.kind === "constant" && param.type.value === contentType) {
         return true;
       }
     }
   }
   return false;
 }
 
-export function operationIsMultipleContentTypes(op: HttpOperation): boolean {
+export function sdkHttpOperationIsMultipleContentTypes(op: SdkHttpOperation): boolean {
   if (
-    op.parameters.parameters &&
-    op.parameters.parameters.some(
+    op.parameters &&
+    op.parameters.some(
       (parameter) =>
-        parameter?.type === "header" &&
-        parameter?.name?.toLowerCase() === CONTENT_TYPE_KEY &&
-        parameter?.param?.type?.kind === "Union",
+        parameter.kind === "header" &&
+        parameter.serializedName.toLowerCase() === CONTENT_TYPE_KEY &&
+        parameter.type.kind === "enum",
     )
   ) {
     return true;

typespec-tests/src/main/java/com/_specs_/azure/clientgenerator/core/access/implementation/InternalOperationsImpl.java

@@ -64,7 +64,7 @@ public interface InternalOperationsService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono<Response<BinaryData>> noDecoratorInInternal(@QueryParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/internalOperation/noDecoratorInInternal")
         @ExpectedResponses({ 200 })
@@ -73,7 +73,7 @@ Mono<Response<BinaryData>> noDecoratorInInternal(@QueryParam("name") String name
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response<BinaryData> noDecoratorInInternalSync(@QueryParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/internalOperation/internalDecoratorInInternal")
         @ExpectedResponses({ 200 })
@@ -82,7 +82,7 @@ Response<BinaryData> noDecoratorInInternalSync(@QueryParam("name") String name,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono<Response<BinaryData>> internalDecoratorInInternal(@QueryParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/internalOperation/internalDecoratorInInternal")
         @ExpectedResponses({ 200 })
@@ -91,7 +91,7 @@ Mono<Response<BinaryData>> internalDecoratorInInternal(@QueryParam("name") Strin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response<BinaryData> internalDecoratorInInternalSync(@QueryParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/internalOperation/publicDecoratorInInternal")
         @ExpectedResponses({ 200 })
@@ -100,7 +100,7 @@ Response<BinaryData> internalDecoratorInInternalSync(@QueryParam("name") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono<Response<BinaryData>> publicDecoratorInInternal(@QueryParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/internalOperation/publicDecoratorInInternal")
         @ExpectedResponses({ 200 })
@@ -109,7 +109,7 @@ Mono<Response<BinaryData>> publicDecoratorInInternal(@QueryParam("name") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response<BinaryData> publicDecoratorInInternalSync(@QueryParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
     }
 
     /**

typespec-tests/src/main/java/com/_specs_/azure/clientgenerator/core/access/implementation/PublicOperationsImpl.java

@@ -64,7 +64,7 @@ public interface PublicOperationsService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono<Response<BinaryData>> noDecoratorInPublic(@QueryParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/publicOperation/noDecoratorInPublic")
         @ExpectedResponses({ 200 })
@@ -73,7 +73,7 @@ Mono<Response<BinaryData>> noDecoratorInPublic(@QueryParam("name") String name,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response<BinaryData> noDecoratorInPublicSync(@QueryParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/publicOperation/publicDecoratorInPublic")
         @ExpectedResponses({ 200 })
@@ -82,7 +82,7 @@ Response<BinaryData> noDecoratorInPublicSync(@QueryParam("name") String name,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono<Response<BinaryData>> publicDecoratorInPublic(@QueryParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/publicOperation/publicDecoratorInPublic")
         @ExpectedResponses({ 200 })
@@ -91,7 +91,7 @@ Mono<Response<BinaryData>> publicDecoratorInPublic(@QueryParam("name") String na
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response<BinaryData> publicDecoratorInPublicSync(@QueryParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
     }
 
     /**

typespec-tests/src/main/java/com/_specs_/azure/clientgenerator/core/access/implementation/RelativeModelInOperationsImpl.java

@@ -63,7 +63,7 @@ public interface RelativeModelInOperationsService {
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<BinaryData>> operation(@QueryParam("name") String name, @HeaderParam("accept") String accept,
+        Mono<Response<BinaryData>> operation(@QueryParam("name") String name, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/relativeModelInOperation/operation")
@@ -72,7 +72,7 @@ Mono<Response<BinaryData>> operation(@QueryParam("name") String name, @HeaderPar
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response<BinaryData> operationSync(@QueryParam("name") String name, @HeaderParam("accept") String accept,
+        Response<BinaryData> operationSync(@QueryParam("name") String name, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/relativeModelInOperation/discriminator")
@@ -81,7 +81,7 @@ Response<BinaryData> operationSync(@QueryParam("name") String name, @HeaderParam
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<BinaryData>> discriminator(@QueryParam("kind") String kind, @HeaderParam("accept") String accept,
+        Mono<Response<BinaryData>> discriminator(@QueryParam("kind") String kind, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/relativeModelInOperation/discriminator")
@@ -90,7 +90,7 @@ Mono<Response<BinaryData>> discriminator(@QueryParam("kind") String kind, @Heade
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response<BinaryData> discriminatorSync(@QueryParam("kind") String kind, @HeaderParam("accept") String accept,
+        Response<BinaryData> discriminatorSync(@QueryParam("kind") String kind, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
     }
 

typespec-tests/src/main/java/com/_specs_/azure/clientgenerator/core/access/implementation/SharedModelInOperationsImpl.java

@@ -63,7 +63,7 @@ public interface SharedModelInOperationsService {
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<BinaryData>> publicMethod(@QueryParam("name") String name, @HeaderParam("accept") String accept,
+        Mono<Response<BinaryData>> publicMethod(@QueryParam("name") String name, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/sharedModelInOperation/public")
@@ -72,7 +72,7 @@ Mono<Response<BinaryData>> publicMethod(@QueryParam("name") String name, @Header
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response<BinaryData> publicMethodSync(@QueryParam("name") String name, @HeaderParam("accept") String accept,
+        Response<BinaryData> publicMethodSync(@QueryParam("name") String name, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/sharedModelInOperation/internal")
@@ -81,7 +81,7 @@ Response<BinaryData> publicMethodSync(@QueryParam("name") String name, @HeaderPa
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<BinaryData>> internal(@QueryParam("name") String name, @HeaderParam("accept") String accept,
+        Mono<Response<BinaryData>> internal(@QueryParam("name") String name, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/azure/client-generator-core/access/sharedModelInOperation/internal")
@@ -90,7 +90,7 @@ Mono<Response<BinaryData>> internal(@QueryParam("name") String name, @HeaderPara
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response<BinaryData> internalSync(@QueryParam("name") String name, @HeaderParam("accept") String accept,
+        Response<BinaryData> internalSync(@QueryParam("name") String name, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
     }