eng, sync microsoft/typespec#8937 (#3215)

Author: weidongxu-microsoft

core

@@ -1,5 +1,5 @@
 diff --git a/packages/http-client-java/generator/http-client-generator-core/pom.xml b/packages/http-client-java/generator/http-client-generator-core/pom.xml
-index b4139191e..d1b75d5ae 100644
+index 0b727d93e..6bfc0d567 100644
 --- a/packages/http-client-java/generator/http-client-generator-core/pom.xml
 +++ b/packages/http-client-java/generator/http-client-generator-core/pom.xml
 @@ -21,6 +21,11 @@
@@ -15,23 +15,22 @@ index b4139191e..d1b75d5ae 100644
        <groupId>com.azure</groupId>
        <artifactId>azure-core</artifactId>
 diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java
-index 4aad12e27..67e5f7ef1 100644
+index e9b1e0a49..18955e7d7 100644
 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java
 +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java
-@@ -3,9 +3,9 @@
+@@ -3,8 +3,8 @@
 
  package com.microsoft.typespec.http.client.generator.core.postprocessor;
 
-+import com.azure.autorest.customization.Customization;
-+import com.azure.autorest.customization.implementation.Utils;
- import com.azure.json.JsonReader;
 -import com.microsoft.typespec.http.client.generator.core.customization.Customization;
 -import com.microsoft.typespec.http.client.generator.core.customization.implementation.Utils;
++import com.azure.autorest.customization.Customization;
++import com.azure.autorest.customization.implementation.Utils;
  import com.microsoft.typespec.http.client.generator.core.extension.base.util.FileUtils;
  import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings;
  import com.microsoft.typespec.http.client.generator.core.extension.plugin.NewPlugin;
 diff --git a/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml b/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
-index c99896650..fef2a4caf 100644
+index 0fe7a353c..0ca282f35 100644
 --- a/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
 +++ b/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
 @@ -16,9 +16,9 @@

core.patch

@@ -4,8 +4,8 @@
 package com.microsoft.typespec.http.client.generator.mgmt;
 
 import com.microsoft.typespec.http.client.generator.core.extension.model.Message;
-import com.azure.json.JsonReader;
-import com.azure.json.ReadValueCallback;
+import io.clientcore.core.serialization.json.JsonReader;
+import io.clientcore.core.utils.IOExceptionCheckedFunction;
 import com.microsoft.typespec.http.client.generator.core.Javagen;
 import com.microsoft.typespec.http.client.generator.core.extension.jsonrpc.Connection;
 
@@ -23,13 +23,13 @@ public MockJavagen(Connection connection) {
 
     @SuppressWarnings("unchecked")
     @Override
-    public <T> T getValue(String key, ReadValueCallback<String, T> converter) {
+    public <T> T getValue(String key, IOExceptionCheckedFunction<String, T> converter) {
         return (T) DEFAULT_SETTINGS.get(key);
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public <T> T getValueWithJsonReader(String key, ReadValueCallback<JsonReader, T> converter) {
+    public <T> T getValueWithJsonReader(String key, IOExceptionCheckedFunction<JsonReader, T> converter) {
         return (T) DEFAULT_SETTINGS.get(key);
     }
 

fluentgen/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/MockJavagen.java

@@ -19,8 +19,8 @@
 import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaClass;
 import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaFile;
 import com.microsoft.typespec.http.client.generator.core.template.prototype.MethodTemplate;
-import com.azure.json.JsonReader;
-import com.azure.json.ReadValueCallback;
+import io.clientcore.core.serialization.json.JsonReader;
+import io.clientcore.core.utils.IOExceptionCheckedFunction;
 import org.junit.jupiter.api.Assertions;
 
 import java.io.IOException;
@@ -73,13 +73,13 @@ public MockFluentGen() {
 
         @SuppressWarnings("unchecked")
         @Override
-        public <T> T getValue(String key, ReadValueCallback<String, T> converter) {
+        public <T> T getValue(String key, IOExceptionCheckedFunction<String, T> converter) {
             return (T) DEFAULT_SETTINGS.get(key);
         }
 
         @SuppressWarnings("unchecked")
         @Override
-        public <T> T getValueWithJsonReader(String key, ReadValueCallback<JsonReader, T> converter) {
+        public <T> T getValueWithJsonReader(String key, IOExceptionCheckedFunction<JsonReader, T> converter) {
             return (T) DEFAULT_SETTINGS.get(key);
         }
 

fluentgen/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/TestUtils.java

@@ -4,7 +4,6 @@
 
 package azure.clientgenerator.core.alternatetype;
 
-import azure.clientgenerator.core.alternatetype.externaltype.models.Feature;
 import azure.clientgenerator.core.alternatetype.externaltype.models.ModelWithFeatureProperty;
 import azure.clientgenerator.core.alternatetype.implementation.ExternalTypesImpl;
 import com.azure.core.annotation.Generated;
@@ -17,6 +16,7 @@
 import com.azure.core.exception.ResourceNotFoundException;
 import com.azure.core.http.rest.RequestOptions;
 import com.azure.core.http.rest.Response;
+import com.azure.core.models.GeoObject;
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.FluxUtil;
 import reactor.core.publisher.Mono;
@@ -199,11 +199,11 @@ public Mono<Response<Void>> putPropertyWithResponse(BinaryData body, RequestOpti
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Feature> getModel() {
+    public Mono<GeoObject> getModel() {
         // Generated convenience method for getModelWithResponse
         RequestOptions requestOptions = new RequestOptions();
         return getModelWithResponse(requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> protocolMethodData.toObject(Feature.class));
+            .map(protocolMethodData -> protocolMethodData.toObject(GeoObject.class));
     }
 
     /**
@@ -220,7 +220,7 @@ public Mono<Feature> getModel() {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Void> putModel(Feature body) {
+    public Mono<Void> putModel(GeoObject body) {
         // Generated convenience method for putModelWithResponse
         RequestOptions requestOptions = new RequestOptions();
         return putModelWithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono);

typespec-tests/src/main/java/azure/clientgenerator/core/alternatetype/AlternateTypeAsyncClient.java

@@ -4,7 +4,6 @@
 
 package azure.clientgenerator.core.alternatetype;
 
-import azure.clientgenerator.core.alternatetype.externaltype.models.Feature;
 import azure.clientgenerator.core.alternatetype.externaltype.models.ModelWithFeatureProperty;
 import azure.clientgenerator.core.alternatetype.implementation.ExternalTypesImpl;
 import com.azure.core.annotation.Generated;
@@ -17,6 +16,7 @@
 import com.azure.core.exception.ResourceNotFoundException;
 import com.azure.core.http.rest.RequestOptions;
 import com.azure.core.http.rest.Response;
+import com.azure.core.models.GeoObject;
 import com.azure.core.util.BinaryData;
 
 /**
@@ -197,10 +197,10 @@ public Response<Void> putPropertyWithResponse(BinaryData body, RequestOptions re
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Feature getModel() {
+    public GeoObject getModel() {
         // Generated convenience method for getModelWithResponse
         RequestOptions requestOptions = new RequestOptions();
-        return getModelWithResponse(requestOptions).getValue().toObject(Feature.class);
+        return getModelWithResponse(requestOptions).getValue().toObject(GeoObject.class);
     }
 
     /**
@@ -216,7 +216,7 @@ public Feature getModel() {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void putModel(Feature body) {
+    public void putModel(GeoObject body) {
         // Generated convenience method for putModelWithResponse
         RequestOptions requestOptions = new RequestOptions();
         putModelWithResponse(BinaryData.fromObject(body), requestOptions).getValue();