[swift5] Map file and binary to Data

Fixes: OpenAPITools#9308
aymanbagabas · May 25, 2021 · acc9895 · acc9895
1 parent 6c40192
commit acc9895
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
@@ -120,7 +120,6 @@ public Swift5ClientCodegen() {
                         "Bool",
                         "Void",
                         "String",
-                        "URL",
                         "Data",
                         "Date",
                         "Character",
@@ -224,8 +223,8 @@ public Swift5ClientCodegen() {
         typeMapping.put("float", "Float");
         typeMapping.put("number", "Double");
         typeMapping.put("double", "Double");
-        typeMapping.put("file", "URL");
-        typeMapping.put("binary", "URL");
+        typeMapping.put("file", "Data");
+        typeMapping.put("binary", "Data");
         typeMapping.put("ByteArray", "Data");
         typeMapping.put("UUID", "UUID");
         typeMapping.put("URI", "String");
@@ -602,7 +601,7 @@ public String getSchemaType(Schema p) {
 
     @Override
     public boolean isDataTypeFile(String dataType) {
-        return "URL".equals(dataType);
+        return "Data".equals(dataType);
     }
 
     @Override

diff --git a/...napi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java b/...napi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java
@@ -106,8 +106,8 @@ public void binaryDataTest() {
         final Operation p = openAPI.getPaths().get(path).getPost();
         final CodegenOperation op = codegen.fromOperation(path, "post", p, null);
 
-        Assert.assertEquals(op.returnType, "URL");
-        Assert.assertEquals(op.bodyParam.dataType, "URL");
+        Assert.assertEquals(op.returnType, "Data");
+        Assert.assertEquals(op.bodyParam.dataType, "Data");
         Assert.assertTrue(op.bodyParam.isBinary);
         Assert.assertTrue(op.responses.get(0).isBinary);
     }

diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ModelTest.java
@@ -87,10 +87,10 @@ public void simpleModelTest() {
 
         final CodegenProperty property4 = cm.vars.get(3);
         Assert.assertEquals(property4.baseName, "binary");
-        Assert.assertEquals(property4.dataType, "URL");
+        Assert.assertEquals(property4.dataType, "Data");
         Assert.assertEquals(property4.name, "binary");
         Assert.assertNull(property4.defaultValue);
-        Assert.assertEquals(property4.baseType, "URL");
+        Assert.assertEquals(property4.baseType, "Data");
         Assert.assertFalse(property4.required);
         Assert.assertFalse(property4.isContainer);