Swift5 use json type for any

[aymanbagabas]

• Use a custom JSON type instead of Any

PR checklist

• Read the contribution guidelines.
• Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
• Run the following to build the project and update samples:

  ./mvnw clean package 
  ./bin/generate-samples.sh
  ./bin/utils/export_docs_generators.sh
  

  Commit all changed files.
  This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
  These must match the expectations made by your contribution.
  You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
  For Windows users, please run the script in Git BASH.
• File the PR against the correct branch: master, 5.1.x, 6.0.x
• If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

[aymanbagabas]

@4brunu looks like it's unable to pull one of the dependencies

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M2:enforce (enforce-maven) on project openapi-generator-project: Execution enforce-maven of goal org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M2:enforce failed: Plugin org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M2 or one of its dependencies could not be resolved: Could not transfer artifact org.sonatype.sisu:sisu-guice:jar:noaop:2.1.7 from/to google-maven-central (https://maven-central.storage-download.googleapis.com/maven2/): GET request of: org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar from google-maven-central failed: Connection reset -> [Help 1]

[4brunu]

To reset CI, try to close and open the PR.

[aymanbagabas]

AnyCodable does not conform to Hashable Flight-School/AnyCodable#45 this is stopping me from switching to AnyCodable

[aymanbagabas]

Flight-School/AnyCodable#51 PR submitted and awaiting review

[4brunu]

You are fast 🙂
By the way I was checking you PR on AnyCodable and both AnyCodable, AnyDecodable and AnyEncodable conform to Equatable.
Maybe also AnyCodable, AnyDecodable and AnyEncodable should conform to Hashable?

[aymanbagabas]

You are fast 🙂
By the way I was checking you PR on AnyCodable and both AnyCodable, AnyDecodable and AnyEncodable conform to Equatable.
Maybe also AnyCodable, AnyDecodable and AnyEncodable should conform to Hashable?

I updated the PR to conform all to Hashable

[aymanbagabas]

I've reverted the mapping change. Just an FYI, swagger codegen swift5 generator also maps binary to Data https://github.com/swagger-api/swagger-codegen-generators/blob/master/src/main/java/io/swagger/codegen/v3/generators/swift/Swift5Codegen.java#L202

[4brunu]

@aymanbagabas why did you revert the map of binary to Data?
That change looked good to me.

[4brunu]

Two more thighs:

• could you please also add the dependency AnyCodable XcodeGen?
• since we are waiting for the PR you opened on the AnyCodable, and when that PR gets accepted and released, it may create a conflict with the hashable extension on this PR, could you change the AnyCodable dependency to be exactly 0.4.0? Just to try to avoid this future problem

[aymanbagabas]

@4brunu CI is failing even though I updated the test files to reflect the new mapping. Do you know what's going on?

EDIT: I noticed it passes when I also map file to Data.

[4brunu]

I think you need to update the unit tests in those two places

openapi-generator/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ModelTest.java

Lines 90 to 93 in 53e5986

	Assert.assertEquals(property4.dataType, "URL");
	Assert.assertEquals(property4.name, "binary");
	Assert.assertNull(property4.defaultValue);
	Assert.assertEquals(property4.baseType, "URL");

openapi-generator/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java

Lines 109 to 110 in 53e5986

	Assert.assertEquals(op.returnType, "URL");
	Assert.assertEquals(op.bodyParam.dataType, "URL");

[aymanbagabas]

I think you need to update the unit tests in those two places

But I already did https://github.com/OpenAPITools/openapi-generator/pull/9206/files#diff-fa265925df4a882b13f49697c23722899f0400726b9c12ae75d8a88a7151d89b

[4brunu]

I don't have the time to dig unto it now, but maybe it's related to this

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

Lines 3210 to 3212 in 53e5986

	} else if (ModelUtils.isBinarySchema(p)) {
	property.isBinary = true;
	property.isFile = true; // file = binary in OAS3

EDIT: I tried to comment the line property.isFile = true; but it didn't work, so my hint may be wrong

[aymanbagabas]

// file = binary in OAS3

Shouldn't we map file to Data?

[4brunu]

No, let's deal with this problem in a different PR, and we need to investigate more on this issue

[aymanbagabas]

No, let's deal with this problem in a different PR, and we need to investigate more on this issue

From reading the OAS3 specs, file data type is not a special type as it's used to be in OAS2, instead, it's treated like any other schema type and is mapped to binary or base64.

[aymanbagabas]

I don't have the time to dig unto it now, but maybe it's related to this

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

Lines 3210 to 3212 in 53e5986

	} else if (ModelUtils.isBinarySchema(p)) {
	property.isBinary = true;
	property.isFile = true; // file = binary in OAS3

EDIT: I tried to comment the line property.isFile = true; but it didn't work, so my hint may be wrong

There is also this

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

Lines 282 to 288 in 5359776

	public static boolean isFileSchema(Schema schema) {
	if (schema instanceof FileSchema) {
	return true;
	}
	// file type in oas2 mapped to binary in oas3
	return isBinarySchema(schema);
	}

So essentially file equals to binary. FileSchema is defined as

    public FileSchema() {
        super("string", "binary");
    }

[aymanbagabas]

I've dropped the mapping commit in favor of #9308

[4brunu]

Thanks 👍
Looks good to me, let's wait for the CI to finish

[4brunu]

@wing328 for me this PR is ready to merge

[4brunu]

@aymanbagabas could you please explain what this change does? (the code block, not the line itself)

[aymanbagabas]

This was getting the wrong inner type for additionalProperties when the schema is either an array or a map.

[4brunu]

Thanks for explaining the change 🙂