fix(http-client-java): preserve sync versioning overloads

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: e5dff7f2-5849-4374-b6b3-9c7177834a21

Author: weidongxu-microsoft

packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ClientMethodMapper.java

@@ -584,8 +584,8 @@ private void createPageStreamingClientMethods(boolean isSync, ClientMethod baseM
         // Pageable op '[Operation]' overloads for versioning
         createOverloadForVersioning(methods, isModelMaxOverload ? clientMethodWithContext : pagingMethod,
             clientMethodWithContext, methodWithContextVisibility, methodPageDetailsWithContext, isProtocolMethod, true);
-        // async method without Context parameter
-        if (!isSync) {
+        // method without RequestOptions/Context parameter
+        if (!isSync || isModelMaxOverload) {
             createOverloadForVersioning(methods, pagingMethod, pagingMethod, methodVisibility, methodPageDetails,
                 isProtocolMethod, false);
         }
@@ -803,8 +803,8 @@ private void createLroBeginClientMethods(boolean isSync, ClientMethod lroBaseMet
         // LRO 'begin[Operation]' sync or async method overloads with versioning.
         createOverloadForVersioning(methods, isModelMaxOverload ? clientMethodWithContext : beginLroMethod,
             clientMethodWithContext, methodWithContextVisibility, null, isProtocolMethod, true);
-        // async method without Context parameter
-        if (!isSync) {
+        // method without RequestOptions/Context parameter
+        if (!isSync || isModelMaxOverload) {
             createOverloadForVersioning(methods, beginLroMethod, beginLroMethod, methodVisibility, null,
                 isProtocolMethod, false);
         }

packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/maxoverloadmodel/MaxOverloadModelClient.java

@@ -729,6 +729,30 @@ public SyncPoller<PollOperationDetails, ResourceModel> beginExport(String name,
         return serviceClient.beginExportWithModel(name, requestOptions);
     }
 
+    /**
+     * Long-running resource action operation template.
+     *
+     * @param name The name parameter.
+     * @param optional The optional parameter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws HttpResponseException thrown if the request is rejected by server.
+     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
+     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
+     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of provides status details for long running operations.
+     */
+    @Generated
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollOperationDetails, ResourceModel> beginExport(String name, String optional) {
+        // Generated convenience method for beginExportWithModel
+        RequestOptions requestOptions = new RequestOptions();
+        if (optional != null) {
+            requestOptions.addQueryParam("optional", optional, false);
+        }
+        return serviceClient.beginExportWithModel(name, requestOptions);
+    }
+
     /**
      * Long-running resource action operation template.
      * 
@@ -879,6 +903,30 @@ public PagedIterable<ResourceModel> list(String filter, RequestOptions requestOp
             .mapPage(bodyItemValue -> bodyItemValue.toObject(ResourceModel.class));
     }
 
+    /**
+     * Resource list operation template.
+     *
+     * @param filter The filter parameter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws HttpResponseException thrown if the request is rejected by server.
+     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
+     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
+     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return paged collection of ResourceModel items as paginated response with {@link PagedIterable}.
+     */
+    @Generated
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ResourceModel> list(String filter) {
+        // Generated convenience method for listInternal
+        RequestOptions requestOptions = new RequestOptions();
+        if (filter != null) {
+            requestOptions.addQueryParam("filter", filter, false);
+        }
+        return serviceClient.listInternal(requestOptions)
+            .mapPage(bodyItemValue -> bodyItemValue.toObject(ResourceModel.class));
+    }
+
     /**
      * Resource list operation template.
      * 

packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/maxoverloadmodel/MaxOverloadModelTests.java

@@ -91,8 +91,10 @@ public void testLroAndPageableMethods() throws ReflectiveOperationException {
             = MaxOverloadModelClient.class.getDeclaredMethod("list", String.class, String.class, RequestOptions.class);
         Method syncPageablePastMax
             = MaxOverloadModelClient.class.getDeclaredMethod("list", String.class, RequestOptions.class);
+        Method syncPageablePast = MaxOverloadModelClient.class.getDeclaredMethod("list", String.class);
         Assertions.assertTrue(Modifier.isPublic(syncPageableMax.getModifiers()));
         Assertions.assertTrue(Modifier.isPublic(syncPageablePastMax.getModifiers()));
+        Assertions.assertTrue(Modifier.isPublic(syncPageablePast.getModifiers()));
 
         Method syncProtocolPageable
             = MaxOverloadModelClient.class.getDeclaredMethod("listInternal", RequestOptions.class);
@@ -117,8 +119,11 @@ public void testLroAndPageableMethods() throws ReflectiveOperationException {
             String.class, String.class, RequestOptions.class);
         Method syncLroVersionedPastMax = MaxOverloadModelClient.class.getDeclaredMethod("beginExport", String.class,
             String.class, RequestOptions.class);
+        Method syncLroVersionedPast
+            = MaxOverloadModelClient.class.getDeclaredMethod("beginExport", String.class, String.class);
         Assertions.assertTrue(Modifier.isPublic(syncLroVersionedMax.getModifiers()));
         Assertions.assertTrue(Modifier.isPublic(syncLroVersionedPastMax.getModifiers()));
+        Assertions.assertTrue(Modifier.isPublic(syncLroVersionedPast.getModifiers()));
 
         Method asyncLroVersionedMax = MaxOverloadModelAsyncClient.class.getDeclaredMethod("beginExport", String.class,
             String.class, String.class, RequestOptions.class);