Fix bug

Author: nikhilsu

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

@@ -108,10 +108,6 @@ public ScalaSttpClientCodegen() {
         apiTemplateFiles.put("api.mustache", ".scala");
         embeddedTemplateDir = templateDir = "scala-sttp";
 
-        String jsonLibrary = JSON_LIBRARY_PROPERTY.getValue(additionalProperties);
-
-        String jsonValueClass = "circe".equals(jsonLibrary) ? "io.circe.Json" : "org.json4s.JValue";
-
         additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
         additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
         additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
@@ -141,13 +137,13 @@ public ScalaSttpClientCodegen() {
         typeMapping.put("short", "Short");
         typeMapping.put("char", "Char");
         typeMapping.put("double", "Double");
-        typeMapping.put("object", jsonValueClass);
+        typeMapping.put("object", "Any");
         typeMapping.put("file", "File");
         typeMapping.put("binary", "File");
         typeMapping.put("number", "Double");
         typeMapping.put("decimal", "BigDecimal");
         typeMapping.put("ByteArray", "Array[Byte]");
-        typeMapping.put("AnyType", jsonValueClass);
+        typeMapping.put("AnyType", "Any");
 
         instantiationTypes.put("array", "ListBuffer");
         instantiationTypes.put("map", "Map");
@@ -166,6 +162,11 @@ public void processOpts() {
         apiPackage = PACKAGE_PROPERTY.getApiPackage(additionalProperties);
         modelPackage = PACKAGE_PROPERTY.getModelPackage(additionalProperties);
 
+        String jsonLibrary = JSON_LIBRARY_PROPERTY.getValue(additionalProperties);
+        String jsonValueClass = "circe".equals(jsonLibrary) ? "io.circe.Json" : "org.json4s.JValue";
+        typeMapping.put("object", jsonValueClass);
+        typeMapping.put("AnyType", jsonValueClass);
+
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
         final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);

modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpCodegenTest.java

@@ -159,8 +159,8 @@ public void verifyCirceSerdeWithMixedCaseFields() throws IOException {
         assertFileContains(mixedCaseModelPath, "implicit val decoderMixedCaseModel");
 
         Path binaryModelPath = Paths.get(outputPath + "/src/main/scala/org/openapitools/client/model/BinaryPayload.scala");
-        assertFileContains(binaryModelPath, "data: Option[java.io.File]");
-        assertFileContains(binaryModelPath, "metadata: Option[Any]");
+        assertFileContains(binaryModelPath, "data: Option[File]");
+        assertFileContains(binaryModelPath, "metadata: Option[io.circe.Json]");
         assertFileContains(binaryModelPath, "c.downField(\"data\")");
         assertFileContains(binaryModelPath, "c.downField(\"metadata\")");
         assertFileContains(binaryModelPath, "implicit val encoderBinaryPayload");