fix body spread breaking change (#29723)

* fix face * fix communication messages * regen swagger * fix casing * rollback face * fix face * fix tsp * add java * fix easm
Azure · Jul 9, 2024 · ad84205 · ad84205
1 parent 73e33d0
commit ad84205
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 44 deletions.
diff --git a/specification/ai/Face/models.session.tsp b/specification/ai/Face/models.session.tsp
@@ -267,10 +267,6 @@ model LivenessSessionAuditEntry {
 
 @doc("Request of liveness with verify session creation.")
 model CreateLivenessWithVerifySessionContent {
-  @doc("The content type for the operation. Always multipart/form-data for this operation.")
-  @header("content-type")
-  contentType: "multipart/form-data";
-
   #suppress "@azure-tools/typespec-azure-core/casing-style"
   @doc("The parameters for creating session.")
   Parameters: CreateLivenessSessionContent;
@@ -279,3 +275,14 @@ model CreateLivenessWithVerifySessionContent {
   @doc("The image stream for verify. Content-Disposition header field for this part must have filename.")
   VerifyImage: bytes;
 }
+
+@doc("Request wrapper of liveness with verify session creation.")
+model CreateLivenessWithVerifySessionRequest {
+  @doc("The content type for the operation. Always multipart/form-data for this operation.")
+  @header("content-type")
+  contentType: "multipart/form-data";
+
+  @doc("Request content of liveness with verify session creation.")
+  @body
+  body: CreateLivenessWithVerifySessionContent;
+}
diff --git a/specification/ai/Face/routes.session.tsp b/specification/ai/Face/routes.session.tsp
@@ -102,7 +102,7 @@ interface LivenessSessionOperations {
   @sharedRoute
   createLivenessWithVerifySessionWithVerifyImage is FaceResourceCreateWithServiceProvidedName<
     LivenessWithVerifySession,
-    CreateLivenessWithVerifySessionContent,
+    CreateLivenessWithVerifySessionRequest,
     CreateLivenessWithVerifySessionResult
   >;
 

diff --git a/specification/ai/data-plane/Face/preview/v1.1-preview.1/Face.json b/specification/ai/data-plane/Face/preview/v1.1-preview.1/Face.json
@@ -642,10 +642,18 @@
         ],
         "parameters": [
           {
-            "$ref": "#/parameters/CreateLivenessWithVerifySessionContent.Parameters"
+            "name": "Parameters",
+            "in": "formData",
+            "description": "The parameters for creating session.",
+            "required": true,
+            "type": "string"
           },
           {
-            "$ref": "#/parameters/CreateLivenessWithVerifySessionContent.VerifyImage"
+            "name": "VerifyImage",
+            "in": "formData",
+            "description": "The image stream for verify. Content-Disposition header field for this part must have filename.",
+            "required": true,
+            "type": "file"
           }
         ],
         "responses": {
@@ -9405,22 +9413,5 @@
       "pattern": "^[a-z0-9-_]+$"
     }
   },
-  "parameters": {
-    "CreateLivenessWithVerifySessionContent.Parameters": {
-      "name": "Parameters",
-      "in": "formData",
-      "description": "The parameters for creating session.",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    },
-    "CreateLivenessWithVerifySessionContent.VerifyImage": {
-      "name": "VerifyImage",
-      "in": "formData",
-      "description": "The image stream for verify. Content-Disposition header field for this part must have filename.",
-      "required": true,
-      "type": "file",
-      "x-ms-parameter-location": "method"
-    }
-  }
+  "parameters": {}
 }
diff --git a/specification/communication/Communication.Messages/client.tsp b/specification/communication/Communication.Messages/client.tsp
@@ -36,3 +36,8 @@ interface MessageTemplateClient
   "templateValues",
   "python"
 );
+
+@@clientName(Azure.Communication.MessagesService.NotificationMessagesSendRequestBody.body,
+  "notificationContent",
+  "csharp,java"
+);
diff --git a/specification/communication/Communication.Messages/models.tsp b/specification/communication/Communication.Messages/models.tsp
@@ -375,13 +375,9 @@ enum Versions {
   c2024_02_01: "2024-02-01",
 }
 
