Refactor

Author: nikhilsu

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java

@@ -165,11 +165,12 @@ public void processOpts() {
         modelPackage = PACKAGE_PROPERTY.getModelPackage(additionalProperties);
 
         String jsonLibrary = JSON_LIBRARY_PROPERTY.getValue(additionalProperties);
-        String jsonValueClass = "circe".equals(jsonLibrary) ? "io.circe.Json" : "org.json4s.JValue";
-        importMapping.put(jsonValueClass, jsonValueClass);
+        String jsonValueFqn = "circe".equals(jsonLibrary) ? "io.circe.Json" : "org.json4s.JValue";
+        String jsonValueSimpleName = jsonValueFqn.substring(jsonValueFqn.lastIndexOf('.') + 1);
 
-        typeMapping.put("object", jsonValueClass);
-        typeMapping.put("AnyType", jsonValueClass);
+        typeMapping.put("object", jsonValueSimpleName);
+        typeMapping.put("AnyType", jsonValueSimpleName);
+        importMapping.put(jsonValueSimpleName, jsonValueFqn);
 
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));

samples/client/petstore/scala-sttp-circe/src/main/scala/org/openapitools/client/api/StoreApi.scala

@@ -11,8 +11,8 @@
  */
 package org.openapitools.client.api
 
-import org.openapitools.client.model.Order
 import io.circe.Json
+import org.openapitools.client.model.Order
 import org.openapitools.client.core.JsonSupport._
 import sttp.client3._
 import sttp.model.Method
@@ -77,18 +77,18 @@ class StoreApi(baseUrl: String) {
    * Returns arbitrary store metrics whose schema is not fixed
    * 
    * Expected answers:
-   *   code 200 : io.circe.Json (successful operation)
+   *   code 200 : Json (successful operation)
    * 
    * Available security schemes:
    *   api_key (apiKey)
    */
   def getStoreStats(apiKeyHeader: String)(
-): Request[Either[ResponseException[String, Exception], io.circe.Json], Any] =
+): Request[Either[ResponseException[String, Exception], Json], Any] =
     basicRequest
       .method(Method.GET, uri"$baseUrl/store/stats")
       .contentType("application/json")
       .header("api_key", apiKeyHeader)
-      .response(asJson[io.circe.Json])
+      .response(asJson[Json])
 
   /**
    *