[scala] Fix Array[Byte] type for Openapi type string format byte

docs/generators/scala-akka-http-server.md

@@ -61,6 +61,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-akka.md

@@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-gatling.md

@@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-httpclient-deprecated.md

@@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-lagom-server.md

@@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-play-server.md

@@ -64,6 +64,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-sttp.md

@@ -62,6 +62,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scalatra.md

@@ -57,6 +57,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scalaz.md

@@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

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

@@ -1580,6 +1580,7 @@ public DefaultCodegen() {
         typeMapping.put("char", "String");
         typeMapping.put("object", "Object");
         typeMapping.put("integer", "Integer");
+        // FIXME: java specific type should be in Java Based Abstract Impl's
         typeMapping.put("ByteArray", "byte[]");
         typeMapping.put("binary", "File");
         typeMapping.put("file", "File");

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

@@ -73,7 +73,8 @@ public AbstractScalaCodegen() {
                 "List",
                 "Seq",
                 "Map",
-                "Array"));
+                "Array",
+                "Byte"));
 
         reservedWords.addAll(Arrays.asList(
                 "abstract",
@@ -118,6 +119,10 @@ public AbstractScalaCodegen() {
                 "yield"
         ));
 
+        // Scala specific openApi types mapping
+        typeMapping.put("ByteArray", "Array[Byte]");
+
+
         importMapping = new HashMap<String, String>();
         importMapping.put("ListBuffer", "scala.collection.mutable.ListBuffer");
         // although Seq is a predef, before Scala 2.13, it _could_ refer to a mutable Seq in some cases.
@@ -344,17 +349,11 @@ public String getSchemaType(Schema p) {
         if (ModelUtils.isSet(p)) {
             openAPIType = "set";
         }
-
-        String type;
+        // don't apply renaming on types from the typeMapping
         if (typeMapping.containsKey(openAPIType)) {
-            type = typeMapping.get(openAPIType);
-            if (languageSpecificPrimitives.contains(type)) {
-                return toModelName(type);
-            }
-        } else {
-            type = openAPIType;
+            return typeMapping.get(openAPIType);
         }
-        return toModelName(type);
+        return toModelName(openAPIType);
     }
 
     @Override

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

@@ -125,6 +125,7 @@ public ScalaSttpClientCodegen() {
         importMapping.remove("Set");
         importMapping.remove("Map");
 
+        // TODO: there is no specific sttp mapping. All Scala Type mappings should be in AbstractScala
         typeMapping = new HashMap<>();
         typeMapping.put("array", "Seq");
         typeMapping.put("set", "Set");
@@ -144,7 +145,6 @@ public ScalaSttpClientCodegen() {
         typeMapping.put("number", "Double");
         typeMapping.put("decimal", "BigDecimal");
         typeMapping.put("ByteArray", "Array[Byte]");
-        typeMapping.put("ArrayByte", "Array[Byte]");
 
         instantiationTypes.put("array", "ListBuffer");
         instantiationTypes.put("map", "Map");

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

@@ -1,5 +1,7 @@
 package org.openapitools.codegen.scala;
 
+import io.swagger.v3.oas.models.media.ObjectSchema;
+import io.swagger.v3.oas.models.media.Schema;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.languages.AbstractScalaCodegen;
 import org.testng.Assert;
@@ -95,4 +97,21 @@ public void checkScalaTypeImportMapping() {
         Assert.assertFalse(fakeScalaCodegen.importMapping().containsKey("BigInt"),
                 "BigInt is a Scala type and must not be imported");
     }
+
+    @Test
+    void checkScalaTypeDeclaration() {
+
+        final AbstractScalaCodegen codegen = new P_AbstractScalaCodegen();
+
+        Schema<?> byteArraySchema = new ObjectSchema();
+        byteArraySchema.setType("string");
+        byteArraySchema.setFormat("byte");
+        byteArraySchema.setDescription("Schema with byte string");
+
+        Assert.assertEquals(codegen.getTypeDeclaration(byteArraySchema), "Array[Byte]",
+                "OpenApi File type represented as byte string should be represented as Array[Byte] scala type");
+
+    }
+
+
 }

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

@@ -1,7 +1,7 @@
 package org.openapitools.codegen.scala;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 import org.openapitools.codegen.languages.ScalaSttpClientCodegen;
 
 import java.util.HashMap;
@@ -14,7 +14,7 @@ public void shouldUseDefaultValueIfAdditionalPropertiesAreEmpty() {
         Map<String, Object> additionalProperties = new HashMap<>();
         booleanProperty.updateAdditionalProperties(additionalProperties);
 
-        Assert.assertEquals(false, additionalProperties.get("k1"));
+        Assert.assertEquals(additionalProperties.get("k1"), false);
     }
 
     @Test
@@ -24,6 +24,6 @@ public void shouldUseGivenValueIfProvided() {
         additionalProperties.put("k1", true);
         booleanProperty.updateAdditionalProperties(additionalProperties);
 
-        Assert.assertEquals(true, additionalProperties.get("k1"));
+        Assert.assertEquals(additionalProperties.get("k1"), true);
     }
 }

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

@@ -1,8 +1,8 @@
 package org.openapitools.codegen.scala;
 
 import org.openapitools.codegen.languages.ScalaSttpClientCodegen;
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 import io.swagger.v3.oas.models.media.Schema;
 

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

@@ -1,7 +1,7 @@
 package org.openapitools.codegen.scala;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 import org.openapitools.codegen.languages.ScalaSttpClientCodegen;
 
 import java.util.HashMap;
@@ -13,8 +13,8 @@ public void shouldUseJson4sByDefault() {
         ScalaSttpClientCodegen.JsonLibraryProperty property = new ScalaSttpClientCodegen.JsonLibraryProperty();
         Map<String, Object> additionalProperties = new HashMap<>();
         property.updateAdditionalProperties(additionalProperties);
-        Assert.assertEquals(true, additionalProperties.get("json4s"));
-        Assert.assertEquals(false, additionalProperties.get("circe"));
+        Assert.assertEquals(additionalProperties.get("json4s"), true);
+        Assert.assertEquals(additionalProperties.get("circe"), false);
     }
 
     @Test
@@ -23,8 +23,8 @@ public void shouldUseJson4sIfExplicitlyAskTo() {
         Map<String, Object> additionalProperties = new HashMap<>();
         additionalProperties.put("jsonLibrary", "json4s");
         property.updateAdditionalProperties(additionalProperties);
-        Assert.assertEquals(true, additionalProperties.get("json4s"));
-        Assert.assertEquals(false, additionalProperties.get("circe"));
+        Assert.assertEquals(additionalProperties.get("json4s"), true);
+        Assert.assertEquals(additionalProperties.get("circe"), false);
     }
 
     @Test
@@ -33,7 +33,7 @@ public void shouldUseCirceIfExplicitlyAskTo() {
         Map<String, Object> additionalProperties = new HashMap<>();
         additionalProperties.put("jsonLibrary", "circe");
         property.updateAdditionalProperties(additionalProperties);
-        Assert.assertEquals(false, additionalProperties.get("json4s"));
-        Assert.assertEquals(true, additionalProperties.get("circe"));
+        Assert.assertEquals(additionalProperties.get("json4s"), false);
+        Assert.assertEquals(additionalProperties.get("circe"), true);
     }
 }

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