-alias BodyParameter<
-  T,
-  TName extends valueof string = "body",
-  TDoc extends valueof string = "Body parameter."
-> = {
-  @doc(TDoc)
-  @friendlyName(TName)
+@doc("Notification messages send request body.")
+model NotificationMessagesSendRequestBody {
+  @doc("Details of the message to send.")
   @bodyRoot
-  body: T;
-};
+  body: NotificationContent;
+}
diff --git a/specification/communication/Communication.Messages/routes.tsp b/specification/communication/Communication.Messages/routes.tsp
@@ -35,7 +35,7 @@ interface NotificationMessagesOperations {
   @doc("Sends a notification message from Business to User.")
   send is Operations.ResourceCollectionAction<
     Notifications,
-    BodyParameter<NotificationContent>,
+    NotificationMessagesSendRequestBody,
     AcceptedResponse & SendMessageResult
   >;
 }

diff --git a/...on/communication/data-plane/Messages/stable/2024-02-01/communicationservicesmessages.json b/...on/communication/data-plane/Messages/stable/2024-02-01/communicationservicesmessages.json
@@ -162,13 +162,7 @@
             "$ref": "#/parameters/Azure.Core.ClientRequestIdHeader"
           },
           {
-            "name": "body",
-            "in": "body",
-            "description": "Body parameter.",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/NotificationContent"
-            }
+            "$ref": "#/parameters/NotificationMessagesSendRequestBody"
           }
         ],
         "responses": {
@@ -1063,6 +1057,16 @@
       "type": "string",
       "x-ms-parameter-location": "method",
       "x-ms-client-name": "repeatabilityRequestId"
+    },
+    "NotificationMessagesSendRequestBody": {
+      "name": "body",
+      "in": "body",
+      "description": "Details of the message to send.",
+      "required": true,
+      "schema": {
+        "$ref": "#/definitions/NotificationContent"
+      },
+      "x-ms-parameter-location": "method"
     }
   }
 }
diff --git a/specification/riskiq/Easm/routes.tsp b/specification/riskiq/Easm/routes.tsp
@@ -30,7 +30,7 @@ interface Assets {
   @updatesResource(AssetResource)
   @post
   updateAssets is Foundations.Operation<
-    AssetsUpdateParameter & AssetUpdateData,
+    AssetsUpdateParameter & BodyParameter<AssetUpdateData>,
     Task
   >;
   @doc("Retrieve an asset by assetId.")
@@ -242,7 +242,7 @@ interface SavedFilters {
   @put
   createOrReplaceSavedFilter is Foundations.ResourceOperation<
     SavedFilter,
-    SavedFilterData,
+    BodyParameter<SavedFilterData>,
     SavedFilter
   >;
   @doc("Delete a saved filter with a given filterName.")

diff --git a/specification/riskiq/data-plane/Microsoft.Easm/preview/2023-03-01-preview/easm.json b/specification/riskiq/data-plane/Microsoft.Easm/preview/2023-03-01-preview/easm.json
@@ -145,6 +145,7 @@
           {
             "name": "body",
             "in": "body",
+            "description": "Body parameter.",
             "required": true,
             "schema": {
               "$ref": "#/definitions/AssetUpdateData"
@@ -1102,6 +1103,7 @@
           {
             "name": "body",
             "in": "body",
+            "description": "Body parameter.",
             "required": true,
             "schema": {
               "$ref": "#/definitions/SavedFilterData"

diff --git a/specification/riskiq/data-plane/Microsoft.Easm/preview/2024-03-01-preview/easm.json b/specification/riskiq/data-plane/Microsoft.Easm/preview/2024-03-01-preview/easm.json
@@ -157,6 +157,7 @@
           {
             "name": "body",
             "in": "body",
+            "description": "Body parameter.",
             "required": true,
             "schema": {
               "$ref": "#/definitions/AssetUpdateData"
@@ -1604,6 +1605,7 @@
           {
             "name": "body",
             "in": "body",
+            "description": "Body parameter.",
             "required": true,
             "schema": {
               "$ref": "#/definitions/SavedFilterData"