Merge remote-tracking branch 'origin/main' into release

Author: ianbotsf

smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpBindingProtocolGenerator.kt

@@ -274,7 +274,9 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
         }
 
         resolver.determineRequestContentType(op)?.let { contentType ->
-            writer.write("builder.headers.setMissing(\"Content-Type\", #S)", contentType)
+            writer.withBlock("if (builder.body !is HttpBody.Empty) {", "}") {
+                write("builder.headers.setMissing(\"Content-Type\", #S)", contentType)
+            }
         }
     }
 

smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/IdempotentTokenGeneratorTest.kt

@@ -42,7 +42,9 @@ class IdempotentTokenGeneratorTest {
             
                     val payload = serializeAllocateWidgetOperationBody(context, input)
                     builder.body = ByteArrayContent(payload)
-                    builder.headers.setMissing("Content-Type", "application/json")
+                    if (builder.body !is HttpBody.Empty) {
+                        builder.headers.setMissing("Content-Type", "application/json")
+                    }
                     return builder
                 }
             }

smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpBindingProtocolGeneratorTest.kt

@@ -72,7 +72,9 @@ internal class SmokeTestOperationSerializer: HttpSerialize<SmokeTestRequest> {
 
         val payload = serializeSmokeTestOperationBody(context, input)
         builder.body = ByteArrayContent(payload)
-        builder.headers.setMissing("Content-Type", "application/json")
+        if (builder.body !is HttpBody.Empty) {
+            builder.headers.setMissing("Content-Type", "application/json")
+        }
         return builder
     }
 }
@@ -99,7 +101,9 @@ internal class ExplicitStringOperationSerializer: HttpSerialize<ExplicitStringRe
         if (input.payload1 != null) {
             builder.body = ByteArrayContent(input.payload1.encodeToByteArray())
         }
-        builder.headers.setMissing("Content-Type", "text/plain")
+        if (builder.body !is HttpBody.Empty) {
+            builder.headers.setMissing("Content-Type", "text/plain")
+        }
         return builder
     }
 }
@@ -124,7 +128,9 @@ internal class ExplicitBlobOperationSerializer: HttpSerialize<ExplicitBlobReques
         if (input.payload1 != null) {
             builder.body = ByteArrayContent(input.payload1)
         }
-        builder.headers.setMissing("Content-Type", "application/octet-stream")
+        if (builder.body !is HttpBody.Empty) {
+            builder.headers.setMissing("Content-Type", "application/octet-stream")
+        }
         return builder
     }
 }
@@ -149,7 +155,9 @@ internal class ExplicitBlobStreamOperationSerializer: HttpSerialize<ExplicitBlob
         if (input.payload1 != null) {
             builder.body = input.payload1.toHttpBody() ?: HttpBody.Empty
         }
-        builder.headers.setMissing("Content-Type", "application/octet-stream")
+        if (builder.body !is HttpBody.Empty) {
+            builder.headers.setMissing("Content-Type", "application/octet-stream")
+        }
         return builder
     }
 }
@@ -175,7 +183,9 @@ internal class ExplicitStructOperationSerializer: HttpSerialize<ExplicitStructRe
             val payload = serializeNested2Payload(input.payload1)
             builder.body = ByteArrayContent(payload)
         }
-        builder.headers.setMissing("Content-Type", "application/json")
+        if (builder.body !is HttpBody.Empty) {
+            builder.headers.setMissing("Content-Type", "application/json")
+        }
         return builder
     }
 }
@@ -203,7 +213,9 @@ internal class EnumInputOperationSerializer: HttpSerialize<EnumInputRequest> {
 
         val payload = serializeEnumInputOperationBody(context, input)
         builder.body = ByteArrayContent(payload)
-        builder.headers.setMissing("Content-Type", "application/json")
+        if (builder.body !is HttpBody.Empty) {
+            builder.headers.setMissing("Content-Type", "application/json")
+        }
         return builder
     }
 }
@@ -243,7 +255,9 @@ internal class TimestampInputOperationSerializer: HttpSerialize<TimestampInputRe
 
         val payload = serializeTimestampInputOperationBody(context, input)
         builder.body = ByteArrayContent(payload)
-        builder.headers.setMissing("Content-Type", "application/json")
+        if (builder.body !is HttpBody.Empty) {
+            builder.headers.setMissing("Content-Type", "application/json")
+        }
         return builder
     }
 }
@@ -274,7 +288,9 @@ internal class BlobInputOperationSerializer: HttpSerialize<BlobInputRequest> {
 
         val payload = serializeBlobInputOperationBody(context, input)
         builder.body = ByteArrayContent(payload)
-        builder.headers.setMissing("Content-Type", "application/json")
+        if (builder.body !is HttpBody.Empty) {
+            builder.headers.setMissing("Content-Type", "application/json")
+        }
         return builder
     }
 }