http-client-java, support advanced-versioning on @added optional parameter in TypeSpec, in non-DPG

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

@@ -355,16 +355,35 @@ private static JavaVisibility methodVisibilityInWrapperClient(Operation operatio
         }
     }
 
-    private static void createOverloadForVersioning(boolean isProtocolMethod, List<ClientMethod> methods,
-        ClientMethod baseMethod) {
+    protected void createOverloadForVersioning(List<ClientMethod> methods, ClientMethod baseMethod,
+        ClientMethod overloadedMethod, JavaVisibility methodWithContextVisibility,
+        MethodPageDetails methodPageDetailsWithContext, boolean isProtocolMethod) {
         final List<ClientMethodParameter> parameters = baseMethod.getParameters();
-        if (!isProtocolMethod && JavaSettings.getInstance().isDataPlaneClient()) {
+        if (!isProtocolMethod) {
             if (parameters.stream().anyMatch(p -> p.getVersioning() != null && p.getVersioning().getAdded() != null)) {
+                // versioning of @added exists
                 final List<List<ClientMethodParameter>> signatures = findOverloadedSignatures(parameters);
                 for (List<ClientMethodParameter> overloadedParameters : signatures) {
-                    final ClientMethod overloadedMethod
-                        = baseMethod.newBuilder().parameters(overloadedParameters).build();
-                    methods.add(overloadedMethod);
+                    if (JavaSettings.getInstance().isDataPlaneClient()) {
+                        // DPG
+                        final ClientMethod overloadMethod = baseMethod.newBuilder()
+                            .overloadedClientMethod(overloadedMethod)
+                            .parameters(overloadedParameters)
+                            .build();
+                        methods.add(overloadMethod);
+                    } else {
+                        // non-DPG
+                        ClientMethod.Builder overloadedMethodBuilder = baseMethod.newBuilder()
+                            .overloadedClientMethod(overloadedMethod)
+                            .parameters(overloadedParameters);
+                        if (methodPageDetailsWithContext != null) {
+                            overloadedMethodBuilder
+                                = overloadedMethodBuilder.methodPageDetails(methodPageDetailsWithContext);
+                        }
+                        final ClientMethod overloadMethod = overloadedMethodBuilder.build();
+                        addClientMethodWithContext(methods, overloadMethod, methodWithContextVisibility,
+                            isProtocolMethod);
+                    }
                 }
             }
         }
@@ -457,7 +476,12 @@ private void createSinglePageClientMethods(boolean isSync, ClientMethod baseMeth
         }
 
         // Generate '[Operation]SinglePage' overload with all parameters and Context.
-        addClientMethodWithContext(methods, singlePageMethod, methodWithContextVisibility, isProtocolMethod);
+        ClientMethod clientMethodWithContext
+            = addClientMethodWithContext(methods, singlePageMethod, methodWithContextVisibility, isProtocolMethod);
+
+        // Pageable op '[Operation]SinglePage' overloads for versioning
+        createOverloadForVersioning(methods, singlePageMethod, clientMethodWithContext, methodWithContextVisibility,
+            null, isProtocolMethod);
     }
 
     private void createPageStreamingClientMethods(boolean isSync, ClientMethod baseMethod,
@@ -508,8 +532,6 @@ private void createPageStreamingClientMethods(boolean isSync, ClientMethod baseM
         if (settings.getSyncMethods() != SyncMethodsGeneration.NONE) {
             // generate the overload, if "sync-methods != NONE"
             methods.add(pagingMethod);
-            // overload for versioning
-            createOverloadForVersioning(isProtocolMethod, methods, pagingMethod);
         }
 
         if (generateRequiredOnlyParametersOverload) {
@@ -526,7 +548,12 @@ private void createPageStreamingClientMethods(boolean isSync, ClientMethod baseM
         } else {
             pagingMethodWithContext = pagingMethod;
         }
-        addClientMethodWithContext(methods, pagingMethodWithContext, methodWithContextVisibility, isProtocolMethod);
+        ClientMethod clientMethodWithContext = addClientMethodWithContext(methods, pagingMethodWithContext,
+            methodWithContextVisibility, isProtocolMethod);
+
+        // Pageable op '[Operation]' overloads for versioning
+        createOverloadForVersioning(methods, pagingMethod, clientMethodWithContext, methodWithContextVisibility,
+            methodPageDetailsWithContext, isProtocolMethod);
     }
 
     private void createLroWithResponseClientMethods(boolean isSync, ClientMethod baseMethod, List<ClientMethod> methods,
@@ -575,7 +602,13 @@ private void createLroWithResponseClientMethods(boolean isSync, ClientMethod bas
             .hasWithContextOverload(methodWithContextVisibility != NOT_GENERATE)
             .build();
         methods.add(withResponseMethod);
-        addClientMethodWithContext(methods, withResponseMethod, methodWithContextVisibility, isProtocolMethod);
+
+        ClientMethod clientMethodWithContext
+            = addClientMethodWithContext(methods, withResponseMethod, methodWithContextVisibility, isProtocolMethod);
+
+        // LRO '[Operation]WithResponse' overloads for versioning
+        createOverloadForVersioning(methods, withResponseMethod, clientMethodWithContext, methodWithContextVisibility,
+            null, isProtocolMethod);
     }
 
     private void createFluentLroWithResponseSyncClientMethods(Operation operation, ClientMethod baseMethod,
@@ -614,7 +647,13 @@ private void createFluentLroWithResponseSyncClientMethods(Operation operation, C
             .methodVisibility(NOT_VISIBLE)
             .build();
         methods.add(withResponseSyncMethod);
-        addClientMethodWithContext(methods, withResponseSyncMethod, NOT_VISIBLE, isProtocolMethod);
+
+        ClientMethod clientMethodWithContext
+            = addClientMethodWithContext(methods, withResponseSyncMethod, NOT_VISIBLE, isProtocolMethod);
+
+        // LRO '[Operation]' overloads for versioning
+        createOverloadForVersioning(methods, withResponseSyncMethod, clientMethodWithContext, NOT_VISIBLE, null,
+            isProtocolMethod);
     }
 
     private void createProtocolLroBeginClientMethods(ClientMethod baseMethod, PollingMetadata pollingMetadata,
@@ -704,9 +743,6 @@ private void createLroBeginClientMethods(boolean isSync, ClientMethod lroBaseMet
             .build();
         methods.add(beginLroMethod);
 
-        // LRO 'begin[Operation]' sync or async method overloads with versioning.
-        createOverloadForVersioning(isProtocolMethod, methods, beginLroMethod);
-
         if (generateRequiredOnlyParametersOverload) {
             // LRO 'begin[Operation]' sync or async method overload with only required parameters.
             final ClientMethod beginLroMethodWithRequiredParameters = beginLroMethod.newBuilder()
@@ -717,7 +753,12 @@ private void createLroBeginClientMethods(boolean isSync, ClientMethod lroBaseMet
         }
 
         // LRO 'begin[Operation]' sync or async method overload with only required with context parameters.
-        addClientMethodWithContext(methods, beginLroMethod, methodWithContextVisibility, isProtocolMethod);
+        ClientMethod clientMethodWithContext
+            = addClientMethodWithContext(methods, beginLroMethod, methodWithContextVisibility, isProtocolMethod);
+
+        // LRO 'begin[Operation]' sync or async method overloads with versioning.
+        createOverloadForVersioning(methods, beginLroMethod, clientMethodWithContext, methodWithContextVisibility, null,
+            isProtocolMethod);
     }
 
     private void createSimpleClientMethods(boolean isSync, ClientMethod baseMethod, List<ClientMethod> methods,
@@ -764,10 +805,16 @@ private void createSimpleWithResponseClientMethods(boolean isSync, ClientMethod
             .hasWithContextOverload(hasContextOverload)
             .methodVisibility(methodVisibility)
             .build();
+
         // Always generate an overload of WithResponse with non-required parameters without Context. It is only for sync
         // proxy method, and is usually filtered out in methodVisibility function.
         methods.add(withResponseMethod);
-        addClientMethodWithContext(methods, withResponseMethod, methodWithContextVisibility, isProtocolMethod);
+        ClientMethod clientMethodWithContext
+            = addClientMethodWithContext(methods, withResponseMethod, methodWithContextVisibility, isProtocolMethod);
+
+        // Simple op '[Operation]WithResponse' overloads for versioning
+        createOverloadForVersioning(methods, withResponseMethod, clientMethodWithContext, methodWithContextVisibility,
+            null, isProtocolMethod);
     }
 
     private void createSimpleValueClientMethods(boolean isSync, ClientMethod baseMethod, List<ClientMethod> methods,
@@ -807,17 +854,19 @@ private void createSimpleValueClientMethods(boolean isSync, ClientMethod baseMet
             .build();
         methods.add(simpleMethod);
 
-        // overload for versioning
-        createOverloadForVersioning(isProtocolMethod, methods, simpleMethod);
-
         if (generateRequiredOnlyParametersOverload) {
             final ClientMethod simpleMethodWithRequiredParameters = simpleMethod.newBuilder()
                 .methodVisibility(methodWithRequiredParametersVisibility)
                 .onlyRequiredParameters(true)
                 .build();
             methods.add(simpleMethodWithRequiredParameters);
         }
-        addClientMethodWithContext(methods, simpleMethod, methodWithContextVisibility, isProtocolMethod);
+        ClientMethod clientMethodWithContext
+            = addClientMethodWithContext(methods, simpleMethod, methodWithContextVisibility, isProtocolMethod);
+
+        // Simple op '[Operation]' overloads for versioning
+        createOverloadForVersioning(methods, simpleMethod, clientMethodWithContext, methodWithContextVisibility, null,
+            isProtocolMethod);
     }
 
     /**
@@ -937,8 +986,9 @@ protected ClientMethodParameter getContextParameter(boolean isProtocolMethod) {
      * @param baseMethod The method to use to obtain the builder for context enabled {@link ClientMethod}.
      * @param visibility The visibility for the context enabled client method.
      * @param isProtocolMethod Is protocol method.
+     * @return the client method with Context parameter.
      */
-    protected void addClientMethodWithContext(List<ClientMethod> methods, ClientMethod baseMethod,
+    protected ClientMethod addClientMethodWithContext(List<ClientMethod> methods, ClientMethod baseMethod,
         JavaVisibility visibility, boolean isProtocolMethod) {
         final ClientMethodParameter contextParameter = getContextParameter(isProtocolMethod);
         final List<ClientMethodParameter> parameters = new ArrayList<>(baseMethod.getParameters());
@@ -954,6 +1004,7 @@ protected void addClientMethodWithContext(List<ClientMethod> methods, ClientMeth
             .hasWithContextOverload(false) // WithContext overload doesn't have a withContext overload
             .build();
         methods.add(withContextMethod);
+        return withContextMethod;
     }
 
     private static MethodNamer resolveMethodNamer(ProxyMethod proxyMethod, ConvenienceApi convenienceApi,

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

@@ -34,7 +34,7 @@ protected ClientMethodParameter getContextParameter(boolean isProtocolMethod) {
     }
 
     @Override
-    protected void addClientMethodWithContext(List<ClientMethod> methods, ClientMethod baseMethod,
+    protected ClientMethod addClientMethodWithContext(List<ClientMethod> methods, ClientMethod baseMethod,
         JavaVisibility visibility, boolean isProtocolMethod) {
         final ClientMethodParameter contextParameter = getContextParameter(isProtocolMethod);
         final List<ClientMethodParameter> parameters = new ArrayList<>(baseMethod.getParameters());
@@ -48,5 +48,6 @@ protected void addClientMethodWithContext(List<ClientMethod> methods, ClientMeth
             .hasWithContextOverload(false)
             .build();
         methods.add(withContextMethod);
+        return withContextMethod;
     }
 }

packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientMethod.java

@@ -115,6 +115,8 @@ public class ClientMethod {
     private final String argumentList;
     private final OperationInstrumentationInfo instrumentationInfo;
 
+    private final ClientMethod overloadedClientMethod;
+
     public ClientMethod.Builder newBuilder() {
         return new ClientMethod.Builder().description(description)
             .returnValue(returnValue)
@@ -137,7 +139,8 @@ public ClientMethod.Builder newBuilder() {
             .methodDocumentation(externalDocumentation)
             .operationInstrumentationInfo(instrumentationInfo)
             .setCrossLanguageDefinitionId(crossLanguageDefinitionId)
-            .hasWithContextOverload(hasWithContextOverload);
+            .hasWithContextOverload(hasWithContextOverload)
+            .overloadedClientMethod(overloadedClientMethod);
     }
 
     /**
@@ -171,7 +174,7 @@ protected ClientMethod(String description, ReturnValue returnValue, String name,
         JavaVisibility methodVisibilityInWrapperClient, ImplementationDetails implementationDetails,
         MethodPollingDetails methodPollingDetails, ExternalDocumentation externalDocumentation,
         String crossLanguageDefinitionId, boolean hasWithContextOverload,
-        OperationInstrumentationInfo instrumentationInfo) {
+        OperationInstrumentationInfo instrumentationInfo, ClientMethod overloadedClientMethod) {
         this.description = description;
         this.returnValue = returnValue;
         this.name = name;
@@ -216,6 +219,7 @@ protected ClientMethod(String description, ReturnValue returnValue, String name,
         this.argumentList
             = getMethodParameters().stream().map(ClientMethodParameter::getName).collect(Collectors.joining(", "));
         this.instrumentationInfo = instrumentationInfo;
+        this.overloadedClientMethod = overloadedClientMethod;
     }
 
     @Override
@@ -443,6 +447,15 @@ public OperationInstrumentationInfo getOperationInstrumentationInfo() {
         return instrumentationInfo;
     }
 
+    /**
+     * Get the overloaded client method associated with this ClientMethod.
+     * 
+     * @return the overloaded client method.
+     */
+    public ClientMethod getOverloadedClientMethod() {
+        return overloadedClientMethod;
+    }
+
     /**
      * Add this ClientMethod's imports to the provided set of imports.
      *
@@ -633,6 +646,7 @@ public static class Builder {
         protected boolean hasWithContextOverload;
         protected boolean hidePageableParams;
         protected OperationInstrumentationInfo instrumentationInfo;
+        protected ClientMethod overloadedClientMethod;
 
         public Builder setCrossLanguageDefinitionId(String crossLanguageDefinitionId) {
             this.crossLanguageDefinitionId = crossLanguageDefinitionId;
@@ -882,6 +896,17 @@ public Builder operationInstrumentationInfo(OperationInstrumentationInfo instrum
             return this;
         }
 
+        /**
+         * Sets the overloaded client method associated with this ClientMethod.
+         *
+         * @param overloadedClientMethod the overloaded client method
+         * @return the Builder itself
+         */
+        public Builder overloadedClientMethod(ClientMethod overloadedClientMethod) {
+            this.overloadedClientMethod = overloadedClientMethod;
+            return this;
+        }
+
         /**
          * @return an immutable ClientMethod instance with the configurations on this builder.
          */
@@ -891,7 +916,8 @@ public ClientMethod build() {
                 clientReference, CollectionUtil.toImmutableList(requiredNullableParameterExpressions),
                 isGroupedParameterRequired, groupedParameterTypeName, methodPageDetails, parameterTransformations,
                 methodVisibility, methodVisibilityInWrapperClient, implementationDetails, methodPollingDetails,
-                externalDocumentation, crossLanguageDefinitionId, hasWithContextOverload, instrumentationInfo);
+                externalDocumentation, crossLanguageDefinitionId, hasWithContextOverload, instrumentationInfo,
+                overloadedClientMethod);
         }
     }
 }

packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClientMethodType.java

@@ -23,8 +23,6 @@ public enum ClientMethodType {
      * Mono<PagedResponseBase<H,T>>.
      */
     PagingAsyncSinglePage(2, true, false, false),
-    SimulatedPagingSync(3, false, false, true), // unused
-    SimulatedPagingAsync(4, false, false, false), // unused
     /**
      * represents long-running method that returns T where T is the final result of the LRO.
      */