@@ -1,7 +1,7 @@
 package org.openapitools.codegen.scala;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.languages.ScalaSttpClientCodegen;
 

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

@@ -1,7 +1,7 @@
 package org.openapitools.codegen.scala;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 import org.openapitools.codegen.languages.ScalaSttpClientCodegen;
 
 import java.util.HashMap;
@@ -10,21 +10,21 @@
 public class SttpStringPropertyTest {
 
     @Test
-    public void shouldUseDefaultValueIfAdditionalPropertiesAreEmpty(){
+    public void shouldUseDefaultValueIfAdditionalPropertiesAreEmpty() {
         ScalaSttpClientCodegen.StringProperty property = new ScalaSttpClientCodegen.StringProperty("k1", "desc", "default");
         Map<String, Object> additionalProperties = new HashMap<>();
         property.updateAdditionalProperties(additionalProperties);
 
-        Assert.assertEquals("default", additionalProperties.get("k1"));
+        Assert.assertEquals(additionalProperties.get("k1"), "default");
     }
 
     @Test
-    public void shouldUseGivenValueIfProvided(){
+    public void shouldUseGivenValueIfProvided() {
         ScalaSttpClientCodegen.StringProperty property = new ScalaSttpClientCodegen.StringProperty("k1", "desc", "default");
         Map<String, Object> additionalProperties = new HashMap<>();
         additionalProperties.put("k1", "custom");
         property.updateAdditionalProperties(additionalProperties);
 
-        Assert.assertEquals("custom", additionalProperties.get("k1"));
+        Assert.assertEquals(additionalProperties.get("k1"), "custom");
     }
 }