Fix "/" on query paths

alextwoods · alextwoods · commit c164890947eb · 2025-07-08T14:10:35.000-07:00
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryProtocolMarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryProtocolMarshaller.java
@@ -51,7 +51,12 @@ private QueryProtocolMarshaller(Builder builder) {
     }
 
     private SdkHttpFullRequest.Builder fillBasicRequestParams(OperationInfo operationInfo) {
+        String path = "";
+        if (request.encodedPath() != null && !"/".equals(request.encodedPath())) {
+            path = request.encodedPath();
+        }
         return ProtocolUtils.createSdkHttpRequest(operationInfo, endpoint)
+                            .encodedPath(path)
                             .putRawQueryParameter("Action", operationInfo.operationIdentifier())
                             .putRawQueryParameter("Version", operationInfo.apiVersion());
     }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,12 @@ private QueryProtocolMarshaller(Builder builder) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private SdkHttpFullRequest.Builder fillBasicRequestParams(OperationInfo operationInfo) {`
	`54`	`+ String path = "";`
	`55`	`+ if (request.encodedPath() != null && !"/".equals(request.encodedPath())) {`
	`56`	`+ path = request.encodedPath();`
	`57`	`+ }`
`54`	`58`	`return ProtocolUtils.createSdkHttpRequest(operationInfo, endpoint)`
	`59`	`+ .encodedPath(path)`
`55`	`60`	`.putRawQueryParameter("Action", operationInfo.operationIdentifier())`
`56`	`61`	`.putRawQueryParameter("Version", operationInfo.apiVersion());`
`57`	`62`	`}`