App Config - Query Param Ordering

sdk/appconfiguration/azure-data-appconfiguration/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 1.9.0-beta.1 (Unreleased)
 
 ### Features Added
+- Added a pipeline policy to handle query parameters to make sure the keys are always in lower case and in alphabetical order.
 
 ### Breaking Changes
 

sdk/appconfiguration/azure-data-appconfiguration/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/appconfiguration/azure-data-appconfiguration",
-  "Tag": "java/appconfiguration/azure-data-appconfiguration_5e00bac278"
+  "Tag": "java/appconfiguration/azure-data-appconfiguration_90b5086be3"
 }

sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationClientBuilder.java

@@ -42,6 +42,7 @@
 import com.azure.data.appconfiguration.implementation.AzureAppConfigurationImpl;
 import com.azure.data.appconfiguration.implementation.ConfigurationClientCredentials;
 import com.azure.data.appconfiguration.implementation.ConfigurationCredentialsPolicy;
+import com.azure.data.appconfiguration.implementation.QueryParamPolicy;
 import com.azure.data.appconfiguration.implementation.SyncTokenPolicy;
 import com.azure.data.appconfiguration.models.ConfigurationAudience;
 
@@ -263,6 +264,9 @@ private HttpPipeline createDefaultHttpPipeline(SyncTokenPolicy syncTokenPolicy,
         policies.add(new AddHeadersFromContextPolicy());
         policies.add(ADD_HEADERS_POLICY);
 
+        // Add query parameter reordering policy
+        policies.add(new QueryParamPolicy());
+
         policies.addAll(perCallPolicies);
         HttpPolicyProviders.addBeforeRetryPolicies(policies);
 

sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/implementation/QueryParamPolicy.java

@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.data.appconfiguration.implementation;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import com.azure.core.http.HttpPipelineCallContext;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.policy.HttpPipelineSyncPolicy;
+import com.azure.core.util.logging.ClientLogger;
+
+public final class QueryParamPolicy extends HttpPipelineSyncPolicy {
+    private static final ClientLogger LOGGER = new ClientLogger(QueryParamPolicy.class);
+
+    @Override
+    protected void beforeSendingRequest(HttpPipelineCallContext context) {
+        HttpRequest request = context.getHttpRequest();
+
+        try {
+            String url = request.getUrl().toString();
+
+            // Find the query string manually to preserve URL encoding
+            int queryIndex = url.indexOf('?');
+            if (queryIndex != -1) {
+                String query = url.substring(queryIndex + 1);
+
+                if (!query.isEmpty()) {
+                    String normalizedQuery
+                        = Arrays.stream(query.split("&")).filter(pair -> !pair.isEmpty()).map(pair -> {
+                            int equalIndex = pair.indexOf('=');
+                            return equalIndex != -1
+                                ? pair.substring(0, equalIndex).toLowerCase() + "=" + pair.substring(equalIndex + 1)
+                                : pair.toLowerCase() + "=";
+                        }).sorted().collect(Collectors.joining("&"));
+                    String urlWithoutQuery = url.substring(0, queryIndex);
+                    String newUrl = urlWithoutQuery + "?" + normalizedQuery;
+                    request.setUrl(newUrl);
+                }
+            }
+        } catch (Exception e) {
+            // If URL parsing fails, continue without modification
+            LOGGER.warning(
+                "Failed to parse URL for query parameter normalization. "
+                    + "Request will proceed with original URL. URL: {}, Error: {}",
+                request.getUrl(), e.getMessage(), e);
+        }
+    }
+}